X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Ftest_kvmfornfv.sh;fp=ci%2Ftest_kvmfornfv.sh;h=47158dedd2db9a9fc1950d6682bc2a8819e24e67;hb=611d8bd4c4027ebe8da338d3bbb10a6994975937;hp=8199bf0e95ed9b73c947300ac7bd41b6c4868652;hpb=b1495d4fa3175a3ffea301dedb9b0a60ca9ada44;p=kvmfornfv.git

diff --git a/ci/test_kvmfornfv.sh b/ci/test_kvmfornfv.sh
index 8199bf0e9..47158dedd 100755
--- a/ci/test_kvmfornfv.sh
+++ b/ci/test_kvmfornfv.sh
@@ -45,6 +45,11 @@ function packetForward {
    fi
 }
 
+function getTestParams {
+   HOST_IP=$( setHostIP $test_type )
+   test_time=$( setTestTime $test_type )
+}
+
 function cyclictest {
    test_case=$1
    source $WORKSPACE/ci/cyclicTestTrigger.sh $HOST_IP $test_time $test_type $test_case
@@ -72,9 +77,8 @@ function cyclictest {
    echo "Terminating PCM Process"
    sudo ssh root@${HOST_IP} "pid=\$(ps aux | grep 'pcm' | awk '{print \$2}' | head -1); echo \$pid |xargs kill -SIGTERM"
 }
+#Collecting the Memory Bandwidth Information using pcm-memory utility
 function collect_MBWInfo {
-   #Collecting the Memory Bandwidth Information using pcm-memory utility
-   source $WORKSPACE/ci/envs/host-config
    testType=$1
    timeStamp=$(date +%Y%m%d%H%M%S)
    echo "Running PCM memory to collect memory bandwidth"
@@ -82,7 +86,6 @@ function collect_MBWInfo {
    sudo ssh root@${HOST_IP} "${pcm_memory} 60 &>/root/MBWInfo/MBWInfo_${testType}_${timeStamp} &disown"
 }
 function install_pcm {
-   source $WORKSPACE/ci/envs/host-config
    sudo ssh root@${HOST_IP} '
    modelName=`cat /proc/cpuinfo | grep -i "model name" | uniq`
    if echo "$modelName" | grep -i "xeon" ;then
@@ -107,8 +110,7 @@ function install_pcm {
 
 #Execution of testcases based on test type and test name from releng.
 if [ ${test_type} == "verify" ];then
-   HOST_IP="10.10.100.21"
-   test_time=1000 # 1s
+   getTestParams
    install_pcm
    if [ ${ftrace_enable} -eq '1' ]; then
       for env in ${cyclictest_env_verify[@]}
@@ -138,8 +140,7 @@ if [ ${test_type} == "verify" ];then
       test_exit 0
    fi
 elif [ ${test_type} == "daily" ];then
-   HOST_IP="10.10.100.22"
-   test_time=3600000 #1h
+   getTestParams
    install_pcm
    if [ ${test_name} == "packet_forward" ];then
       packetForward
@@ -162,7 +163,7 @@ elif [ ${test_type} == "daily" ];then
             sed -i '/host-setup1.sh/a\    \- \"enable-trace.sh\"' kvmfornfv_cyclictest_hostenv_guestenv.yaml
             #Executing cyclictest through yardstick.
             cyclictest ${env}
-            #disabling ftrace and collecting the logs to upload to artifact repository. 
+            #disabling ftrace and collecting the logs to upload to artifact repository.
             ftrace_disable
             sleep 5
          done