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/api | |
| parent | e56b2053f1a92d732e5ff0285e21be4dc512ae53 (diff) | |
| parent | 6c9d9ab434ba2ecfee1d556842d311390010957e (diff) | |
| download | nova-0597c1ccd31e7264395bcb451b8b6d38d5bfa92f.tar.gz nova-0597c1ccd31e7264395bcb451b8b6d38d5bfa92f.tar.xz nova-0597c1ccd31e7264395bcb451b8b6d38d5bfa92f.zip | |
Merge "Fix errors in used_limits extension"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/contrib/used_limits.py | 6 |
1 files changed, 2 insertions, 4 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(): |