Remove all_tenants from server_list of Floating IPs tab

Change-Id: I050bdcccdc88c80b636f1061d60cc2dc5086d9b8 Fixes: bug #1203394
openstack · Jul 22, 2013 · 2987653 · 2987653
1 parent ef8ca80
commit 2987653
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/openstack_dashboard/dashboards/project/access_and_security/floating_ips/tests.py b/openstack_dashboard/dashboards/project/access_and_security/floating_ips/tests.py
@@ -128,9 +128,8 @@ def test_disassociate_post(self):
         self.mox.StubOutWithMock(api.network, 'floating_ip_disassociate')
         self.mox.StubOutWithMock(api.nova, 'server_list')
 
-        api.nova.server_list(IsA(http.HttpRequest),
-                             all_tenants=True).AndReturn([self.servers.list(),
-                                                          False])
+        api.nova.server_list(IsA(http.HttpRequest)) \
+                            .AndReturn([self.servers.list(), False])
         api.network.tenant_floating_ip_list(IsA(http.HttpRequest)) \
                                     .AndReturn(self.floating_ips.list())
         api.network.floating_ip_disassociate(IsA(http.HttpRequest),
@@ -151,9 +150,8 @@ def test_disassociate_post_with_exception(self):
         self.mox.StubOutWithMock(api.network, 'floating_ip_disassociate')
         self.mox.StubOutWithMock(api.nova, 'server_list')
 
-        api.nova.server_list(IsA(http.HttpRequest),
-                             all_tenants=True).AndReturn([self.servers.list(),
-                                                          False])
+        api.nova.server_list(IsA(http.HttpRequest)) \
+                        .AndReturn([self.servers.list(), False])
         api.network.tenant_floating_ip_list(IsA(http.HttpRequest)) \
             .AndReturn(self.floating_ips.list())
 

diff --git a/openstack_dashboard/dashboards/project/access_and_security/tabs.py b/openstack_dashboard/dashboards/project/access_and_security/tabs.py
@@ -95,8 +95,7 @@ def get_floating_ips_data(self):
 
         instances = []
         try:
-            instances, has_more = nova.server_list(self.request,
-                                                   all_tenants=True)
+            instances, has_more = nova.server_list(self.request)
         except:
             exceptions.handle(self.request,
                         _('Unable to retrieve instance list.'))

diff --git a/openstack_dashboard/dashboards/project/access_and_security/tests.py b/openstack_dashboard/dashboards/project/access_and_security/tests.py
@@ -44,9 +44,8 @@ def test_index(self):
         self.mox.StubOutWithMock(api.nova, 'keypair_list')
         self.mox.StubOutWithMock(api.nova, 'server_list')
 
-        api.nova.server_list(IsA(http.HttpRequest),
-                             all_tenants=True).AndReturn([self.servers.list(),
-                                                          False])
+        api.nova.server_list(IsA(http.HttpRequest)) \
+                    .AndReturn([self.servers.list(), False])
         api.nova.keypair_list(IsA(http.HttpRequest)).AndReturn(keypairs)
         api.network.tenant_floating_ip_list(IsA(http.HttpRequest)) \
             .AndReturn(floating_ips)