diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-07-28 13:12:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-07-28 13:12:07 +0000 |
| commit | 3d53ae828b8061fdd1b3d73cbe8f4f1ec9b3bf8e (patch) | |
| tree | ff61f10187fd0e31fb2d2035c42eb9312b69da85 /openstackclient | |
| parent | 5f6257206e1df085d1432778cfbc4489b87bc256 (diff) | |
| parent | b50c2b6a8847219ec6d3916f429dec77cf2ba180 (diff) | |
| download | python-openstackclient-3d53ae828b8061fdd1b3d73cbe8f4f1ec9b3bf8e.tar.gz | |
Merge "Allow setting quotas for server groups and server group members"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/common/quota.py | 2 | ||||
| -rw-r--r-- | openstackclient/tests/common/test_quota.py | 6 | ||||
| -rw-r--r-- | openstackclient/tests/compute/v2/fakes.py | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/openstackclient/common/quota.py b/openstackclient/common/quota.py index 3c12c366..5d53171c 100644 --- a/openstackclient/common/quota.py +++ b/openstackclient/common/quota.py @@ -38,6 +38,8 @@ COMPUTE_QUOTAS = { 'key_pairs': 'key-pairs', 'metadata_items': 'properties', 'ram': 'ram', + 'server_groups': 'server-groups', + 'server_group_members': 'server-group-members', } VOLUME_QUOTAS = { diff --git a/openstackclient/tests/common/test_quota.py b/openstackclient/tests/common/test_quota.py index 6f001c85..16fa35f6 100644 --- a/openstackclient/tests/common/test_quota.py +++ b/openstackclient/tests/common/test_quota.py @@ -115,6 +115,8 @@ class TestQuotaSet(TestQuota): '--properties', str(compute_fakes.property_num), '--secgroup-rules', str(compute_fakes.secgroup_rule_num), '--secgroups', str(compute_fakes.secgroup_num), + '--server-groups', str(compute_fakes.servgroup_num), + '--server-group-members', str(compute_fakes.servgroup_members_num), identity_fakes.project_name, ] verifylist = [ @@ -131,6 +133,8 @@ class TestQuotaSet(TestQuota): ('metadata_items', compute_fakes.property_num), ('security_group_rules', compute_fakes.secgroup_rule_num), ('security_groups', compute_fakes.secgroup_num), + ('server_groups', compute_fakes.servgroup_num), + ('server_group_members', compute_fakes.servgroup_members_num), ('project', identity_fakes.project_name), ] @@ -153,6 +157,8 @@ class TestQuotaSet(TestQuota): 'metadata_items': compute_fakes.property_num, 'security_group_rules': compute_fakes.secgroup_rule_num, 'security_groups': compute_fakes.secgroup_num, + 'server_groups': compute_fakes.servgroup_num, + 'server_group_members': compute_fakes.servgroup_members_num, } self.quotas_mock.update.assert_called_with( diff --git a/openstackclient/tests/compute/v2/fakes.py b/openstackclient/tests/compute/v2/fakes.py index b4243a22..85c11c94 100644 --- a/openstackclient/tests/compute/v2/fakes.py +++ b/openstackclient/tests/compute/v2/fakes.py @@ -36,6 +36,8 @@ instance_num = 10 property_num = 128 secgroup_rule_num = 20 secgroup_num = 10 +servgroup_num = 10 +servgroup_members_num = 10 project_name = 'project_test' QUOTA = { 'project': project_name, @@ -51,6 +53,8 @@ QUOTA = { 'properties': property_num, 'secgroup_rules': secgroup_rule_num, 'secgroups': secgroup_num, + 'server-groups': servgroup_num, + 'server-group-members': servgroup_members_num } QUOTA_columns = tuple(sorted(QUOTA)) |