X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fci%2Fexec_test.sh;h=aa0cfaf7e530726ab54df9ca61fb5456c1ebe9f5;hb=9815bea4fc18de05d0e9c5700ffe046ae1ad13fd;hp=b288fe367362be9c8b0dc0a5b818f9f2862a3a4f;hpb=65865e43dc9754ae8bbb54dda37514ab8164d2d2;p=functest.git diff --git a/functest/ci/exec_test.sh b/functest/ci/exec_test.sh index b288fe367..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 @@ -101,14 +105,6 @@ function run_test(){ # 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 - ;; - "moon") - python ${REPOS_DIR}/moon/tests/run_tests.py $report - ;; *) echo "The test case '${test_name}' does not exist." exit 1