X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Ftest_kvmfornfv.sh;h=20bdaeefbe8c6e088de9f97859b4042ed759cd5c;hb=c189ccac5702322ed843fe17057035b7222a59b6;hp=e87d6eb409f3047d42f2ebe12701a543387206e3;hpb=d0deb639c35881c25f2b5ca77d64de0d4c649841;p=kvmfornfv.git

diff --git a/ci/test_kvmfornfv.sh b/ci/test_kvmfornfv.sh
index e87d6eb40..20bdaeefb 100755
--- a/ci/test_kvmfornfv.sh
+++ b/ci/test_kvmfornfv.sh
@@ -35,6 +35,10 @@ function packetForward {
 function cyclictest {
    test_case=$1
    source $WORKSPACE/ci/cyclicTestTrigger.sh $HOST_IP $test_time $test_type $test_case
+   #Verifying whether the test node is up and running
+   connect_host
+   #Waiting for ssh to be available for the host machine.
+   sleep 10
    #calculating and verifying sha512sum of the guestimage.
    if ! verifyGuestImage;then
       exit 1
@@ -43,6 +47,8 @@ function cyclictest {
    updateYaml
    #Cleaning up the test environment before running cyclictest through yardstick.
    env_clean
+   #Running PCM utility
+   collect_MBWInfo $test_type
    #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`
@@ -50,6 +56,40 @@ function cyclictest {
       echo "Test case execution FAILED for ${test_case} environment"
       cyclictest_result=`expr ${cyclictest_result} + 1`
    fi
+   echo "Terminating PCM Process"
+   sudo ssh root@${HOST_IP} "pid=\$(ps aux | grep 'pcm' | awk '{print \$2}' | head -1); echo \$pid |xargs kill -SIGTERM"
+}
+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"
+   sudo ssh root@${HOST_IP} "mkdir -p /root/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
+      echo "pcm utility supports $modelName processor"
+   else
+      echo "check for the pcm utility supported processors"
+      exit 1
+   fi
+   cd /root
+   if [ ! -d "pcm" ]; then
+     `git clone https://github.com/opcm/pcm`
+      cd pcm
+      make
+      echo "Disabling NMI Watchdog"
+      echo 0 > /proc/sys/kernel/nmi_watchdog
+      echo "To Access MSR registers installing msr-tools"
+      sudo yum install msr-tools
+      sudo modprobe msr
+   fi
+   '
 }
 
 function ftrace_disable {
@@ -62,7 +102,8 @@ function ftrace_disable {
 #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=120000 # 2m
+   test_time=1000 # 1s
+   install_pcm
    if [ ${ftrace_enable} -eq '1' ]; then
       for env in ${cyclictest_env_verify[@]}
       do
@@ -95,6 +136,7 @@ if [ ${test_type} == "verify" ];then
 elif [ ${test_type} == "daily" ];then
    HOST_IP="10.10.100.22"
    test_time=3600000 #1h
+   install_pcm
    if [ ${test_name} == "packet_forward" ];then
       packetForward
       if [ ${packetforward_result} -ne 0 ] ; then