aboutsummaryrefslogtreecommitdiffstats
path: root/api/resources
diff options
context:
space:
mode:
authorchenjiankun <chenjiankun1@huawei.com>2016-12-15 06:02:50 +0000
committerchenjiankun <chenjiankun1@huawei.com>2016-12-22 11:33:38 +0000
commite88d02c9d87c18dbaaf849d8b10167e6dadf485a (patch)
tree2d18c94d63599dedeaf48c2ddf2ad4f5bd00de3b /api/resources
parent70d25b87c167bc13e883da2963980cce56410f98 (diff)
Bugfix: the load_image.sh script will load a image with the same name
JIRA: YARDSTICK-471 Currently, if we execute the load_image.sh and the openstack already have this image in the cloud,this script will load another image with the same name. This will make yardstick run error. So I clean this related images before loading. Change-Id: If5b985ef9b2e890aa10453810fac36867d320a06 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
Diffstat (limited to 'api/resources')
-rw-r--r--api/resources/env_action.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/api/resources/env_action.py b/api/resources/env_action.py
index fa0f95d90..c2c93f1eb 100644
--- a/api/resources/env_action.py
+++ b/api/resources/env_action.py
@@ -195,6 +195,8 @@ def _prepare_env_daemon():
# update the external_network
_source_file(rc_file)
+ _clean_images()
+
_load_images()
@@ -251,6 +253,14 @@ def _append_external_network(rc_file):
raise
+def _clean_images():
+ cmd = [config.CLEAN_IMAGES_SCRIPT]
+ p = subprocess.Popen(cmd, stdout=subprocess.PIPE,
+ cwd=config.YARDSTICK_REPOS_DIR)
+ output = p.communicate()[0]
+ logger.debug('The result is: %s', output)
+
+
def _load_images():
cmd = [config.LOAD_IMAGES_SCRIPT]
p = subprocess.Popen(cmd, stdout=subprocess.PIPE,