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
---
 doc/api_samples/os-used-limits/usedlimits-get-resp.json | 4 ++--
 doc/api_samples/os-used-limits/usedlimits-get-resp.xml  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'doc')

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 21ed3a082..c5593b7e7 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 745a4828a..c2b0572e5 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"/>
-- 
cgit