summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2015-12-17 08:37:52 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-12-17 08:37:52 +0000
commitf5cd497a4cfd73e630bc8dda07c920a505061a81 (patch)
tree6d63e73b59e1e1e2998ccbc970c322ea9bf89806
parent3e73c7acf245f8480404f5f36e94cd8c0e7a3ed0 (diff)
parent9ce78e3f50d09fede33ddf85bb5b3da691e04ba2 (diff)
Merge "Add clean_openstack script call in clean functest environment"
-rwxr-xr-xtestcases/config_functest.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/testcases/config_functest.py b/testcases/config_functest.py
index 11b31c9e8..1d834bb37 100755
--- a/testcases/config_functest.py
+++ b/testcases/config_functest.py
@@ -47,8 +47,6 @@ with open(args.repo_path+"testcases/config_functest.yaml") as f:
f.close()
-
-
""" global variables """
# Directories
REPO_PATH = args.repo_path
@@ -195,7 +193,11 @@ def action_clean():
logger.debug("Removing Result directory")
shutil.rmtree(RALLY_RESULT_DIR,ignore_errors=True)
-
+ logger.debug("Cleaning up the OpenStack deployment...")
+ cmd='python ' + args.repo_path + \
+ '/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py -d ' \
+ +args.repo_path
+ functest_utils.execute_command(cmd,logger)
logger.info("Functest environment clean!")