openstack/rally
Code Issues Proposed changes

Merge "Fix image list atomic action for both v1 and v2"

Browse Source
This commit is contained in:
Jenkins 2017-09-26 16:20:33 +00:00 committed by Gerrit Code Review
commit 1f0985ae16
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rally/plugins/openstack/services/image/glance_v1.py
View File

@ -106,10 +106,11 @@ class GlanceV1Service(service.Service, glance_common.GlanceMixin):
:param is_public: Filter in images for the specified public status
:param owner: Filter in images for tenant ID
"""
images = self._clients.glance("1").images.list(status=status,
owner=owner,
is_public=is_public)
return images
# NOTE(boris-42): image.list() is lazy method which doesn't query API
# until it's used, do not remove list().
return list(self._clients.glance("1").images.list(status=status,
owner=owner,
is_public=is_public))
@atomic.action_timer("glance_v1.set_visibility")
def set_visibility(self, image_id, is_public=True):

5
rally/plugins/openstack/services/image/glance_v2.py
View File

@ -127,8 +127,9 @@ class GlanceV2Service(service.Service, glance_common.GlanceMixin):
filters["visibility"] = visibility
if owner:
filters["owner"] = owner
images = self._clients.glance("2").images.list(filters=filters)
return images
# NOTE(boris-42): image.list() is lazy method which doesn't query API
# until it's used, do not remove list().
return list(self._clients.glance("2").images.list(filters=filters))
@atomic.action_timer("glance_v2.set_visibility")
def set_visibility(self, image_id, visibility="shared"):

4
tests/unit/plugins/openstack/services/image/test_glance_v2.py
View File

@ -117,9 +117,9 @@ class GlanceV2ServiceTestCase(test.TestCase):
status = "active"
kwargs = {"status": status}
filters = {"filters": kwargs}
self.gc.images.list.return_value = iter([1, 2, 3])
self.assertEqual(self.gc.images.list.return_value,
self.service.list_images())
self.assertEqual([1, 2, 3], self.service.list_images())
self.gc.images.list.assert_called_once_with(**filters)
def test_set_visibility(self):