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/vPing | |
| parent | 2b22d89b5a3dc212774d0a426e53d569f98173a7 (diff) | |
| parent | 5f5af6b1d8d0af19db143e67f04f67a643af863c (diff) | |
Merge "refactor create or get image process to eliminate reduplicate"
Diffstat (limited to 'testcases/OpenStack/vPing')
| -rw-r--r-- | testcases/OpenStack/vPing/vping_util.py | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/testcases/OpenStack/vPing/vping_util.py b/testcases/OpenStack/vPing/vping_util.py index c16c5d659..3f4adae73 100644 --- a/testcases/OpenStack/vPing/vping_util.py +++ b/testcases/OpenStack/vPing/vping_util.py @@ -147,24 +147,11 @@ def create_security_group(): def create_image(): - EXIT_CODE = -1 - - # Check if the given image exists - image_id = os_utils.get_image_id(glance_client, GLANCE_IMAGE_NAME) - if image_id != '': - logger.info("Using existing image '%s'..." % GLANCE_IMAGE_NAME) - else: - logger.info("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 a Glance image...") - exit(EXIT_CODE) - logger.debug("Image '%s' with ID=%s created successfully." - % (GLANCE_IMAGE_NAME, image_id)) + _, image_id = os_utils.get_or_create_image(GLANCE_IMAGE_NAME, + GLANCE_IMAGE_PATH, + GLANCE_IMAGE_FORMAT) + if not image_id: + exit(-1) return image_id |