openstack/horizon
Code Issues Proposed changes

Merge "List all tenant images/snapshots on admin images view"

Browse Source
This commit is contained in:
Jenkins 2014-02-25 12:21:17 +00:00 committed by Gerrit Code Review
commit ca4e457da0
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
openstack_dashboard/dashboards/admin/images/tests.py
View File

@ -37,9 +37,11 @@ class ImageCreateViewTest(test.BaseAdminViewTests):
class ImagesViewTest(test.BaseAdminViewTests): class ImagesViewTest(test.BaseAdminViewTests):
@test.create_stubs({api.glance: ('image_list_detailed',)}) @test.create_stubs({api.glance: ('image_list_detailed',)})
def test_images_list(self): def test_images_list(self):
filters = {'is_public': None}
api.glance.image_list_detailed(IsA(http.HttpRequest), api.glance.image_list_detailed(IsA(http.HttpRequest),
marker=None, marker=None,
paginate=True) \ paginate=True,
filters=filters) \
.AndReturn([self.images.list(), .AndReturn([self.images.list(),
False]) False])
self.mox.ReplayAll() self.mox.ReplayAll()
@ -54,25 +56,29 @@ class ImagesViewTest(test.BaseAdminViewTests):
@test.create_stubs({api.glance: ('image_list_detailed',)}) @test.create_stubs({api.glance: ('image_list_detailed',)})
def test_images_list_get_pagination(self): def test_images_list_get_pagination(self):
images = self.images.list()[:5] images = self.images.list()[:5]
filters = {'is_public': None}
api.glance.image_list_detailed(IsA(http.HttpRequest), api.glance.image_list_detailed(IsA(http.HttpRequest),
marker=None, marker=None,
paginate=True) \ paginate=True,
filters=filters) \
.AndReturn([images, .AndReturn([images,
True]) True])
api.glance.image_list_detailed(IsA(http.HttpRequest), api.glance.image_list_detailed(IsA(http.HttpRequest),
marker=None, marker=None,
paginate=True) \ paginate=True,
filters=filters) \
.AndReturn([images[:2], .AndReturn([images[:2],
True]) True])
api.glance.image_list_detailed(IsA(http.HttpRequest), api.glance.image_list_detailed(IsA(http.HttpRequest),
marker=images[2].id, marker=images[2].id,
paginate=True) \ paginate=True,
filters=filters) \
.AndReturn([images[2:4], .AndReturn([images[2:4],
True]) True])
api.glance.image_list_detailed(IsA(http.HttpRequest), api.glance.image_list_detailed(IsA(http.HttpRequest),
marker=images[4].id, marker=images[4].id,
paginate=True) \ paginate=True,
filters=filters) \
.AndReturn([images[4:], .AndReturn([images[4:],
True]) True])
self.mox.ReplayAll() self.mox.ReplayAll()

4
openstack_dashboard/dashboards/admin/images/views.py
View File

@ -41,12 +41,14 @@ class IndexView(tables.DataTableView):
def get_data(self): def get_data(self):
images = [] images = []
filters = {'is_public': None}
marker = self.request.GET.get( marker = self.request.GET.get(
project_tables.AdminImagesTable._meta.pagination_param, None) project_tables.AdminImagesTable._meta.pagination_param, None)
try: try:
images, self._more = api.glance.image_list_detailed(self.request, images, self._more = api.glance.image_list_detailed(self.request,
marker=marker, marker=marker,
paginate=True) paginate=True,
filters=filters)
except Exception: except Exception:
self._more = False self._more = False
msg = _('Unable to retrieve image list.') msg = _('Unable to retrieve image list.')