Enhance ips, ports and creds management

[functest.git] / ci / exec_test.sh

diff --git a/ci/exec_test.sh b/ci/exec_test.sh
index 9d8d83d..32988f8 100755 (executable)
--- a/ci/exec_test.sh
+++ b/ci/exec_test.sh
@@ -57,6 +57,7 @@ function odl_tests(){
         :
     else
         odl_ip=$SDN_CONTROLLER
+        odl_port=8080
     fi
 }
 
@@ -79,7 +80,8 @@ function run_test(){
         ;;
         "odl")
             odl_tests
-            ODL_PORT=$odl_port ODL_IP=$odl_ip KEYSTONE_IP=$keystone_ip NEUTRON_IP=$neutron_ip USR_NAME=${OS_USERNAME} PASS=${OS_PASSWORD} \
+            ODL_WEB_PORT=$odl_port ODL_IP=$odl_ip KEYSTONE_IP=$keystone_ip NEUTRON_IP=$neutron_ip \
+                TENANT_NAME=${OS_TENANT_NAME} USR_NAME=${OS_USERNAME} PASS=${OS_PASSWORD} \
                 ${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/start_tests.sh
 
             # push results to the DB in case of CI
@@ -102,7 +104,7 @@ function run_test(){
                 $serial_flag $clean_flag -m full $report
         ;;
         "vims")
-            python ${FUNCTEST_REPO_DIR}/testcases/vIMS/vIMS.py $clean_flag $report
+            python ${FUNCTEST_REPO_DIR}/testcases/vnf/vIMS/vIMS.py $clean_flag $report
         ;;
         "rally_full")
             python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/rally/run_rally-cert.py $clean_flag all $report
@@ -115,11 +117,7 @@ function run_test(){
             python ${FUNCTEST_REPO_DIR}/testcases/features/bgpvpn.py
         ;;
         "onos")
-            if [ "$INSTALLER_TYPE" == "joid" ]; then
-                python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/onosfunctest.py -i joid
-            else
-                python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/onosfunctest.py
-            fi
+            python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/onosfunctest.py
       ;;
         "promise")
             python ${FUNCTEST_REPO_DIR}/testcases/features/promise.py $report
@@ -138,6 +136,16 @@ function run_test(){
             source ${FUNCTEST_CONF_DIR}/stackrc
             python ${FUNCTEST_REPO_DIR}/testcases/security_scan/security_scan.py --config ${FUNCTEST_REPO_DIR}/testcases/security_scan/config.ini
         ;;
+        "copper")
+            python ${FUNCTEST_REPO_DIR}/testcases/features/copper.py
+        ;;
+        "moon")
+            # TODO put the link to Moon script to be run (if test runnable) here
+            ${repos_dir}/moon/tests/run_tests.sh
+        ;;
+        "multisite")
+            python ${FUNCTEST_REPO_DIR}/testcases/features/multisite.py
+        ;;
         *)
             echo "The test case '${test_name}' does not exist."
             exit 1