From fb5ca63ade7a38fa9af691fb7a804baad15c1843 Mon Sep 17 00:00:00 2001 From: Dan Smith Date: Wed, 15 Mar 2017 16:20:29 -0700 Subject: [PATCH] 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 Part of blueprint cells-count-resources-to-check-quota-in-api Change-Id: I9c86e5776abcce5c4497c47fee3bf036a279ff3d --- nova/api/openstack/compute/used_limits.py | 11 +---------- .../unit/api/openstack/compute/test_used_limits.py | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/nova/api/openstack/compute/used_limits.py b/nova/api/openstack/compute/used_limits.py index 8660a9342ead..1e373a64c693 100644 --- a/nova/api/openstack/compute/used_limits.py +++ b/nova/api/openstack/compute/used_limits.py @@ -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) diff --git a/nova/tests/unit/api/openstack/compute/test_used_limits.py b/nova/tests/unit/api/openstack/compute/test_used_limits.py index 0c3952f4b586..4f81b24493a3 100644 --- a/nova/tests/unit/api/openstack/compute/test_used_limits.py +++ b/nova/tests/unit/api/openstack/compute/test_used_limits.py @@ -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)