X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fci%2Fexec_test.sh;h=aa0cfaf7e530726ab54df9ca61fb5456c1ebe9f5;hb=9815bea4fc18de05d0e9c5700ffe046ae1ad13fd;hp=7c96d69c391ba23c1c78034205594c672f34f5f2;hpb=2f4c59e5bfb58e2e01e8d413c8a4f0c5f7679bb0;p=functest.git

diff --git a/functest/ci/exec_test.sh b/functest/ci/exec_test.sh
index 7c96d69c3..aa0cfaf7e 100755
--- a/functest/ci/exec_test.sh
+++ b/functest/ci/exec_test.sh
@@ -54,6 +54,10 @@ function odl_tests(){
         odl_ip=$SDN_CONTROLLER_IP
         odl_port=8081
         odl_restport=8081
+    elif [ "$INSTALLER_TYPE" == "netvirt" ]; then
+        odl_ip=$SDN_CONTROLLER_IP
+        odl_port=8081
+        odl_restport=8081
     elif [ "$INSTALLER_TYPE" == "joid" ]; then
         odl_ip=$SDN_CONTROLLER
     elif [ "$INSTALLER_TYPE" == "compass" ]; then
@@ -90,45 +94,17 @@ function run_test(){
                 --osusername ${OS_USERNAME} \
                 ${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
-        ;;
         "onos")
             python ${FUNCTEST_TEST_DIR}/sdn/onos/teston/onos.py
         ;;
         "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
             # ${REPOS_DIR}/ovno/Testcases/RunTests.sh
         ;;
-        "security_scan")
-            echo "Sourcing Credentials ${FUNCTEST_CONF_DIR}/stackrc for undercloud .."
-            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
-        ;;
         *)
             echo "The test case '${test_name}' does not exist."
             exit 1