Merge "Add support for the server group quotas"

novaclient/tests/v1_1/test_shell.py

@@ -1683,7 +1683,8 @@ class ShellTest(utils.TestCase):
             '--instances', '--cores', '--ram', '--floating-ips', '--fixed-ips',
             '--metadata-items', '--injected-files',
             '--injected-file-content-bytes', '--injected-file-path-bytes',
-            '--key-pairs', '--security-groups', '--security-group-rules'
+            '--key-pairs', '--security-groups', '--security-group-rules',
+            '--server-groups', '--server-group-members'
         )
         for arg in args:
             self.run_command('quota-class-update '

novaclient/tests/v3/fakes.py

@@ -323,7 +323,9 @@ class FakeHTTPClient(fakes_v1_1.FakeHTTPClient):
                       'cores': 1,
                       'keypairs': 1,
                       'security_groups': 1,
-                      'security_group_rules': 1}})
+                      'security_group_rules': 1,
+                      'server_groups': 1,
+                      'server_group_members': 1}})
 
     def get_os_quota_sets_test_detail(self, **kw):
         return (200, {}, {'quota_set': {

novaclient/v1_1/shell.py

@@ -3384,7 +3384,8 @@ _quota_resources = ['instances', 'cores', 'ram',
                     'floating_ips', 'fixed_ips', 'metadata_items',
                     'injected_files', 'injected_file_content_bytes',
                     'injected_file_path_bytes', 'key_pairs',
-                    'security_groups', 'security_group_rules']
+                    'security_groups', 'security_group_rules',
+                    'server_groups', 'server_group_members']
 
 
 def _quota_show(quotas):
@@ -3529,6 +3530,16 @@ def do_quota_defaults(cs, args):
     type=int,
     default=None,
     help=_('New value for the "security-group-rules" quota.'))
+@utils.arg('--server-groups',
+    metavar='<server-groups>',
+    type=int,
+    default=None,
+    help=_('New value for the "server-groups" quota.'))
+@utils.arg('--server-group-members',
+    metavar='<server-group-members>',
+    type=int,
+    default=None,
+    help=_('New value for the "server-group-members" quota.'))
 @utils.arg('--force',
     dest='force',
     action="store_true",
@@ -3637,6 +3648,16 @@ def do_quota_class_show(cs, args):
     type=int,
     default=None,
     help=_('New value for the "security-group-rules" quota.'))
+@utils.arg('--server-groups',
+    metavar='<server-groups>',
+    type=int,
+    default=None,
+    help=_('New value for the "server-groups" quota.'))
+@utils.arg('--server-group-members',
+    metavar='<server-group-members>',
+    type=int,
+    default=None,
+    help=_('New value for the "server-group-members" quota.'))
 def do_quota_class_update(cs, args):
     """Update the quotas for a quota class."""
 

novaclient/v3/shell.py

@@ -2802,7 +2802,8 @@ def do_ssh(cs, args):
 
 
 _quota_resources = ['instances', 'cores', 'ram',
-                    'fixed_ips', 'metadata_items', 'key_pairs']
+                    'fixed_ips', 'metadata_items', 'key_pairs',
+                    'server_groups', 'server_group_members']
 
 
 def _quota_show(quotas):
@@ -2919,6 +2920,16 @@ def do_quota_defaults(cs, args):
     type=int,
     default=None,
     help='New value for the "key-pairs" quota.')
+@utils.arg('--server-groups',
+    metavar='<server-groups>',
+    type=int,
+    default=None,
+    help='New value for the "server-groups" quota.')
+@utils.arg('--server-group-members',
+    metavar='<server-group-members>',
+    type=int,
+    default=None,
+    help='New value for the "server-group-members" quota.')
 @utils.arg('--force',
     dest='force',
     action="store_true",