X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fexec_test.sh;h=e402e0c319a80ea37ea36f964a201eea7d15bd54;hb=cfbb3ce340f9498e0ea686494f586611ea0d4b8b;hp=d7883307bc060ba36fa25851786c2291fe523e7e;hpb=9b830f30a6e93643e4aa1312f9439e34f2d74530;p=functest.git

diff --git a/ci/exec_test.sh b/ci/exec_test.sh
index d7883307b..e402e0c31 100755
--- a/ci/exec_test.sh
+++ b/ci/exec_test.sh
@@ -39,25 +39,24 @@ fi
 FUNCTEST_REPO_DIR=${repos_dir}/functest
 FUNCTEST_CONF_DIR=/home/opnfv/functest/conf
 
+export PYTHONUNBUFFERED=1
 
 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,28 +72,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/"
-                python ${odl_path}/odlreport2db.py -x ${odl_logs}/output.xml
-            fi
+                --odlip $odl_ip --odlwebport $odl_port ${args}
         ;;
         "tempest_smoke_serial")
             python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/run_tempest.py \
@@ -157,18 +147,11 @@ function run_test(){
             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
+            ODL_SFC_DIR=${FUNCTEST_REPO_DIR}/testcases/features/sfc
+            # pass FUNCTEST_REPO_DIR inside prepare_odl_sfc.bash
+            FUNCTEST_REPO_DIR=${FUNCTEST_REPO_DIR} bash ${ODL_SFC_DIR}/prepare_odl_sfc.bash || exit $?
+            source ${ODL_SFC_DIR}/tackerc
+            python ${ODL_SFC_DIR}/sfc.py $report
         ;;
         "parser")
             python ${FUNCTEST_REPO_DIR}/testcases/vnf/vRNC/parser.py $report