Integration Test: Multi-VM with parallel PVP connections.

Implementation of 3 testcases with multi-VMs in parallel.
Flows are explicitly set on UDP destination ports so that
each packet is sent to a specific VM.

Topology is: Phy1-VM1-Phy2, Phy1-VM2-Phy2,..

This patch requires change #16855 "ovs/ofctl: Fix validation
method for complex flows."

JIRA: VSPERF-326

Change-Id: I59d23354bc9c6db470a59faba13bdcd6f2beb19d
Signed-off-by: Antonio Fischetti <antonio.fischetti@intel.com>
Reviewed-by: Maryam Tahhan <maryam.tahhan@intel.com>
Reviewed-by: Martin Klozik <martinx.klozik@intel.com>

1 files changed, 34 insertions, 16 deletions

diff --git a/conf/04_vnf.conf b/conf/04_vnf.conf
index ff110d93..ec242662 100644
--- a/conf/04_vnf.conf
+++ b/conf/04_vnf.conf
@@ -25,15 +25,17 @@ VNF = 'QemuDpdkVhostUser'
 # directory which is shared to QEMU guests. Useful for exchanging files
 # between host and guest, VNF specific share will be created
 # For 2 VNFs you may use ['/tmp/qemu0_share', '/tmp/qemu1_share']
-GUEST_SHARE_DIR = ['/tmp/qemu0_share', '/tmp/qemu1_share']
+GUEST_SHARE_DIR = ['/tmp/qemu0_share', '/tmp/qemu1_share', \
+                   '/tmp/qemu2_share', '/tmp/qemu3_share', \
+                   '/tmp/qemu4_share', '/tmp/qemu5_share']
 
 # location of guest disk image
 # For 2 VNFs you may use ['guest1.img', 'guest2.img']
-GUEST_IMAGE = ['', '']
+GUEST_IMAGE = ['', '', '', '', '', '']
 
 # guarding timer for VM start up
 # For 2 VNFs you may use [180, 180]
-GUEST_TIMEOUT = [180, 180]
+GUEST_TIMEOUT = [180, 180, 180, 180, 180, 180]
 
 # packet forwarding mode supported by testpmd; Please see DPDK documentation
 # for comprehensive list of modes supported by your version.
@@ -50,7 +52,9 @@ GUEST_TESTPMD_FWD_MODE = 'csum'
 # This configuration option can be overridden by CLI SCALAR option
 # guest_loopback, e.g. --test-params "guest_loopback=l2fwd"
 # For 2 VNFs you may use ['testpmd', 'l2fwd']
-GUEST_LOOPBACK = ['testpmd', 'testpmd']
+GUEST_LOOPBACK = ['testpmd', 'testpmd', \
+                  'testpmd', 'testpmd', \
+                  'testpmd', 'testpmd']
 
 # username for guest image
 GUEST_USERNAME = 'root'
@@ -81,25 +85,33 @@ LOG_FILE_GUEST_CMDS = 'guest-cmds.log'
 QEMU_BIN = os.path.join(QEMU_DIR, 'x86_64-softmmu/qemu-system-x86_64')
 
 # For 2 VNFs you may use ['eth0', 'eth2']
-GUEST_NIC1_NAME = ['eth0', 'eth0']
-GUEST_NIC2_NAME = ['eth1', 'eth1']
+GUEST_NIC1_NAME = ['eth0', 'eth0', 'eth0', 'eth0', 'eth0', 'eth0']
+GUEST_NIC2_NAME = ['eth1', 'eth1', 'eth1', 'eth1', 'eth1', 'eth1']
 
 # For 2 VNFs you may use ['00:00:00:00:00:01', '00:00:00:00:00:03']
-GUEST_NET1_MAC = ['00:00:00:00:00:01', '00:00:00:00:00:03']
-GUEST_NET2_MAC = ['00:00:00:00:00:02', '00:00:00:00:00:04']
+GUEST_NET1_MAC = ['00:00:00:00:00:01', '00:00:00:00:00:03', \
+                  '00:00:00:00:00:05', '00:00:00:00:00:07', \
+                  '00:00:00:00:00:09', '00:00:00:00:00:0b']
+GUEST_NET2_MAC = ['00:00:00:00:00:02', '00:00:00:00:00:04', \
+                  '00:00:00:00:00:06', '00:00:00:00:00:08', \
+                  '00:00:00:00:00:0a', '00:00:00:00:00:0c']
 
 # For 2 VNFs you may use ['00:04.0', '00:04.0']
-GUEST_NET1_PCI_ADDRESS = ['00:04.0', '00:04.0']
-GUEST_NET2_PCI_ADDRESS = ['00:05.0', '00:05.0']
+GUEST_NET1_PCI_ADDRESS = ['00:04.0', '00:04.0', \
+                          '00:04.0', '00:04.0', \
+                          '00:04.0', '00:04.0']
+GUEST_NET2_PCI_ADDRESS = ['00:05.0', '00:05.0', \
+                          '00:05.0', '00:05.0', \
+                          '00:05.0', '00:05.0']
 
-GUEST_MEMORY = ['4096', '4096']
+GUEST_MEMORY = ['4096', '4096', '2048', '2048', '2048', '2048']
 
 # test-pmd requires 2 VM cores
-GUEST_SMP = ['2', '2']
+GUEST_SMP = ['2', '2', '2', '2', '2', '2']
 
 # Host cores to use to affinitize the SMP cores of a QEMU instance
 # For 2 VNFs you may use [(4,5), (6, 7)]
-GUEST_CORE_BINDING = [(6, 7), (9, 10)]
+GUEST_CORE_BINDING = [(6, 7), (9, 10), (11, 12), (13, 14), (15, 16), (17, 18)]
 
 # Queues per NIC inside guest for multi-queue configuration, requires switch
 # multi-queue to be enabled. Set to 0 for disabled.
@@ -137,9 +149,15 @@ VANILLA_TGEN_PORT1_MAC = 'AA:BB:CC:DD:EE:FF'
 VANILLA_TGEN_PORT2_IP = '1.1.2.10'
 VANILLA_TGEN_PORT2_MAC = 'AA:BB:CC:DD:EE:F0'
 
-VANILLA_BRIDGE_IP = ['1.1.1.5/16', '1.1.1.6/16']
+VANILLA_BRIDGE_IP = ['1.1.1.5/16', '1.1.1.6/16', \
+                     '1.1.1.7/16', '1.1.1.8/16', \
+                     '1.1.1.9/16', '1.1.1.10/16']
 
-VANILLA_NIC1_IP_CIDR = ['192.168.1.2/24', '192.168.1.4/24']
-VANILLA_NIC2_IP_CIDR = ['192.168.1.3/24', '192.168.1.5/24']
+VANILLA_NIC1_IP_CIDR = ['192.168.1.2/24', '192.168.1.4/24', \
+                        '192.168.1.6/24', '192.168.1.8/24', \
+                        '192.168.1.10/24', '192.168.1.12/24']
+VANILLA_NIC2_IP_CIDR = ['192.168.1.3/24', '192.168.1.5/24', \
+                        '192.168.1.7/24', '192.168.1.9/24', \
+                        '192.168.1.11/24', '192.168.1.13/24']
 
 VNF_AFFINITIZATION_ON = True