openstack/horizon
Code Issues Proposed changes

Quota cleanup of dynamic methods

Browse Source 
Removing the usage of calling dynamic methods within the
quotas code.  This makes it difficult to support and see
who is calling what code.

Change-Id: Ie2c6be3233dd2cff16eb2271e2ac3f4b04d6e2b5
Implements: blueprint make-quotas-great-again
This commit is contained in:
eric 2016-09-19 08:50:15 -06:00
parent 90d7a3f79f
commit 5d64e2db73
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
openstack_dashboard/usage/quotas.py
View File

@ -136,7 +136,7 @@ class QuotaUsage(dict):
self.usages[name]['available'] = available self.usages[name]['available'] = available
def _get_quota_data(request, method_name, disabled_quotas=None, def _get_quota_data(request, tenant_mode=True, disabled_quotas=None,
tenant_id=None): tenant_id=None):
quotasets = [] quotasets = []
if not tenant_id: if not tenant_id:
@ -147,11 +147,17 @@ def _get_quota_data(request, method_name, disabled_quotas=None,
qs = base.QuotaSet() qs = base.QuotaSet()
if 'instances' not in disabled_quotas: if 'instances' not in disabled_quotas:
quotasets.append(getattr(nova, method_name)(request, tenant_id)) if tenant_mode:
quotasets.append(nova.tenant_quota_get(request, tenant_id))
else:
quotasets.append(nova.default_quota_get(request, tenant_id))
if 'volumes' not in disabled_quotas: if 'volumes' not in disabled_quotas:
try: try:
quotasets.append(getattr(cinder, method_name)(request, tenant_id)) if tenant_mode:
quotasets.append(cinder.tenant_quota_get(request, tenant_id))
else:
quotasets.append(cinder.default_quota_get(request, tenant_id))
except cinder.cinder_exception.ClientException: except cinder.cinder_exception.ClientException:
disabled_quotas.update(CINDER_QUOTA_FIELDS) disabled_quotas.update(CINDER_QUOTA_FIELDS)
msg = _("Unable to retrieve volume limit information.") msg = _("Unable to retrieve volume limit information.")
@ -164,14 +170,14 @@ def _get_quota_data(request, method_name, disabled_quotas=None,
def get_default_quota_data(request, disabled_quotas=None, tenant_id=None): def get_default_quota_data(request, disabled_quotas=None, tenant_id=None):
return _get_quota_data(request, return _get_quota_data(request,
"default_quota_get", tenant_mode=False,
disabled_quotas=disabled_quotas, disabled_quotas=disabled_quotas,
tenant_id=tenant_id) tenant_id=tenant_id)
def get_tenant_quota_data(request, disabled_quotas=None, tenant_id=None): def get_tenant_quota_data(request, disabled_quotas=None, tenant_id=None):
qs = _get_quota_data(request, qs = _get_quota_data(request,
"tenant_quota_get", tenant_mode=True,
disabled_quotas=disabled_quotas, disabled_quotas=disabled_quotas,
tenant_id=tenant_id) tenant_id=tenant_id)