X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fexec_test.sh;h=d1ac68df076cb994c0cda0c279f020bb6c811775;hb=refs%2Fchanges%2F83%2F19083%2F4;hp=013b98c2ed9d2f37c22ad47ddeb5578f77884659;hpb=d338cc665efc9a2d73d6dff1567dc6de6bc63bd8;p=functest.git

diff --git a/ci/exec_test.sh b/ci/exec_test.sh
index 013b98c2e..d1ac68df0 100755
--- a/ci/exec_test.sh
+++ b/ci/exec_test.sh
@@ -36,8 +36,8 @@ if [[ "${CI_DEBUG,,}" == "true" ]];then
     debug="--debug"
 fi
 
-FUNCTEST_REPO_DIR=${repos_dir}/functest/
-FUNCTEST_CONF_DIR=/home/opnfv/functest/conf/
+FUNCTEST_REPO_DIR=${repos_dir}/functest
+FUNCTEST_CONF_DIR=/home/opnfv/functest/conf
 
 
 function odl_tests(){
@@ -48,7 +48,7 @@ function odl_tests(){
     if [ "$INSTALLER_TYPE" == "fuel" ]; then
         odl_port=8282
     elif [ "$INSTALLER_TYPE" == "apex" ]; then
-        :
+        odl_ip=$SDN_CONTROLLER_IP
     elif [ "$INSTALLER_TYPE" == "joid" ]; then
         odl_ip=$SDN_CONTROLLER
         odl_port=8080
@@ -56,7 +56,8 @@ function odl_tests(){
     elif [ "$INSTALLER_TYPE" == "compass" ]; then
         :
     else
-        odl_ip=$SDN_CONTROLLER
+        odl_ip=$SDN_CONTROLLER_IP
+        odl_port=8080
     fi
 }
 
@@ -69,73 +70,113 @@ function run_test(){
 
     case $test_name in
         "healthcheck")
-            ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/healthcheck.sh
+            ${FUNCTEST_REPO_DIR}/testcases/OpenStack/healthcheck/healthcheck.sh
         ;;
         "vping_ssh")
-            python ${FUNCTEST_REPO_DIR}/testcases/vPing/CI/libraries/vPing_ssh.py \
-                $debug $report
+            python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/vPing/vPing_ssh.py $report
         ;;
         "vping_userdata")
-            python ${FUNCTEST_REPO_DIR}/testcases/vPing/CI/libraries/vPing_userdata.py \
-                $debug $report
+            python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/vPing/vPing_userdata.py $report
         ;;
         "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} \
-                ${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/CI/start_tests.sh
-
-            # push results to the DB in case of CI
-            if [[ -n "$DEPLOY_SCENARIO" && "$DEPLOY_SCENARIO" != "none" ]]; then
-                odl_logs="/home/opnfv/functest/results/odl/logs/2"
-                odl_path="${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/CI"
-                node_name=$(env | grep NODE_NAME | cut -f2 -d'=')
-                python ${odl_path}/odlreport2db.py -x ${odl_logs}/output.xml -i ${INSTALLER_TYPE} -p ${node_name} -s ${DEPLOY_SCENARIO}
+            if [[ "$report" == "-r" &&
+                  -n "$DEPLOY_SCENARIO" && "$DEPLOY_SCENARIO" != "none" &&
+                  -n "$INSTALLER_TYPE" && "$INSTALLER_TYPE" != "none" ]] &&
+               env | grep NODE_NAME > /dev/null; then
+                args=-p
             fi
+            ${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/OpenDaylightTesting.py \
+                --keystoneip $keystone_ip --neutronip $neutron_ip \
+                --osusername ${OS_USERNAME} --ostenantname ${OS_TENANT_NAME} \
+                --ospassword ${OS_PASSWORD} \
+                --odlip $odl_ip --odlwebport $odl_port ${args}
         ;;
         "tempest_smoke_serial")
