diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2016-08-26 06:48:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-08-26 06:48:26 +0000 |
| commit | 874eac1d00c9624d084b3c7b01075a7645c5b840 (patch) | |
| tree | e5716aad90288dfaa9d39fc550571862381f6e87 /testcases/OpenStack/rally/run_rally-cert.py | |
| parent | 2b22d89b5a3dc212774d0a426e53d569f98173a7 (diff) | |
| parent | 5f5af6b1d8d0af19db143e67f04f67a643af863c (diff) | |
Merge "refactor create or get image process to eliminate reduplicate"
Diffstat (limited to 'testcases/OpenStack/rally/run_rally-cert.py')
| -rwxr-xr-x | testcases/OpenStack/rally/run_rally-cert.py | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/testcases/OpenStack/rally/run_rally-cert.py b/testcases/OpenStack/rally/run_rally-cert.py index 92dbddff..279bcde0 100755 --- a/testcases/OpenStack/rally/run_rally-cert.py +++ b/testcases/OpenStack/rally/run_rally-cert.py @@ -376,7 +376,6 @@ def main(): nova_client = os_utils.get_nova_client() neutron_client = os_utils.get_neutron_client() - glance_client = os_utils.get_glance_client() cinder_client = os_utils.get_cinder_client() start_time = time.time() @@ -402,26 +401,11 @@ def main(): else: logger.debug("Using existing volume type(s)...") - image_id = os_utils.get_image_id(glance_client, GLANCE_IMAGE_NAME) - image_exists = False - - if image_id == '': - logger.debug("Creating image '%s' from '%s'..." % (GLANCE_IMAGE_NAME, - GLANCE_IMAGE_PATH)) - image_id = os_utils.create_glance_image(glance_client, - GLANCE_IMAGE_NAME, - GLANCE_IMAGE_PATH, - GLANCE_IMAGE_FORMAT) - if not image_id: - logger.error("Failed to create the Glance image...") - exit(-1) - else: - logger.debug("Image '%s' with ID '%s' created succesfully ." - % (GLANCE_IMAGE_NAME, image_id)) - else: - logger.debug("Using existing image '%s' with ID '%s'..." - % (GLANCE_IMAGE_NAME, image_id)) - image_exists = True + image_exists, image_id = os_utils.get_or_create_image(GLANCE_IMAGE_NAME, + GLANCE_IMAGE_PATH, + GLANCE_IMAGE_FORMAT) + if not image_id: + exit(-1) logger.debug("Creating network '%s'..." % PRIVATE_NET_NAME) network_dict = os_utils.create_network_full(neutron_client, |