openstack
/
manila
Code Issues Proposed changes

Fixed absolute limits.

This commit is contained in:
Yulia Portnova 2013-09-18 16:52:05 +03:00
parent 27b3074627
commit a0ed749e13
2 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manila/api/views/limits.py
View File

@ -44,16 +44,9 @@ class ViewBuilder(object):
"""
limit_names = {
"ram": ["maxTotalRAMSize"],
"instances": ["maxTotalInstances"],
"cores": ["maxTotalCores"],
"gigabytes": ["maxTotalVolumeGigabytes"],
"volumes": ["maxTotalVolumes"],
"key_pairs": ["maxTotalKeypairs"],
"floating_ips": ["maxTotalFloatingIps"],
"metadata_items": ["maxServerMeta", "maxImageMeta"],
"injected_files": ["maxPersonality"],
"injected_file_content_bytes": ["maxPersonalitySize"],
"gigabytes": ["maxTotalShareGigabytes"],
"shares": ["maxTotalShares"],
"snapshots": ["maxTotalSnapshots"]
}
limits = {}
for name, value in absolute_limits.iteritems():

22
manila/tests/api/v1/test_limits.py
View File

@ -118,7 +118,8 @@ class LimitsControllerTest(BaseLimitTestSuite):
request = self._populate_limits(request)
self.absolute_limits = {
'gigabytes': 512,
'volumes': 5,
'shares': 5,
'snapshots': 5
}
response = request.get_response(self.controller)
expected = {
@ -159,8 +160,10 @@ class LimitsControllerTest(BaseLimitTestSuite):
},
],
"absolute": {"maxTotalVolumeGigabytes": 512,
"maxTotalVolumes": 5, },
"absolute": {"maxTotalShareGigabytes": 512,
"maxTotalShares": 5,
"maxTotalSnapshots": 5,
},
},
}
body = jsonutils.loads(response.body)
@ -769,9 +772,9 @@ class LimitsViewBuilderTest(test.TestCase):
"remaining": 10,
"unit": "DAY",
"resetTime": 1311272226}]
self.absolute_limits = {"metadata_items": 1,
"injected_files": 5,
"injected_file_content_bytes": 5}
self.absolute_limits = {"shares": 1,
"gigabytes": 5,
"snapshots": 5}
def test_build_limits(self):
tdate = "2011-07-21T18:17:06Z"
@ -790,10 +793,9 @@ class LimitsViewBuilderTest(test.TestCase):
"remaining": 10,
"unit": "DAY",
"next-available": tdate}]}],
"absolute": {"maxServerMeta": 1,
"maxImageMeta": 1,
"maxPersonality": 5,
"maxPersonalitySize": 5}}}
"absolute": {"maxTotalShareGigabytes": 5,
"maxTotalShares": 1,
"maxTotalSnapshots": 5}}}
output = self.view_builder.build(self.rate_limits,
self.absolute_limits)