From 6c9d9ab434ba2ecfee1d556842d311390010957e Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc@redhat.com>
Date: Thu, 13 Dec 2012 11:21:18 +0000
Subject: [PATCH] Fix errors in used_limits extension

Fixes bug #1062049

There was a typo mapping the security groups resource to floating IPs.

Volumes usage isn't tracked by Nova any more since delete-nova-volume.

Key pairs don't work with the extension because of bug #1089877.

Change-Id: Ifd694b21fef1dc95e67c07dcef0cd6ea3daa8d53
---
 doc/api_samples/os-used-limits/usedlimits-get-resp.json     | 4 ++--
 doc/api_samples/os-used-limits/usedlimits-get-resp.xml      | 2 +-
 nova/api/openstack/compute/contrib/used_limits.py           | 6 ++----
 .../tests/api/openstack/compute/contrib/test_used_limits.py | 6 ++----
 .../api_samples/os-used-limits/usedlimits-get-resp.json.tpl | 4 ++--
 .../api_samples/os-used-limits/usedlimits-get-resp.xml.tpl  | 2 +-
 6 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/doc/api_samples/os-used-limits/usedlimits-get-resp.json b/doc/api_samples/os-used-limits/usedlimits-get-resp.json
index 21ed3a0826aa..c5593b7e7911 100644
--- a/doc/api_samples/os-used-limits/usedlimits-get-resp.json
+++ b/doc/api_samples/os-used-limits/usedlimits-get-resp.json
@@ -14,9 +14,9 @@
             "maxTotalRAMSize": 51200,
             "totalCoresUsed": 0,
             "totalInstancesUsed": 0,
-            "totalKeyPairsUsed": 0,
             "totalRAMUsed": 0,
-            "totalSecurityGroupsUsed": 0
+            "totalSecurityGroupsUsed": 0,
+            "totalFloatingIpsUsed": 0
         },
         "rate": [
             {
diff --git a/doc/api_samples/os-used-limits/usedlimits-get-resp.xml b/doc/api_samples/os-used-limits/usedlimits-get-resp.xml
index 745a4828a997..c2b0572e5c51 100644
--- a/doc/api_samples/os-used-limits/usedlimits-get-resp.xml
+++ b/doc/api_samples/os-used-limits/usedlimits-get-resp.xml
@@ -26,10 +26,10 @@
     <limit name="totalRAMUsed" value="0"/>
     <limit name="totalInstancesUsed" value="0"/>
     <limit name="maxSecurityGroups" value="10"/>
+    <limit name="totalFloatingIpsUsed" value="0"/>
     <limit name="maxTotalCores" value="20"/>
     <limit name="totalSecurityGroupsUsed" value="0"/>
     <limit name="maxTotalFloatingIps" value="10"/>
-    <limit name="totalKeyPairsUsed" value="0"/>
     <limit name="maxTotalInstances" value="10"/>
     <limit name="totalCoresUsed" value="0"/>
     <limit name="maxTotalRAMSize" value="51200"/>
diff --git a/nova/api/openstack/compute/contrib/used_limits.py b/nova/api/openstack/compute/contrib/used_limits.py
index a7ac33ae9bab..a5e0b378bf40 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 4a75961ed4b8..ce2322bfe33b 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 78ddbb5af9bb..d83dd87c31f5 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 75526473abca..c1b9076704e8 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>