Merge "Add min_count and max_count attributes to Server"

openstack/compute/v2/server.py

@@ -141,8 +141,12 @@ class Server(resource.Resource, metadata.MetadataMixin, resource.TagMixin):
     launch_index = resource.Body('OS-EXT-SRV-ATTR:launch_index', type=int)
     #: The timestamp when the server was launched.
     launched_at = resource.Body('OS-SRV-USG:launched_at')
+    #: The maximum number of servers to create.
+    max_count = resource.Body('max_count')
     #: Metadata stored for this server. *Type: dict*
     metadata = resource.Body('metadata', type=dict)
+    #: The minimum number of servers to create.
+    min_count = resource.Body('min_count')
     #: A networks object. Required parameter when there are multiple
     #: networks defined for the tenant. When you do not specify the
     #: networks parameter, the server attaches to the only network

openstack/tests/unit/cloud/test_normalize.py

@@ -592,7 +592,9 @@ class TestNormalize(base.TestCase):
                 'region_name': u'RegionOne',
                 'zone': u'ca-ymq-2'},
             'locked': True,
+            'max_count': None,
             'metadata': {u'group': u'irc', u'groups': u'irc,enabled'},
+            'min_count': None,
             'name': u'mordred-irc',
             'networks': {
                 u'public': [
@@ -625,6 +627,8 @@ class TestNormalize(base.TestCase):
                 'OS-SRV-USG:terminated_at': None,
                 'host_status': None,
                 'locked': True,
+                'max_count': None,
+                'min_count': None,
                 'os-extended-volumes:volumes_attached': [],
                 'trusted_image_certificates': None},
             'public_v4': None,
@@ -1175,6 +1179,8 @@ class TestStrictNormalize(base.TestCase):
             'properties': {
                 'host_status': None,
                 'locked': True,
+                'max_count': None,
+                'min_count': None,
                 'trusted_image_certificates': None
             },
             'public_v4': None,

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

@@ -257,7 +257,7 @@ class TestServer(base.TestCase):
         hints = {"hint": 3}
 
         sot = server.Server(id=1, availability_zone=zone, user_data=data,
-                            scheduler_hints=hints)
+                            scheduler_hints=hints, min_count=2, max_count=3)
         request = sot._prepare_request()
 
         self.assertNotIn("OS-EXT-AZ:availability_zone",
@@ -274,6 +274,9 @@ class TestServer(base.TestCase):
                          request.body[sot.resource_key])
         self.assertEqual(request.body["OS-SCH-HNT:scheduler_hints"], hints)
 
+        self.assertEqual(2, request.body[sot.resource_key]['min_count'])
+        self.assertEqual(3, request.body[sot.resource_key]['max_count'])
+
     def test_change_password(self):
         sot = server.Server(**EXAMPLE)