From ba9e0f83176d9ebcf2c22fa69e92a2355c2e1eba Mon Sep 17 00:00:00 2001 From: liyingjun Date: Mon, 29 Jun 2015 11:42:13 +0800 Subject: [PATCH] Fix _get_tenant_volume_usages The search opts for volume/snapshot list should be 'all_tenants' and 'project_id' instead of 'alltenants' and 'tenant_id'. Change-Id: I9ab71421447b3f8fb402247df3290fa3066bf8c5 Closes-bug: #1469589 (cherry picked from commit faa44bfe1d6c4f342b8572bc4939771cda2039c7) --- openstack_dashboard/test/tests/quotas.py | 6 +++--- openstack_dashboard/usage/quotas.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openstack_dashboard/test/tests/quotas.py b/openstack_dashboard/test/tests/quotas.py index f5e62ff3f8..294fe367d0 100644 --- a/openstack_dashboard/test/tests/quotas.py +++ b/openstack_dashboard/test/tests/quotas.py @@ -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) \ diff --git a/openstack_dashboard/usage/quotas.py b/openstack_dashboard/usage/quotas.py index 348c3bf6a7..7ce66e9252 100644 --- a/openstack_dashboard/usage/quotas.py +++ b/openstack_dashboard/usage/quotas.py @@ -321,7 +321,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: