From 3e3c96b2aa15d7757f281ce00518a67e2a1225a9 Mon Sep 17 00:00:00 2001
From: helenyao <yaohelan@huawei.com>
Date: Mon, 21 Nov 2016 06:50:06 -0500
Subject: Extracted all global parameters into functest_constants.py

JIRA: FUNCTEST-533

1. Extracted all global variables into functest_constants.py and updated all affected areas accordingly
2. Used os.path.join to replace '/'  to come up with the path for better cross-platform support and improve the path accuracy
3. Removed unused variables
4. Updated the hardcoded path in Dockerfile by using variable reference
5. Removed "/" ending from all path variables
6. Updated the unit test

Change-Id: Ib30a81d1f0c83fbaef042d63c187c27bd18301bb
Signed-off-by: helenyao <yaohelan@huawei.com>
---
 functest/ci/exec_test.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'functest/ci/exec_test.sh')

diff --git a/functest/ci/exec_test.sh b/functest/ci/exec_test.sh
index f7b96af2..a71079e3 100644
--- a/functest/ci/exec_test.sh
+++ b/functest/ci/exec_test.sh
@@ -127,18 +127,18 @@ function run_test(){
         "ovno")
             # suite under rewritting for colorado
             # no need to run anything until refactoring done
-            # ${repos_dir}/ovno/Testcases/RunTests.sh
+            # ${REPOS_DIR}/ovno/Testcases/RunTests.sh
         ;;
         "security_scan")
             echo "Sourcing Credentials ${FUNCTEST_CONF_DIR}/stackrc for undercloud .."
             source ${FUNCTEST_CONF_DIR}/stackrc
-            python ${repos_dir}/securityscanning/security_scan.py --config ${repos_dir}/securityscanning/config.ini
+            python ${REPOS_DIR}/securityscanning/security_scan.py --config ${REPOS_DIR}/securityscanning/config.ini
         ;;
         "copper")
             python ${FUNCTEST_TEST_DIR}/features/copper.py $report
         ;;
         "moon")
-            python ${repos_dir}/moon/tests/run_tests.py $report
+            python ${REPOS_DIR}/moon/tests/run_tests.py $report
         ;;
         "multisite")
             python ${FUNCTEST_TEST_DIR}/OpenStack/tempest/gen_tempest_conf.py
@@ -147,7 +147,8 @@ function run_test(){
                 -c ${FUNCTEST_TEST_DIR}/OpenStack/tempest/tempest_multisite.conf
         ;;
         "odl-sfc")
-            ODL_SFC_DIR=${repos_dir}/sfc/tests/functest/odl-sfc
+            ODL_SFC_DIR=${REPOS_DIR}/sfc/tests/functest/odl-sfc
+            # pass FUNCTEST_REPO_DIR inside prepare_odl_sfc.bash
             FUNCTEST_REPO_DIR=${FUNCTEST_REPO_DIR} python ${ODL_SFC_DIR}/prepare_odl_sfc.py || exit $?
             source ${ODL_SFC_DIR}/tackerc
             python ${ODL_SFC_DIR}/sfc.py $report
@@ -196,8 +197,8 @@ done
 
 
 # Source credentials
-echo "Sourcing Credentials ${FUNCTEST_CONF_DIR}/openstack.creds to run the test.."
-source ${FUNCTEST_CONF_DIR}/openstack.creds
+echo "Sourcing Credentials ${creds} to run the test.."
+source ${creds}
 
 # ODL Boron workaround to create additional flow rules to allow port 22 TCP
 if [[ $DEPLOY_SCENARIO == *"odl_l2-sfc"* ]]; then
-- 
cgit 1.2.3-korg