Merge "Upgrade High level architecture config guide"

[functest.git] / functest / ci / exec_test.sh

diff --git a/functest/ci/exec_test.sh b/functest/ci/exec_test.sh
index 109de07..b288fe3 100755 (executable)
--- a/functest/ci/exec_test.sh
+++ b/functest/ci/exec_test.sh
@@ -47,11 +47,13 @@ function odl_tests(){
     neutron_ip=$(openstack catalog show network | grep publicURL | cut -f3 -d"/" | cut -f1 -d":")
     odl_ip=${neutron_ip}
     odl_port=8080
+    odl_restport=8181
     if [ "$INSTALLER_TYPE" == "fuel" ]; then
         odl_port=8282
     elif [ "$INSTALLER_TYPE" == "apex" ]; then
         odl_ip=$SDN_CONTROLLER_IP
-        odl_port=8181
+        odl_port=8081
+        odl_restport=8081
     elif [ "$INSTALLER_TYPE" == "joid" ]; then
         odl_ip=$SDN_CONTROLLER
     elif [ "$INSTALLER_TYPE" == "compass" ]; then
@@ -78,20 +80,15 @@ function run_test(){
             odl_tests
             [[ "$report" == "-r" ]] && args=-p
             ${FUNCTEST_TEST_DIR}/sdn/odl/odl.py \
-                --keystoneip $keystone_ip --neutronip $neutron_ip \
-                --osusername ${OS_USERNAME} --ostenantname ${OS_TENANT_NAME} \
+                --keystoneip $keystone_ip \
+                --neutronip $neutron_ip \
+                --odlip $odl_ip \
+                --odlrestconfport $odl_restport \
+                --odlwebport $odl_port \
                 --ospassword ${OS_PASSWORD} \
-                --odlip $odl_ip --odlwebport $odl_port ${args}
-        ;;
-        "vims")
-            python ${FUNCTEST_TEST_DIR}/vnf/ims/vims.py $clean_flag $report
-        ;;
-        "rally_full")
-            python ${FUNCTEST_TEST_DIR}/openstack/rally/run_rally-cert.py $clean_flag all $report
-        ;;
-        "rally_sanity")
-            python ${FUNCTEST_TEST_DIR}/openstack/rally/run_rally-cert.py \
-                $clean_flag --sanity all $report
+                --ostenantname ${OS_TENANT_NAME} \
+                --osusername ${OS_USERNAME} \
+                ${args}
         ;;
         "onos")
             python ${FUNCTEST_TEST_DIR}/sdn/onos/teston/onos.py
@@ -99,13 +96,6 @@ function run_test(){
         "onos_sfc")
             python ${FUNCTEST_TEST_DIR}/sdn/onos/teston/onos.py -t sfc
         ;;
-        "promise")
-            python ${FUNCTEST_TEST_DIR}/features/promise.py $report
-            sleep 10 # to let the instances terminate
-        ;;
-        "doctor")
-            python ${FUNCTEST_TEST_DIR}/features/doctor.py $report
-        ;;
         "ovno")
             # suite under rewritting for colorado
             # no need to run anything until refactoring done
@@ -116,9 +106,6 @@ function run_test(){
             source ${FUNCTEST_CONF_DIR}/stackrc
             python ${FUNCTEST_TEST_DIR}/security_scan/security_scan.py --config ${FUNCTEST_TEST_DIR}/security_scan/config.ini
         ;;
-        "copper")
-            python ${FUNCTEST_TEST_DIR}/features/copper.py $report
-        ;;
         "moon")
             python ${REPOS_DIR}/moon/tests/run_tests.py $report
         ;;