openstack
/
horizon
Code Issues Proposed changes

Merge "Ensure to use tenant_quota_usages"

This commit is contained in:
Zuul 2019-03-07 17:37:34 +00:00 committed by Gerrit Code Review
parent b643da376c b57eea0042
commit 65b2fe1d19
4 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openstack_dashboard/dashboards/project/vg_snapshots/views.py
View File

@ -136,14 +136,15 @@ class CreateGroupView(forms.ModalFormView):
volumes = api.cinder.volume_list(self.request,
search_opts=search_opts)
num_volumes = len(volumes)
usages = quotas.tenant_limit_usages(self.request)
usages = quotas.tenant_quota_usages(
self.request, targets=('volumes', 'gigabytes'))
if usages['totalVolumesUsed'] + num_volumes > \
usages['maxTotalVolumes']:
if (usages['volumes']['used'] + num_volumes >
usages['volumes']['quota']):
raise ValueError(_('Unable to create group due to '
'exceeding volume quota limit.'))
else:
usages['numRequestedItems'] = num_volumes
context['numRequestedItems'] = num_volumes
context['usages'] = usages
except ValueError as e:

14
openstack_dashboard/dashboards/project/volume_groups/templates/volume_groups/_snapshot_limits.html
View File

@ -1,4 +1,4 @@
{% extends "project/volumes/_volume_limits.html" %}
{% extends "project/volumes/_snapshot_limits.html" %}
{% load i18n horizon humanize %}
{% block title %}
@ -10,11 +10,11 @@
{% endblock %}
{% block gigabytes_used %}
{{ usages.totalGigabytesUsed|intcomma }}
{{ usages.gigabytes.used|intcomma }}
{% endblock %}
{% block gigabytes_used_progress %}
"{{ usages.totalGigabytesUsed }}"
"{{ usages.gigabytes.used }}"
{% endblock %}
{% block type_title %}
@ -22,11 +22,11 @@
{% endblock %}
{% block used %}
{{ usages.totalSnapshotsUsed|intcomma }}
{{ usages.snapshots.used|intcomma }}
{% endblock %}
{% block total %}
{{ usages.maxTotalSnapshots|intcomma|quota }}
{{ usages.snapshots.quota|intcomma|quota }}
{% endblock %}
{% block type_id %}
@ -34,9 +34,9 @@
{% endblock %}
{% block total_progress %}
"{{ usages.maxTotalSnapshots }}"
"{{ usages.snapshots.quota }}"
{% endblock %}
{% block used_progress %}
"{{ usages.totalSnapshotsUsed }}"
"{{ usages.snapshots.used }}"
{% endblock %}

2
openstack_dashboard/dashboards/project/volume_groups/templates/volume_groups/clone_group.html
View File

@ -3,5 +3,5 @@
{% block title %}{{ page_title }}{% endblock %}
{% block main %}
{% include 'project/volume_groups/_clone_cgroup.html' %}
{% include 'project/volume_groups/_clone_group.html' %}
{% endblock %}

18
openstack_dashboard/dashboards/project/volume_groups/views.py
View File

@ -203,14 +203,15 @@ class CreateSnapshotView(forms.ModalFormView):
volumes = api.cinder.volume_list(self.request,
search_opts=search_opts)
num_volumes = len(volumes)
usages = quotas.tenant_limit_usages(self.request)
usages = quotas.tenant_quota_usages(
self.request, targets=('snapshots', 'gigabytes'))
if usages['totalSnapshotsUsed'] + num_volumes > \
usages['maxTotalSnapshots']:
if (usages['snapshots']['used'] + num_volumes >
usages['snapshots']['quota']):
raise ValueError(_('Unable to create snapshots due to '
'exceeding snapshot quota limit.'))
else:
usages['numRequestedItems'] = num_volumes
context['numRequestedItems'] = num_volumes
context['usages'] = usages
except ValueError as e:
@ -246,14 +247,15 @@ class CloneGroupView(forms.ModalFormView):
volumes = api.cinder.volume_list(self.request,
search_opts=search_opts)
num_volumes = len(volumes)
usages = quotas.tenant_limit_usages(self.request)
usages = quotas.tenant_quota_usages(
self.request, targets=('volumes', 'gigabytes'))
if usages['totalVolumesUsed'] + num_volumes > \
usages['maxTotalVolumes']:
if (usages['volumes']['used'] + num_volumes >
usages['volumes']['quota']):
raise ValueError(_('Unable to create group due to '
'exceeding volume quota limit.'))
else:
usages['numRequestedItems'] = num_volumes
context['numRequestedItems'] = num_volumes
context['usages'] = usages
except ValueError as e: