openstack/horizon
Code Issues Proposed changes

Merge "Fix volume storage usage value"

Browse Source
This commit is contained in:
Jenkins 2016-12-16 05:07:21 +00:00 committed by Gerrit Code Review
commit c16c950d40
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack_dashboard/test/tests/quotas.py
View File

@ -67,7 +67,7 @@ class QuotaTests(test.APITestCase):
usages.update({'volumes': {'available': 0, 'used': 4, 'quota': 1}, usages.update({'volumes': {'available': 0, 'used': 4, 'quota': 1},
'snapshots': {'available': 0, 'used': 3, 'snapshots': {'available': 0, 'used': 3,
'quota': 1}, 'quota': 1},
'gigabytes': {'available': 880, 'used': 120, 'gigabytes': {'available': 600, 'used': 400,
'quota': 1000}}) 'quota': 1000}})
return usages return usages

4
openstack_dashboard/usage/quotas.py
View File

@ -381,7 +381,9 @@ def _get_tenant_volume_usages(request, usages, disabled_quotas, tenant_id):
else: else:
volumes = cinder.volume_list(request) volumes = cinder.volume_list(request)
snapshots = cinder.volume_snapshot_list(request) snapshots = cinder.volume_snapshot_list(request)
usages.tally('gigabytes', sum([int(v.size) for v in volumes])) volume_usage = sum([int(v.size) for v in volumes])
snapshot_usage = sum([int(s.size) for s in snapshots])
usages.tally('gigabytes', (snapshot_usage + volume_usage))
usages.tally('volumes', len(volumes)) usages.tally('volumes', len(volumes))
usages.tally('snapshots', len(snapshots)) usages.tally('snapshots', len(snapshots))
except cinder.cinder_exception.ClientException: except cinder.cinder_exception.ClientException: