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: 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
---
 nova/api/openstack/compute/contrib/used_limits.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'nova/api')

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():
-- 
cgit