diff options
| author |   SerenaFeng <feng.xiaowei@zte.com.cn> | 2016-08-23 13:44:36 +0800 |
|---|---|---|
| committer | SerenaFeng <feng.xiaowei@zte.com.cn> | 2016-08-26 09:21:06 +0800 |
| commit | 5f5af6b1d8d0af19db143e67f04f67a643af863c (patch) | |
| tree | a533329bde635c1fe42f125c587fdc6b1cebed49 /testcases/OpenStack/tempest/run_tempest.py | |
| parent | 3c9c072e82feca7c374aa83fe7cb4466c71823ce (diff) | |
refactor create or get image process to eliminate reduplicate
Some places when create image is referred, they check if image exist,
if exist use it directly, else create a new one.
Abstract a method to integrate the process
JIRA: FUNCTEST-432
Change-Id: I83d1112aa5cb0d3cdfab92fd49cd5f2c1cceff82
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
Diffstat (limited to 'testcases/OpenStack/tempest/run_tempest.py')
| -rwxr-xr-x | testcases/OpenStack/tempest/run_tempest.py | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/testcases/OpenStack/tempest/run_tempest.py b/testcases/OpenStack/tempest/run_tempest.py index 64a5ed778..10b22c9f5 100755 --- a/testcases/OpenStack/tempest/run_tempest.py +++ b/testcases/OpenStack/tempest/run_tempest.py @@ -126,7 +126,6 @@ def get_info(file_result): def create_tempest_resources(): keystone_client = os_utils.get_keystone_client() neutron_client = os_utils.get_neutron_client() - glance_client = os_utils.get_glance_client() logger.debug("Creating tenant and user for Tempest suite") tenant_id = os_utils.create_tenant(keystone_client, @@ -159,22 +158,11 @@ def create_tempest_resources(): exit(-1) logger.debug("Creating image for Tempest suite") - # 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(-1) - 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) def configure_tempest(deployment_dir): |