Fix errors in used_limits extension

Fixes bug #1062049 There was a typo mapping the security groups resource to floating IPs. Key pairs don't work with the extension because of bug #1089877. (cherry picked from commit 6c9d9ab) Change-Id: Ifd694b21fef1dc95e67c07dcef0cd6ea3daa8d53
openstack · Dec 14, 2012 · f864a4e · f864a4e
1 parent 9e62846
commit f864a4e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/nova/api/openstack/compute/contrib/used_limits.py b/nova/api/openstack/compute/contrib/used_limits.py
@@ -51,8 +51,8 @@ def index(self, req, resp_obj):
             '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
@@ -52,8 +52,8 @@ def test_used_limits(self):
             '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():