X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fexec_test.sh;h=7c4b3578e2ee745491503a1841e8c2b675671b14;hb=fee070fcc4a31735abb88b303742bb05f12b53e7;hp=82a7a31bc8fe0471c4cd057d2b12c324b9ba7807;hpb=a7fd37c13857fd3b7a0d10ffe8d79ff1c45dc002;p=functest.git

diff --git a/ci/exec_test.sh b/ci/exec_test.sh
index 82a7a31bc..7c4b3578e 100755
--- a/ci/exec_test.sh
+++ b/ci/exec_test.sh
@@ -36,28 +36,26 @@ 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(){
     keystone_ip=$(openstack catalog show identity |grep publicURL| cut -f3 -d"/" | cut -f1 -d":")
     neutron_ip=$(openstack catalog show network | grep publicURL | cut -f3 -d"/" | cut -f1 -d":")
     odl_ip=${neutron_ip}
-    odl_port=8181
+    odl_port=8080
     if [ "$INSTALLER_TYPE" == "fuel" ]; then
         odl_port=8282
     elif [ "$INSTALLER_TYPE" == "apex" ]; then
         odl_ip=$SDN_CONTROLLER_IP
+        odl_port=8181
     elif [ "$INSTALLER_TYPE" == "joid" ]; then
         odl_ip=$SDN_CONTROLLER
-        odl_port=8080
-        :
     elif [ "$INSTALLER_TYPE" == "compass" ]; then
-        :
+        odl_port=8181
     else
         odl_ip=$SDN_CONTROLLER_IP
-        odl_port=8080
     fi
 }
 
@@ -73,29 +71,19 @@ function run_test(){
             ${FUNCTEST_REPO_DIR}/testcases/OpenStack/healthcheck/healthcheck.sh
         ;;
         "vping_ssh")
-            python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/vPing/vPing_ssh.py $report
+            python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/vPing/vping.py -m ssh $report
         ;;
         "vping_userdata")
-            python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/vPing/vPing_userdata.py $report
+            python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/vPing/vping.py -m userdata $report
         ;;
         "odl")
             odl_tests
+            [[ "$report" == "-r" ]] && args=-p
             ${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
-
-            # push results to the DB in case of CI
-            # if [[ "$report" == "-r" &&
-            #       -n "$DEPLOY_SCENARIO" && "$DEPLOY_SCENARIO" != "none" &&
-            #       -n "$INSTALLER_TYPE" && "$INSTALLER_TYPE" != "none" ]] &&
-            #    env | grep NODE_NAME > /dev/null; then
-            #     odl_logs="/home/opnfv/functest/results/odl/"
-            #     odl_path="${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/"
-            #     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}
-            # fi
+                --odlip $odl_ip --odlwebport $odl_port ${args}
         ;;
         "tempest_smoke_serial")
             python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/run_tempest.py \
@@ -117,29 +105,20 @@ function run_test(){
         ;;
         "bgpvpn")
             sdnvpn_repo_dir=${repos_dir}/sdnvpn/test/functest/
-            # Copy blacklist from sdnvpn repo to the proper place to execute functest
-            src=${sdnvpn_repo_dir}/tempest_blacklist.txt
-            dst=${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/custom_tests/blacklist.txt
-            cp $src $dst
-            # Execute tempest smoke with blacklist
-            python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/run_tempest.py \
-                $clean_flag -s -m smoke $report
-            # Remove blacklist file
-            rm $dst
-
-            # Execute SDNVPN test cases
             python ${sdnvpn_repo_dir}/run_tests.py $report
-
         ;;
         "onos")
             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 $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")
             # suite under rewritting for colorado
@@ -149,22 +128,39 @@ function run_test(){
         "security_scan")
             echo "Sourcing Credentials ${FUNCTEST_CONF_DIR}/stackrc for undercloud .."
             source ${FUNCTEST_CONF_DIR}/stackrc
-            python ${FUNCTEST_REPO_DIR}/testcases/security_scan/security_scan.py --config ${FUNCTEST_REPO_DIR}/testcases/security_scan/config.ini
+            python ${repos_dir}/securityscanning/security_scan.py --config ${repos_dir}/securityscanning/config.ini
         ;;
         "copper")
-            python ${FUNCTEST_REPO_DIR}/testcases/features/copper.py
+            python ${FUNCTEST_REPO_DIR}/testcases/features/copper.py $report
         ;;
         "moon")
-            # TODO put the link to Moon script to be run (if test runnable) here
-            ${repos_dir}/moon/tests/run_tests.sh
+            python ${repos_dir}/moon/tests/run_tests.py $report
         ;;
         "multisite")
-            python ${FUNCTEST_REPO_DIR}/testcases/features/multisite.py
+            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
+                $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
+            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."