From: jose.lausuch <jose.lausuch@ericsson.com>
Date: Wed, 16 Dec 2015 22:44:58 +0000 (+0100)
Subject: Add clean_openstack script call in clean functest environment
X-Git-Tag: brahmaputra.1.0~248^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9ce78e3f50d09fede33ddf85bb5b3da691e04ba2;p=functest.git

Add clean_openstack script call in clean functest environment

Reason: sometimes, if you run functest, it creates openstack stuff
and fails, when you run it the second time it can fail if
it tries to create the same openstack stuff

Change-Id: I1825a02918f188c409398d2b6b95843d7fdd5993
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
---

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!")