From 1a596a51d673511ca1f5ab53b202f86fde8da231 Mon Sep 17 00:00:00 2001
From: "Leandro I. Costantino" <leandro.i.costantino@intel.com>
Date: Mon, 24 Feb 2014 08:20:55 -0300
Subject: [PATCH] List all tenant images/snapshots on admin images view

Admin's Images panel shows only instance snapshots of the project
selected on Projects tab .
Add the appropiate filter is_public: None to the list request.

Change-Id: I4963515d8dbdc89512258c30e3fad309f9720436
Closes-Bug: #1283258
---
 .../dashboards/admin/images/tests.py           | 18 ++++++++++++------
 .../dashboards/admin/images/views.py           |  6 ++++--
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/openstack_dashboard/dashboards/admin/images/tests.py b/openstack_dashboard/dashboards/admin/images/tests.py
index b0436b449d..76674ad019 100644
--- a/openstack_dashboard/dashboards/admin/images/tests.py
+++ b/openstack_dashboard/dashboards/admin/images/tests.py
@@ -37,9 +37,11 @@ class ImageCreateViewTest(test.BaseAdminViewTests):
 class ImagesViewTest(test.BaseAdminViewTests):
     @test.create_stubs({api.glance: ('image_list_detailed',)})
     def test_images_list(self):
+        filters = {'is_public': None}
         api.glance.image_list_detailed(IsA(http.HttpRequest),
                                        marker=None,
-                                       paginate=True) \
+                                       paginate=True,
+                                       filters=filters) \
             .AndReturn([self.images.list(),
                         False])
         self.mox.ReplayAll()
@@ -54,25 +56,29 @@ class ImagesViewTest(test.BaseAdminViewTests):
     @test.create_stubs({api.glance: ('image_list_detailed',)})
     def test_images_list_get_pagination(self):
         images = self.images.list()[:5]
-
+        filters = {'is_public': None}
         api.glance.image_list_detailed(IsA(http.HttpRequest),
                                        marker=None,
-                                       paginate=True) \
+                                       paginate=True,
+                                       filters=filters) \
                                 .AndReturn([images,
                                             True])
         api.glance.image_list_detailed(IsA(http.HttpRequest),
                                        marker=None,
-                                       paginate=True) \
+                                       paginate=True,
+                                       filters=filters) \
                                 .AndReturn([images[:2],
                                             True])
         api.glance.image_list_detailed(IsA(http.HttpRequest),
                                        marker=images[2].id,
-                                       paginate=True) \
+                                       paginate=True,
+                                       filters=filters) \
                                 .AndReturn([images[2:4],
                                             True])
         api.glance.image_list_detailed(IsA(http.HttpRequest),
                                        marker=images[4].id,
-                                       paginate=True) \
+                                       paginate=True,
+                                       filters=filters) \
                                 .AndReturn([images[4:],
                                             True])
         self.mox.ReplayAll()
diff --git a/openstack_dashboard/dashboards/admin/images/views.py b/openstack_dashboard/dashboards/admin/images/views.py
index 9602b4ee27..9f30dd9770 100644
--- a/openstack_dashboard/dashboards/admin/images/views.py
+++ b/openstack_dashboard/dashboards/admin/images/views.py
@@ -42,12 +42,14 @@ class IndexView(tables.DataTableView):
 
     def get_data(self):
         images = []
+        filters = {'is_public': None}
         marker = self.request.GET.get(
             project_tables.AdminImagesTable._meta.pagination_param, None)
         try:
             images, self._more = api.glance.image_list_detailed(self.request,
-                                                                marker=marker,
-                                                                paginate=True)
+                                                            marker=marker,
+                                                            paginate=True,
+                                                            filters=filters)
         except Exception:
             self._more = False
             msg = _('Unable to retrieve image list.')