diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-17 22:42:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-17 22:42:40 +0000 |
| commit | 6f129a4c79620aa35acc06dde4d534632e4f6917 (patch) | |
| tree | 337be66fc379c2372c68616751d18f5607eed112 /nova | |
| parent | 036953b1779c18cfb8bcfd026d494f09dfbcb10b (diff) | |
| parent | f60931311678dd7597218687562ab8415a8fedb3 (diff) | |
Merge "Includes sec group quota details in limits API response"
Diffstat (limited to 'nova')
4 files changed, 22 insertions, 1 deletions
diff --git a/nova/api/openstack/compute/views/limits.py b/nova/api/openstack/compute/views/limits.py index 22e0272ad..4b72f26e7 100644 --- a/nova/api/openstack/compute/views/limits.py +++ b/nova/api/openstack/compute/views/limits.py @@ -54,6 +54,8 @@ class ViewBuilder(object): "metadata_items": ["maxServerMeta", "maxImageMeta"], "injected_files": ["maxPersonality"], "injected_file_content_bytes": ["maxPersonalitySize"], + "security_groups": ["maxSecurityGroups"], + "security_group_rules": ["maxSecurityGroupRules"], } limits = {} for name, value in absolute_limits.iteritems(): diff --git a/nova/tests/api/openstack/compute/test_limits.py b/nova/tests/api/openstack/compute/test_limits.py index 2a3038267..bb81b6d86 100644 --- a/nova/tests/api/openstack/compute/test_limits.py +++ b/nova/tests/api/openstack/compute/test_limits.py @@ -124,6 +124,8 @@ class LimitsControllerTest(BaseLimitTestSuite): 'volumes': 5, 'key_pairs': 10, 'floating_ips': 10, + 'security_groups': 10, + 'security_group_rules': 20, } response = request.get_response(self.controller) expected = { @@ -172,6 +174,8 @@ class LimitsControllerTest(BaseLimitTestSuite): "maxTotalVolumes": 5, "maxTotalKeypairs": 10, "maxTotalFloatingIps": 10, + "maxSecurityGroups": 10, + "maxSecurityGroupRules": 20, }, }, } @@ -272,6 +276,17 @@ class LimitsControllerTest(BaseLimitTestSuite): } self._test_index_absolute_limits_json(expected) + def test_index_absolute_security_groups(self): + self.absolute_limits = { + 'security_groups': 8, + 'security_group_rules': 16, + } + expected = { + 'maxSecurityGroups': 8, + 'maxSecurityGroupRules': 16, + } + self._test_index_absolute_limits_json(expected) + class TestLimiter(limits.Limiter): pass diff --git a/nova/tests/integrated/api_samples/limit-get-resp.json.tpl b/nova/tests/integrated/api_samples/limit-get-resp.json.tpl index 99d27ed5e..376352ec4 100644 --- a/nova/tests/integrated/api_samples/limit-get-resp.json.tpl +++ b/nova/tests/integrated/api_samples/limit-get-resp.json.tpl @@ -11,7 +11,9 @@ "maxTotalKeypairs": 100, "maxTotalRAMSize": 51200, "maxTotalVolumeGigabytes": 1000, - "maxTotalVolumes": 10 + "maxTotalVolumes": 10, + "maxSecurityGroups": 10, + "maxSecurityGroupRules": 20 }, "rate": [ { diff --git a/nova/tests/integrated/api_samples/limit-get-resp.xml.tpl b/nova/tests/integrated/api_samples/limit-get-resp.xml.tpl index 61f09246f..25de4734a 100644 --- a/nova/tests/integrated/api_samples/limit-get-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/limit-get-resp.xml.tpl @@ -19,8 +19,10 @@ <limit name="maxPersonality" value="5"/> <limit name="maxImageMeta" value="128"/> <limit name="maxPersonalitySize" value="10240"/> + <limit name="maxSecurityGroupRules" value="20"/> <limit name="maxTotalKeypairs" value="100"/> <limit name="maxTotalVolumes" value="10"/> + <limit name="maxSecurityGroups" value="10"/> <limit name="maxTotalCores" value="20"/> <limit name="maxTotalFloatingIps" value="10"/> <limit name="maxTotalVolumeGigabytes" value="1000"/> |