Merge "This patch includes host and guest configuration script updates to install...

diff --git a/ci/cyclicTestTrigger.sh b/ci/cyclicTestTrigger.sh
index 7ec3616..14aafbe 100755 (executable)
--- a/ci/cyclicTestTrigger.sh
+++ b/ci/cyclicTestTrigger.sh
@@ -151,8 +151,10 @@ function runCyclicTest {
    sudo docker run -i -v ${volume}:/opt --net=host --name kvmfornfv_${testType}_${testName} \
    kvmfornfv:latest  /bin/bash -c "cd /opt/scripts && ls; ./cyclictest.sh $testType $testName"
    cyclictest_output=$?
+   if [ "$testName" == "iostress_idle" ];then
+      copyLogs
+   fi
    #Verifying the results of cyclictest
-
    if [ "$testType" == "verify" ];then
       result=`grep -o '"errors":[^,]*' ${volume}/yardstick.out | awk -F '"' '{print $4}'`
 

diff --git a/ci/envs/host-config b/ci/envs/host-config
index 4742cc4..99cbb37 100755 (executable)
--- a/ci/envs/host-config
+++ b/ci/envs/host-config
@@ -16,6 +16,7 @@ huge_pages=2
 # QEMU executable path and number of cpus for guest
 qemu=/usr/local/bin/qemu-system-x86_64
 guest_cpus=2
+pcm_memory=/root/pcm/pcm-memory.x
 
 # Isolated cpus for nfv, must be given as a range '-' and Numa node1 CPU's should be considered
 host_isolcpus=`lscpu | grep "NUMA node1 CPU(s)"| awk -F ':' '{print \$2}' | sed 's/[[:space:]]//g'`
@@ -44,3 +45,13 @@ function err_exit {
    exit $exitCode
 }
 
+function copyLogs {
+   echo "Copying Log files from Node to Jump Server"
+   sudo ssh root@${HOST_IP} "cd /root;tar -czvf MBWInfo.tar.gz MBWInfo"
+   mkdir -p $WORKSPACE/build_output/log/MBWInfo
+   scp root@${HOST_IP}:/root/MBWInfo.tar.gz $WORKSPACE/build_output/log/MBWInfo
+   echo "Listing all the logs collected"
+   cd $WORKSPACE;ls build_output/log/MBWInfo;
+   sudo ssh root@${HOST_IP} "cd /root;rm -rf MBWInfo MBWInfo.tar.gz"
+}
+

diff --git a/ci/test_kvmfornfv.sh b/ci/test_kvmfornfv.sh
index 60dacd0..20bdaee 100755 (executable)
--- a/ci/test_kvmfornfv.sh
+++ b/ci/test_kvmfornfv.sh
@@ -47,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`
@@ -54,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 {
@@ -67,6 +103,7 @@ function ftrace_disable {
 if [ ${test_type} == "verify" ];then
    HOST_IP="10.10.100.21"
    test_time=1000 # 1s
+   install_pcm
    if [ ${ftrace_enable} -eq '1' ]; then
       for env in ${cyclictest_env_verify[@]}
       do
@@ -99,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

diff --git a/fuel-plugin/vagrant/Vagrantfile b/fuel-plugin/vagrant/Vagrantfile
index f9d17fc..b65433b 100644 (file)
--- a/fuel-plugin/vagrant/Vagrantfile
+++ b/fuel-plugin/vagrant/Vagrantfile
@@ -14,8 +14,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     h.vm.provision :shell, :inline => "/vagrant/build_fuel_plugin.sh", privileged: false
     h.vm.synced_folder "../..", "/kvmfornfv"
     h.vm.provider :virtualbox do |v|
+      file_to_disk = "large_disk_file.vdi"
       v.customize ["modifyvm", :id, "--memory", 4096]
       v.customize ["modifyvm", :id, "--cpus", 4]
+      v.customize ['createhd', '--filename', file_to_disk, '--size', 500 * 1024]
+      v.customize ['storageattach', :id, '--storagectl', 'SATAController', '--port', 1, '--device', 0, '--type', 'hdd', '--medium', file_to_disk ]
     end
   end
 end

diff --git a/fuel-plugin/vagrant/build_fuel_plugin.sh b/fuel-plugin/vagrant/build_fuel_plugin.sh
index e315b11..35cb1ad 100755 (executable)
--- a/fuel-plugin/vagrant/build_fuel_plugin.sh
+++ b/fuel-plugin/vagrant/build_fuel_plugin.sh
@@ -4,7 +4,12 @@ sudo apt-get install -y ruby-dev rubygems-integration python-pip rpm createrepo
 sudo gem install fpm
 sudo pip install fuel-plugin-builder
 sudo apt-get install docker.io -y
-cd /home/vagrant
+
+echo y | sudo mkfs.ext4 /dev/sdb
+sudo mount /dev/sdb /mnt
+sudo chown vagrant:vagrant /mnt
+
+cd /mnt
 # Will build fuel-plugin-kvm in guest VM local directory, not change host
 cp -r /kvmfornfv .
 cd kvmfornfv/fuel-plugin