diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-12-14 14:02:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-12-14 14:02:52 +0000 |
| commit | 0597c1ccd31e7264395bcb451b8b6d38d5bfa92f (patch) | |
| tree | 54021dea2f2a4fa3a54b4d3902ddc5cd52cd5449 /nova | |
| parent | e56b2053f1a92d732e5ff0285e21be4dc512ae53 (diff) | |
| parent | 6c9d9ab434ba2ecfee1d556842d311390010957e (diff) | |
Merge "Fix errors in used_limits extension"
Diffstat (limited to 'nova')
4 files changed, 7 insertions, 11 deletions
diff --git a/nova/api/openstack/compute/contrib/used_limits.py b/nova/api/openstack/compute/contrib/used_limits.py index a7ac33ae9..a5e0b378b 100644 --- a/nova/api/openstack/compute/contrib/used_limits.py +++ b/nova/api/openstack/compute/contrib/used_limits.py @@ -56,10 +56,8 @@ class UsedLimitsController(wsgi.Controller): 'totalRAMUsed': 'ram', 'totalCoresUsed': 'cores', 'totalInstancesUsed': 'instances', - 'totalVolumesUsed': 'volumes', - 'totalVolumeGigabytesUsed': 'gigabytes', - 'totalSecurityGroupsUsed': 'floating_ips', - 'totalKeyPairsUsed': 'key_pairs', + 'totalFloatingIpsUsed': 'floating_ips', + 'totalSecurityGroupsUsed': 'security_groups', } used_limits = {} for display_name, quota in quota_map.iteritems(): diff --git a/nova/tests/api/openstack/compute/contrib/test_used_limits.py b/nova/tests/api/openstack/compute/contrib/test_used_limits.py index 4a75961ed..ce2322bfe 100644 --- a/nova/tests/api/openstack/compute/contrib/test_used_limits.py +++ b/nova/tests/api/openstack/compute/contrib/test_used_limits.py @@ -52,10 +52,8 @@ class UsedLimitsTestCase(test.TestCase): 'totalRAMUsed': 'ram', 'totalCoresUsed': 'cores', 'totalInstancesUsed': 'instances', - 'totalVolumesUsed': 'volumes', - 'totalVolumeGigabytesUsed': 'gigabytes', - 'totalSecurityGroupsUsed': 'floating_ips', - 'totalKeyPairsUsed': 'key_pairs', + 'totalFloatingIpsUsed': 'floating_ips', + 'totalSecurityGroupsUsed': 'security_groups', } limits = {} for display_name, q in quota_map.iteritems(): diff --git a/nova/tests/integrated/api_samples/os-used-limits/usedlimits-get-resp.json.tpl b/nova/tests/integrated/api_samples/os-used-limits/usedlimits-get-resp.json.tpl index 78ddbb5af..d83dd87c3 100644 --- a/nova/tests/integrated/api_samples/os-used-limits/usedlimits-get-resp.json.tpl +++ b/nova/tests/integrated/api_samples/os-used-limits/usedlimits-get-resp.json.tpl @@ -14,9 +14,9 @@ "maxTotalRAMSize": 51200, "totalCoresUsed": 0, "totalInstancesUsed": 0, - "totalKeyPairsUsed": 0, "totalRAMUsed": 0, - "totalSecurityGroupsUsed": 0 + "totalSecurityGroupsUsed": 0, + "totalFloatingIpsUsed": 0 }, "rate": [ { diff --git a/nova/tests/integrated/api_samples/os-used-limits/usedlimits-get-resp.xml.tpl b/nova/tests/integrated/api_samples/os-used-limits/usedlimits-get-resp.xml.tpl index 75526473a..c1b907670 100644 --- a/nova/tests/integrated/api_samples/os-used-limits/usedlimits-get-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/os-used-limits/usedlimits-get-resp.xml.tpl @@ -31,7 +31,7 @@ <limit name="maxTotalCores" value="20"/> <limit name="totalSecurityGroupsUsed" value="0"/> <limit name="maxTotalFloatingIps" value="10"/> - <limit name="totalKeyPairsUsed" value="0"/> + <limit name="totalFloatingIpsUsed" value="0"/> <limit name="maxTotalRAMSize" value="51200"/> </absolute> </limits> |