From 0ec2e43041ea52d26f0ba5f4e49e29997af22251 Mon Sep 17 00:00:00 2001 From: Liam Young Date: Mon, 18 May 2020 18:25:09 +0000 Subject: [PATCH] Fix ceph rbd mirror test I recently broke the ceph rbd mirror test due to get_images_by_name returning a list of images not a single image. --- zaza/openstack/charm_tests/ceph/rbd_mirror/tests.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/zaza/openstack/charm_tests/ceph/rbd_mirror/tests.py b/zaza/openstack/charm_tests/ceph/rbd_mirror/tests.py index 2e238ae..6c2fa1b 100644 --- a/zaza/openstack/charm_tests/ceph/rbd_mirror/tests.py +++ b/zaza/openstack/charm_tests/ceph/rbd_mirror/tests.py @@ -199,12 +199,14 @@ class CephRBDMirrorTest(CephRBDMirrorBase): glance = openstack.get_glance_session_client(session) cinder = openstack.get_cinder_session_client(session) - image = openstack.get_images_by_name(glance, CIRROS_IMAGE_NAME) - if not image: + images = openstack.get_images_by_name(glance, CIRROS_IMAGE_NAME) + if images: + image = images[0] + else: logging.info("Failed to find {} image, falling back to {}".format( CIRROS_IMAGE_NAME, LTS_IMAGE_NAME)) - image = openstack.get_images_by_name(glance, LTS_IMAGE_NAME) + image = openstack.get_images_by_name(glance, LTS_IMAGE_NAME)[0] # NOTE(fnordahl): for some reason create volume from image often fails # when run just after deployment is finished. We should figure out