diff options
Diffstat (limited to 'yardstick/common')
-rw-r--r-- | yardstick/common/exceptions.py | 4 | ||||
-rw-r--r-- | yardstick/common/openstack_utils.py | 19 |
2 files changed, 12 insertions, 11 deletions
diff --git a/yardstick/common/exceptions.py b/yardstick/common/exceptions.py index faa8688d8..1aeee20fe 100644 --- a/yardstick/common/exceptions.py +++ b/yardstick/common/exceptions.py @@ -274,6 +274,10 @@ class ScenarioCreateImageError(YardstickException): message = 'Glance Create Image Scenario failed' +class ScenarioDeleteImageError(YardstickException): + message = 'Glance Delete Image Scenario failed' + + class IxNetworkClientNotConnected(YardstickException): message = 'IxNetwork client not connected to a TCL server' diff --git a/yardstick/common/openstack_utils.py b/yardstick/common/openstack_utils.py index 56cd4958e..666404779 100644 --- a/yardstick/common/openstack_utils.py +++ b/yardstick/common/openstack_utils.py @@ -709,11 +709,6 @@ def create_security_group_full(shade_client, sg_name, # ********************************************* # GLANCE # ********************************************* -def get_image_id(glance_client, image_name): # pragma: no cover - images = glance_client.images.list() - return next((i.id for i in images if i.name == image_name), None) - - def create_image(shade_client, name, filename=None, container='images', md5=None, sha256=None, disk_format=None, container_format=None, disable_vendor_agent=True, @@ -772,15 +767,17 @@ def create_image(shade_client, name, filename=None, container='images', "Exception message: %s", op_exc.orig_message) -def delete_image(glance_client, image_id): # pragma: no cover +def delete_image(shade_client, name_or_id, wait=False, timeout=3600, + delete_objects=True): try: - glance_client.images.delete(image_id) + return shade_client.delete_image(name_or_id, wait=wait, + timeout=timeout, + delete_objects=delete_objects) - except Exception: # pylint: disable=broad-except - log.exception("Error [delete_flavor(glance_client, %s)]", image_id) + except exc.OpenStackCloudException as op_exc: + log.error("Failed to delete_image(shade_client). " + "Exception message: %s", op_exc.orig_message) return False - else: - return True def list_images(shade_client=None): |