openstack/horizon
Code Issues Proposed changes

Merge "Fix _get_tenant_volume_usages"

Browse Source
This commit is contained in:
Jenkins 2015-07-03 01:12:28 +00:00 committed by Gerrit Code Review
commit cd6a883a9f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,7 +77,7 @@ class QuotaTests(test.APITestCase):
api.nova.server_list(IsA(http.HttpRequest), search_opts=search_opts,
all_tenants=True) \
.AndReturn([servers, False])
opts = {'alltenants': 1, 'tenant_id': self.request.user.tenant_id}
opts = {'all_tenants': 1, 'project_id': self.request.user.tenant_id}
cinder.volume_list(IsA(http.HttpRequest), opts) \
.AndReturn(self.volumes.list())
cinder.volume_snapshot_list(IsA(http.HttpRequest), opts) \
@ -201,7 +201,7 @@ class QuotaTests(test.APITestCase):
api.nova.server_list(IsA(http.HttpRequest), search_opts=search_opts,
all_tenants=True) \
.AndReturn([servers, False])
opts = {'alltenants': 1, 'tenant_id': self.request.user.tenant_id}
opts = {'all_tenants': 1, 'project_id': self.request.user.tenant_id}
cinder.volume_list(IsA(http.HttpRequest), opts) \
.AndReturn(self.volumes.list())
cinder.volume_snapshot_list(IsA(http.HttpRequest), opts) \
@ -246,7 +246,7 @@ class QuotaTests(test.APITestCase):
api.nova.server_list(IsA(http.HttpRequest), search_opts=search_opts,
all_tenants=True) \
.AndReturn([servers, False])
opts = {'alltenants': 1, 'tenant_id': self.request.user.tenant_id}
opts = {'all_tenants': 1, 'project_id': self.request.user.tenant_id}
cinder.volume_list(IsA(http.HttpRequest), opts) \
.AndReturn(self.volumes.list())
cinder.volume_snapshot_list(IsA(http.HttpRequest), opts) \

2
openstack_dashboard/usage/quotas.py
View File

@ -328,7 +328,7 @@ def _get_tenant_network_usages(request, usages, disabled_quotas, tenant_id):
def _get_tenant_volume_usages(request, usages, disabled_quotas, tenant_id):
if 'volumes' not in disabled_quotas:
if tenant_id:
opts = {'alltenants': 1, 'tenant_id': tenant_id}
opts = {'all_tenants': 1, 'project_id': tenant_id}
volumes = cinder.volume_list(request, opts)
snapshots = cinder.volume_snapshot_list(request, opts)
else: