openstack/cinder
Code Issues Proposed changes

Cleanup limit view name processing

Browse Source 
There were several limit names in the limit view builder that
appear to have been copied over from the split from nova. Each
name gets checked against the actual returned Cinder limit data
so this was adding a very small but unnecessary extra processing
while parsing the limits.

Pared names to check down to only those names actually being used
by Cinder.

Change-Id: I712f5dd047a533604645e655a80e542a05fb10e0
This commit is contained in:
Sean McGinnis
2017-01-06 15:29:15 -06:00
parent 7d35ed7bff
commit b7e7a33d5a
3 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cinder/api/views/limits.py
-8
View File
@@ -40,19 +40,11 @@ class ViewBuilder(object):
"""
limit_names = {
"ram": ["maxTotalRAMSize"],
"instances": ["maxTotalInstances"],
"cores": ["maxTotalCores"],
"gigabytes": ["maxTotalVolumeGigabytes"],
"backup_gigabytes": ["maxTotalBackupGigabytes"],
"volumes": ["maxTotalVolumes"],
"snapshots": ["maxTotalSnapshots"],
"backups": ["maxTotalBackups"],
"key_pairs": ["maxTotalKeypairs"],
"floating_ips": ["maxTotalFloatingIps"],
"metadata_items": ["maxServerMeta", "maxImageMeta"],
"injected_files": ["maxPersonality"],
"injected_file_content_bytes": ["maxPersonalitySize"],
}
limits = {}
for name, value in absolute_limits.items():
cinder/tests/unit/api/v1/test_limits.py
+10 -7
View File
@@ -758,9 +758,11 @@ 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 = {"gigabytes": 1,
"backup_gigabytes": 2,
"volumes": 3,
"snapshots": 4,
"backups": 5}
def test_build_limits(self):
tdate = "2011-07-21T18:17:06"
@@ -779,10 +781,11 @@ class LimitsViewBuilderTest(test.TestCase):
"remaining": 10,
"unit": "DAY",
"next-available": tdate}]}],
"absolute": {"maxServerMeta": 1,
"maxImageMeta": 1,
"maxPersonality": 5,
"maxPersonalitySize": 5}}}
"absolute": {"maxTotalVolumeGigabytes": 1,
"maxTotalBackupGigabytes": 2,
"maxTotalVolumes": 3,
"maxTotalSnapshots": 4,
"maxTotalBackups": 5}}}
output = self.view_builder.build(self.rate_limits,
self.absolute_limits)
cinder/tests/unit/api/v2/test_limits.py
+10 -7
View File
@@ -764,9 +764,11 @@ 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 = {"gigabytes": 1,
"backup_gigabytes": 2,
"volumes": 3,
"snapshots": 4,
"backups": 5}
def test_build_limits(self):
tdate = "2011-07-21T18:17:06"
@@ -785,10 +787,11 @@ class LimitsViewBuilderTest(test.TestCase):
"remaining": 10,
"unit": "DAY",
"next-available": tdate}]}],
"absolute": {"maxServerMeta": 1,
"maxImageMeta": 1,
"maxPersonality": 5,
"maxPersonalitySize": 5}}}
"absolute": {"maxTotalVolumeGigabytes": 1,
"maxTotalBackupGigabytes": 2,
"maxTotalVolumes": 3,
"maxTotalSnapshots": 4,
"maxTotalBackups": 5}}}
output = self.view_builder.build(self.rate_limits,
self.absolute_limits)