Merge "Add _max_microversion for aggregates"

openstack/compute/v2/aggregate.py

@@ -38,6 +38,10 @@ class Aggregate(resource.Resource):
     hosts = resource.Body('hosts')
     #: Metadata
     metadata = resource.Body('metadata')
+    #: UUID
+    uuid = resource.Body('uuid')
+    # uuid introduced in 2.41
+    _max_microversion = '2.41'
 
     def _action(self, session, body, microversion=None):
         """Preform aggregate actions given the message body."""

openstack/tests/unit/cloud/test_aggregate.py

@@ -20,6 +20,7 @@ class TestAggregate(base.TestCase):
         super(TestAggregate, self).setUp()
         self.aggregate_name = self.getUniqueString('aggregate')
         self.fake_aggregate = fakes.make_fake_aggregate(1, self.aggregate_name)
+        self.use_compute_discovery()
 
     def test_create_aggregate(self):
         create_aggregate = self.fake_aggregate.copy()

openstack/tests/unit/compute/v2/test_aggregate.py

@@ -12,9 +12,13 @@
 
 from unittest import mock
 
+from keystoneauth1 import adapter
+
 from openstack.compute.v2 import aggregate
 from openstack.tests.unit import base
 
+IDENTIFIER = 'IDENTIFIER'
+
 EXAMPLE = {
     "name": "m-family",
     "availability_zone": None,
@@ -24,6 +28,7 @@ EXAMPLE = {
     "hosts": ["oscomp-m001", "oscomp-m002", "oscomp-m003"],
     "deleted_at": None,
     "id": 4,
+    "uuid": IDENTIFIER,
     "metadata": {"type": "public", "family": "m-family"}
 }
 
@@ -37,7 +42,7 @@ class TestAggregate(base.TestCase):
         self.resp.json = mock.Mock(return_value=self.resp.body)
         self.resp.status_code = 200
         self.resp.headers = {'Accept': ''}
-        self.sess = mock.Mock()
+        self.sess = mock.Mock(spec=adapter.Adapter)
         self.sess.post = mock.Mock(return_value=self.resp)
 
     def test_basic(self):
@@ -58,6 +63,7 @@ class TestAggregate(base.TestCase):
         self.assertEqual(EXAMPLE['deleted'], sot.deleted)
         self.assertEqual(EXAMPLE['hosts'], sot.hosts)
         self.assertEqual(EXAMPLE['id'], sot.id)
+        self.assertEqual(EXAMPLE['uuid'], sot.uuid)
         self.assertDictEqual(EXAMPLE['metadata'], sot.metadata)
 
     def test_add_host(self):