From b334c6315020fc290c4805904475464545c6f1aa Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Thu, 24 Aug 2017 09:20:22 -0500 Subject: [PATCH] Stop reinventing the is_public filter for Glance v1 glanceclient has had a perfectly good is_public filter since Essex, so there's no need to implement it ourselves (and presumably incur a performance penalty). Change-Id: I23beeb9a3cb97db368fe4ba3b8ef5045a59ddff4 --- rally/plugins/openstack/services/image/glance_v1.py | 5 ++--- .../unit/plugins/openstack/services/image/test_glance_v1.py | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rally/plugins/openstack/services/image/glance_v1.py b/rally/plugins/openstack/services/image/glance_v1.py index 1f234045a8..5071e5aa44 100644 --- a/rally/plugins/openstack/services/image/glance_v1.py +++ b/rally/plugins/openstack/services/image/glance_v1.py @@ -107,9 +107,8 @@ class GlanceV1Service(service.Service, glance_common.GlanceMixin): :param owner: Filter in images for tenant ID """ images = self._clients.glance("1").images.list(status=status, - owner=owner) - if is_public in [True, False]: - return [i for i in images if i.is_public is is_public] + owner=owner, + is_public=is_public) return images @atomic.action_timer("glance_v1.set_visibility") diff --git a/tests/unit/plugins/openstack/services/image/test_glance_v1.py b/tests/unit/plugins/openstack/services/image/test_glance_v1.py index ca68c8a363..94f1dad52b 100755 --- a/tests/unit/plugins/openstack/services/image/test_glance_v1.py +++ b/tests/unit/plugins/openstack/services/image/test_glance_v1.py @@ -117,7 +117,8 @@ class GlanceV1ServiceTestCase(test.TestCase): self.service.list_images(is_public=is_public, status=status, owner=owner) self.gc.images.list.assert_called_once_with(status=status, - owner=owner) + owner=owner, + is_public=is_public) def test_set_visibility(self): image_id = "image_id"