From d93485a8a3a955617ab7c3c66691f55e3b58455f Mon Sep 17 00:00:00 2001 From: Adrian Turjak Date: Wed, 14 Feb 2018 12:27:33 +1300 Subject: [PATCH] Use include_usage param in adjutant quota get view Adjutant-ui was requesting data for all regions when it didn't need usage for all regions. This gives us a way to avoid that. Change-Id: Iecb474b86c6cd1454f4eb61f7b1326bd65b1dcfa --- adjutant_ui/api/adjutant.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/adjutant_ui/api/adjutant.py b/adjutant_ui/api/adjutant.py index 3451656..60b5e84 100644 --- a/adjutant_ui/api/adjutant.py +++ b/adjutant_ui/api/adjutant.py @@ -570,12 +570,12 @@ def _is_quota_important(service, resource): @memoized.memoized_method -def _get_quota_information(request, regions=None): +def _get_quota_information(request, regions=None, include_usage=True): headers = {'Content-Type': 'application/json', 'X-Auth-Token': request.user.token.id} - params = {} + params = {'include_usage': include_usage} if regions: - params = {'regions': regions} + params['regions'] = regions try: return get(request, 'openstack/quotas/', params=params, headers=headers).json() @@ -590,7 +590,7 @@ def quota_sizes_get(request, region=None): # Region param is useless here, but nedded for memoized decorator to work quota_sizes_dict = {} - resp = _get_quota_information(request, regions=region) + resp = _get_quota_information(request, regions=region, include_usage=False) for size_name, size in six.iteritems(resp['quota_sizes']): quota_sizes_dict[size_name] = QUOTA_SIZE( @@ -689,7 +689,7 @@ def quota_details_get(request, region): def region_quotas_get(request, region=None): quota_details = [] - resp = _get_quota_information(request, regions=region) + resp = _get_quota_information(request, regions=region, include_usage=False) data = resp['regions'] for region_values in data: @@ -709,7 +709,7 @@ def quota_tasks_get(request, region=None): # Region param only used to help with memoized decorator quota_tasks = [] - resp = _get_quota_information(request, regions=region) + resp = _get_quota_information(request, regions=region, include_usage=False) for task in resp['active_quota_tasks']: quota_tasks.append(