openstack
/
nova
Code Issues Proposed changes

Remove 'reserved' count from used limits 

Since we are no longer doing any quota reservations, the 'reserved'
value will always be zero and there's no need to query for the
reserved count.

Co-Authored-By: melanie witt <melwittt@gmail.com>

Part of blueprint cells-count-resources-to-check-quota-in-api

Change-Id: I9c86e5776abcce5c4497c47fee3bf036a279ff3d
This commit is contained in:
Dan Smith 2017-03-15 16:20:29 -07:00 committed by melanie witt
parent 39fed19b12
commit fb5ca63ade
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nova/api/openstack/compute/used_limits.py
View File

@ -27,13 +27,6 @@ QUOTAS = quota.QUOTAS
class UsedLimitsController(wsgi.Controller):
@staticmethod
def _reserved(req):
try:
return int(req.GET['reserved'])
except (ValueError, KeyError):
return False
@wsgi.extends
@extensions.expected_errors(())
def index(self, req, resp_obj):
@ -61,9 +54,7 @@ class UsedLimitsController(wsgi.Controller):
used_limits = {}
for display_name, key in quota_map.items():
if key in quotas:
reserved = (quotas[key]['reserved']
if self._reserved(req) else 0)
used_limits[display_name] = quotas[key]['in_use'] + reserved
used_limits[display_name] = quotas[key]['in_use']
resp_obj.obj['limits']['absolute'].update(used_limits)

2
nova/tests/unit/api/openstack/compute/test_used_limits.py
View File

@ -73,7 +73,7 @@ class UsedLimitsTestCaseV21(test.NoDBTestCase):
for display_name, q in quota_map.items():
limits[q] = {'limit': len(display_name),
'in_use': len(display_name) / 2,
'reserved': len(display_name) / 3}
'reserved': 0}
if (self.include_server_group_quotas or
display_name != 'totalServerGroupsUsed'):
expected_abs_limits.append(display_name)