Merge "To update vsperf/packet-forwarding configuration files"

diff --git a/tests/vsperf.conf b/tests/vsperf.conf
index a5055e7..ac55052 100755 (executable)
--- a/tests/vsperf.conf
+++ b/tests/vsperf.conf
@@ -26,7 +26,14 @@ WHITELIST_NICS = ['02:00.0', '02:00.1']
 ##############################
 # VNF configuration
 ##############################
-GUEST_IMAGE = ['/home/jenkins/vloop-vnf-ubuntu-14.04_20160804.qcow2']
+GUEST_IMAGE = ['/home/jenkins/vloop-vnf-ubuntu-14.04_20160804.qcow2','/home/jenkins/vloop-vnf-ubuntu-14.04_20160823.qcow2']
+GUEST_SMP = ['2']
+GUEST_CORE_BINDING = [('27','28'),('29','30')]
+GUEST_THREAD_BINDING = [('33','34'),('35','36')]
+VNF_AFFINITIZATION_ON = True
+# loopback application for tests with VMs
+GUEST_LOOPBACK=['testpmd','testpmd']
+TESTPMD_FWD_MODE = 'io'
 #Using kvmfornfv built qemu for launching guest vms.
 PATHS['qemu'] = {
     'type' : 'bin',

diff --git a/tests/vsperf.conf.sriov b/tests/vsperf.conf.sriov
index c37414c..f476848 100755 (executable)
--- a/tests/vsperf.conf.sriov
+++ b/tests/vsperf.conf.sriov
@@ -28,6 +28,13 @@ PATHS['dpdk']['src']['modules'] = ['uio', 'vfio-pci']
 # VNF configuration
 #############################
 GUEST_IMAGE = ['/home/jenkins/vloop-vnf-ubuntu-14.04_20160804.qcow2']
+GUEST_SMP = ['2']
+GUEST_CORE_BINDING = [('27','28'),('29','30')]
+GUEST_THREAD_BINDING = [('33','34'),('35','36')]
+VNF_AFFINITIZATION_ON = True
+# loopback application for tests with VMs
+GUEST_LOOPBACK=['testpmd','testpmd']
+TESTPMD_FWD_MODE = 'io'
 #Using kvmfornfv built qemu for launching guest vms.
 PATHS['qemu'] = {
     'type' : 'bin',