-            python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/run_tempest.py \
-                $debug $clean_flag -s -m smoke $report
+            python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/run_tempest.py \
+                $clean_flag -s -m smoke $report
         ;;
         "tempest_full_parallel")
-            python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/run_tempest.py \
-                $debug $serial_flag $clean_flag -m full $report
+            python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/run_tempest.py \
+                $serial_flag $clean_flag -m full $report
         ;;
         "vims")
-            python ${FUNCTEST_REPO_DIR}/testcases/vIMS/CI/vIMS.py \
-                $debug $clean_flag $report
+            python ${FUNCTEST_REPO_DIR}/testcases/vnf/vIMS/vIMS.py $clean_flag $report
         ;;
         "rally_full")
-            python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py \
-                $debug $clean_flag all $report
+            python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/rally/run_rally-cert.py $clean_flag all $report
         ;;
         "rally_sanity")
-            python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py \
-                $debug $clean_flag --sanity all $report
+            python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/rally/run_rally-cert.py \
+                $clean_flag --sanity all $report
         ;;
         "bgpvpn")
-            python ${FUNCTEST_REPO_DIR}/testcases/features/bgpvpn.py
+            sdnvpn_repo_dir=${repos_dir}/sdnvpn/test/functest/
+            python ${sdnvpn_repo_dir}/run_tests.py $report
         ;;
         "onos")
-            if [ "$INSTALLER_TYPE" == "joid" ]; then
-                python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py -i joid
-            else
-                python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py
-            fi
-      ;;
+            python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/onosfunctest.py
+        ;;
+        "onos_sfc")
+            python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/onosfunctest.py -t sfc
+        ;;
         "promise")
-            python ${FUNCTEST_REPO_DIR}/testcases/features/promise.py $debug $report
+            python ${FUNCTEST_REPO_DIR}/testcases/features/promise.py $report
             sleep 10 # to let the instances terminate
         ;;
         "doctor")
-            python ${FUNCTEST_REPO_DIR}/testcases/features/doctor.py
+            python ${FUNCTEST_REPO_DIR}/testcases/features/doctor.py $report
         ;;
         "ovno")
-            ${repos_dir}/ovno/Testcases/RunTests.sh
+            # 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 ${repos_dir}/securityscanning/security_scan.py --config ${repos_dir}/securityscanning/config.ini
+        ;;
+        "copper")
+            python ${FUNCTEST_REPO_DIR}/testcases/features/copper.py $report
+        ;;
+        "moon")
+            python ${repos_dir}/moon/tests/run_tests.py $report
+        ;;
+        "multisite")
+            python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/gen_tempest_conf.py
+            python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/run_tempest.py \
+                $clean_flag -s -m feature_multisite $report \
+                -c ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/tempest_multisite.conf
+        ;;
+        "domino")
+            python ${FUNCTEST_REPO_DIR}/testcases/features/domino.py $report
+        ;;
+        "odl-sfc")
+            bash ${FUNCTEST_REPO_DIR}/testcases/features/sfc/server_presetup_CI.bash
+            ret_val=$?
+            if [ $ret_val != 0 ]; then
+                exit $ret_val
+            fi
+            bash ${FUNCTEST_REPO_DIR}/testcases/features/sfc/compute_presetup_CI.bash
+            ret_val=$?
+            if [ $ret_val != 0 ]; then
+                exit $ret_val
+            fi
+            source ${FUNCTEST_REPO_DIR}/testcases/features/sfc/tackerc
+            python ${FUNCTEST_REPO_DIR}/testcases/features/sfc/sfc.py $report
+        ;;
+        "parser")
+            python ${FUNCTEST_REPO_DIR}/testcases/vnf/vRNC/parser.py $report
         ;;
         *)
             echo "The test case '${test_name}' does not exist."
             exit 1
     esac
+
+    if [[ $? != 0 ]]; then exit 1
+    else exit 0
+    fi
 }