openstack/nova
Code Issues Proposed changes

Merge "Fix errors in used_limits extension"

Browse Source
This commit is contained in:
Jenkins 2012-12-14 14:02:52 +00:00 committed by Gerrit Code Review
commit 0597c1ccd3
6 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/api_samples/os-used-limits/usedlimits-get-resp.json
View File

@ -14,9 +14,9 @@
"maxTotalRAMSize": 51200,
"totalCoresUsed": 0,
"totalInstancesUsed": 0,
"totalKeyPairsUsed": 0,
"totalRAMUsed": 0,
"totalSecurityGroupsUsed": 0
"totalSecurityGroupsUsed": 0,
"totalFloatingIpsUsed": 0
},
"rate": [
{

2
doc/api_samples/os-used-limits/usedlimits-get-resp.xml
View File

@ -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"/>

6
nova/api/openstack/compute/contrib/used_limits.py
View File

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

6
nova/tests/api/openstack/compute/contrib/test_used_limits.py
View File

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

4
nova/tests/integrated/api_samples/os-used-limits/usedlimits-get-resp.json.tpl
View File

@ -14,9 +14,9 @@
"maxTotalRAMSize": 51200,
"totalCoresUsed": 0,
"totalInstancesUsed": 0,
"totalKeyPairsUsed": 0,
"totalRAMUsed": 0,
"totalSecurityGroupsUsed": 0
"totalSecurityGroupsUsed": 0,
"totalFloatingIpsUsed": 0
},
"rate": [
{

2
nova/tests/integrated/api_samples/os-used-limits/usedlimits-get-resp.xml.tpl
View File

@ -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>