X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Ftest_kvmfornfv.sh;h=27419232ed060c54e83e6c0b5128a511c25abe70;hb=96e7a4ce5a4d186ed8297af9fd4333c510f2b9a1;hp=20bdaeefbe8c6e088de9f97859b4042ed759cd5c;hpb=0c2f88aa2ccffc538c276caac88da6841107bf81;p=kvmfornfv.git

diff --git a/ci/test_kvmfornfv.sh b/ci/test_kvmfornfv.sh
index 20bdaeefb..27419232e 100755
--- a/ci/test_kvmfornfv.sh
+++ b/ci/test_kvmfornfv.sh
@@ -21,15 +21,28 @@ packetforward_result=0 #exit code of packet forward
 source $WORKSPACE/ci/envs/host-config
 
 function packetForward {
-#   source $WORKSPACE/ci/packet_forward_test.sh $HOST_IP
-   echo "Packetforwarding need to be implemented"
-   packetforward_result=$?
-   if [ ${packetforward_result} -ne 0 ];then
-      echo "Packet Forwarding test case execution FAILED"
+   #executing packet forwarding test cases based on the job type.
+   if [ ${test_type} == "verify" ];then
+      echo "packet forwarding test cases are not yet implemented for verify job"
+      packetforward_result=0
+   elif [ ${test_type} == "daily" ];then
+      source $WORKSPACE/ci/cyclicTestTrigger.sh $HOST_IP
+      connect_host
+      #Waiting for ssh to be available for the host machine.
+      sleep 20
+      # copy files and rpms and setup environment required for executing test cases
+      setUpPacketForwarding
+      sleep 1
+      #Verifying whether the test node is up and running
+      connect_host
+      sleep 20
+      #Install and Execute packet forwarding test cases
+      runPacketForwarding $test_type
+      packetforward_result=$?
    else
-      echo "Packet Forwarding test case executed SUCCESSFULLY"
+      echo "Incorrect test type ${test_type}"
+      exit 1
    fi
-   host_clean
 }
 
 function cyclictest {
@@ -38,17 +51,17 @@ function cyclictest {
    #Verifying whether the test node is up and running
    connect_host
    #Waiting for ssh to be available for the host machine.
-   sleep 10
+   sleep 20
    #calculating and verifying sha512sum of the guestimage.
    if ! verifyGuestImage;then
       exit 1
    fi
    #Update kvmfornfv_cyclictest_${testName}.yaml with test_time and pod.yaml with IP
    updateYaml
-   #Cleaning up the test environment before running cyclictest through yardstick.
-   env_clean
    #Running PCM utility
    collect_MBWInfo $test_type
+   #Cleaning the environment before running cyclictest through yardstick
+   env_clean
    #Creating a docker image with yardstick installed and launching ubuntu docker to run yardstick cyclic testcase
    if runCyclicTest;then
       cyclictest_result=`expr ${cyclictest_result} + 0`
@@ -127,22 +140,28 @@ if [ ${test_type} == "verify" ];then
       #Execution of packet forwarding test cases.
       packetForward
    fi
-      if [ ${cyclictest_result} -ne 0 ] ||  [ ${packetforward_result} -ne 0 ];then
-         echo "Test case FAILED"
-         err_exit 1
-      else
-         err_exit 0
-      fi
+   if [ ${cyclictest_result} -ne 0 ] ||  [ ${packetforward_result} -ne 0 ];then
+      echo "Test case FAILED"
+      test_exit 1
+   else
+      test_exit 0
+   fi
 elif [ ${test_type} == "daily" ];then
    HOST_IP="10.10.100.22"
    test_time=3600000 #1h
    install_pcm
    if [ ${test_name} == "packet_forward" ];then
       packetForward
+      packet_fwd_logs
+      #clean the test environment after the test case execution.
+      sudo ssh root@${HOST_IP} "rm -rf /root/workspace/*"
+      host_clean
       if [ ${packetforward_result} -ne 0 ] ; then
-         err_exit 1
+         echo "Execution of packet forwarding test cases FAILED"
+         packet_fwd_exit 1
       else
-         err_exit 0
+         echo "Executed packet forwarding test cases SUCCESSFULLY"
+         packet_fwd_exit 0
       fi
    elif [ ${test_name} == "cyclictest" ];then
       if [ ${ftrace_enable} -eq '1' ]; then
@@ -166,10 +185,10 @@ elif [ ${test_type} == "daily" ];then
       fi
          if [ ${cyclictest_result} -ne 0 ] ; then
             echo "Cyclictest case execution FAILED"
-            err_exit 1
+            test_exit 1
          else
             echo "Cyclictest case executed SUCCESSFULLY"
-            err_exit 0
+            test_exit 0
          fi
    fi
 elif [ ${test_type} == "merge" ];then