From: Morgan Richomme <morgan.richomme@orange.com>
Date: Mon, 15 Jun 2015 09:12:55 +0000 (+0200)
Subject: modify functest config to prepare result folder
X-Git-Tag: arno.2015.2.0^2~25
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F20%2F820%2F3;p=functest.git

modify functest config to prepare result folder

JIRA: FUNCTEST-9

Change-Id: I7ff1452da27dc904f349bcbefbc43a480a3e8843
Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>
---

diff --git a/testcases/config_functest.py b/testcases/config_functest.py
index 48eb279be..a106f07bc 100644
--- a/testcases/config_functest.py
+++ b/testcases/config_functest.py
@@ -53,6 +53,7 @@ REPO_PATH = args.repo_path
 RALLY_DIR = REPO_PATH + functest_yaml.get("general").get("directories").get("dir_rally")
 RALLY_REPO_DIR = HOME + functest_yaml.get("general").get("directories").get("dir_rally_repo")
 RALLY_INSTALLATION_DIR = HOME + functest_yaml.get("general").get("directories").get("dir_rally_inst")
+RALLY_RESULT_DIR = HOME + functest_yaml.get("general").get("directories").get("dir_rally_res")
 VPING_DIR = REPO_PATH + functest_yaml.get("general").get("directories").get("dir_vping")
 ODL_DIR = REPO_PATH + functest_yaml.get("general").get("directories").get("dir_odl")
 
@@ -96,6 +97,9 @@ def action_start():
             action_clean()
             exit(-1)
 
+        # Create result folder under functest if necessary
+        if not os.path.exists(RALLY_RESULT_DIR):
+            os.makedirs(RALLY_RESULT_DIR)
 
         logger.info("Downloading image...")
         if not functest_utils.download_url(IMAGE_URL, IMAGE_DIR):
@@ -206,6 +210,11 @@ def action_clean():
         cmd = "glance image-delete " + image_id
         functest_utils.execute_command(cmd,logger)
 
+    if os.path.exists(RALLY_RESULT_DIR):
+        logger.debug("Removing Result directory")
+        shutil.rmtree(RALLY_RESULT_DIR,ignore_errors=True)
+
+
     logger.info("Functest environment clean!")