vnfs: configurable loopback application support inside VM

For PVP and PVVP deployments, traffic inside virtual machines must be
forwarded between its interfaces. There are several forwarding options
supported by VSPERF, including DPDK testpmd, Huawei l2fwd kernel module
and linux bridge. Another option is, that VM image has built in forwarding
functionality and vsperf doesn't configure it itself.
User can select VM loopback application by configuration option
GUEST_LOOPBACK (per VM) or by SCALAR cli option guest_loopback (global
settings).
Selected guest loopback application(s) will be written into test results
CSV file and test report MD file.
Default wildcarded guest login prompt was added. Guest startup guarding
timer can be configured. Path to OVS kernel module has been fixed.

Change-Id: If738da1ea09112f9cf2267afcbc99a6797f3a03a
JIRA: VSPERF-130
Signed-off-by: Martin Klozik <martinx.klozik@intel.com>
Reviewed-by: Maryam Tahhan <maryam.tahhan@intel.com>

1 files changed, 0 insertions, 53 deletions

diff --git a/vnfs/qemu/qemu_virtio_net.py b/vnfs/qemu/qemu_virtio_net.py
index 7de5ea1c..e5e895f2 100644
--- a/vnfs/qemu/qemu_virtio_net.py
+++ b/vnfs/qemu/qemu_virtio_net.py
@@ -18,7 +18,6 @@
 import logging
 from vnfs.qemu.qemu import IVnfQemu
 from conf import settings as S
-from conf import get_test_param
 from tools import tasks
 
 class QemuVirtioNet(IVnfQemu):
@@ -41,8 +40,6 @@ class QemuVirtioNet(IVnfQemu):
         i = self._number * 2
         if1 = str(i)
         if2 = str(i + 1)
-        self._net1 = S.getValue('VANILLA_NIC1_NAME')[self._number]
-        self._net2 = S.getValue('VANILLA_NIC2_NAME')[self._number]
 
         self._cmd += ['-netdev',
                       'type=tap,id=' + self._net1 +
@@ -63,53 +60,3 @@ class QemuVirtioNet(IVnfQemu):
                       ',netdev=' + self._net2 + ',csum=off,gso=off,' +
                       'guest_tso4=off,guest_tso6=off,guest_ecn=off',
                      ]
-
-    # helper functions
-
-    def _config_guest_loopback(self):
-        """
-        Configure VM to perform forwarding between NICs
-        """
-
-        # Disable services (F16)
-        self.execute_and_wait('systemctl stop iptables.service')
-        self.execute_and_wait('systemctl stop irqbalance.service')
-
-        nic1_name = get_test_param('vanilla_nic1_name', self._net1)
-        self.execute('ifconfig ' + nic1_name + ' ' +
-                     S.getValue('VANILLA_NIC1_IP_CIDR')[self._number])
-
-        nic2_name = get_test_param('vanilla_nic2_name', self._net2)
-        self.execute('ifconfig ' + nic2_name + ' ' +
-                     S.getValue('VANILLA_NIC2_IP_CIDR')[self._number])
-
-        # configure linux bridge
-        self.execute('brctl addbr br0')
-        self.execute('brctl addif br0 ' + self._net1 + ' ' + self._net2)
-        self.execute('ifconfig br0 ' +
-                     S.getValue('VANILLA_BRIDGE_IP')[self._number])
-
-        # Add the arp entries for the IXIA ports and the bridge you are using.
-        # Use command line values if provided.
-        trafficgen_mac = get_test_param('vanilla_tgen_port1_mac',
-                                        S.getValue('VANILLA_TGEN_PORT1_MAC'))
-        trafficgen_ip = get_test_param('vanilla_tgen_port1_ip',
-                                       S.getValue('VANILLA_TGEN_PORT1_IP'))
-
-        self.execute('arp -s ' + trafficgen_ip + ' ' + trafficgen_mac)
-
-        trafficgen_mac = get_test_param('vanilla_tgen_port2_mac',
-                                        S.getValue('VANILLA_TGEN_PORT2_MAC'))
-        trafficgen_ip = get_test_param('vanilla_tgen_port2_ip',
-                                       S.getValue('VANILLA_TGEN_PORT2_IP'))
-
-        self.execute('arp -s ' + trafficgen_ip + ' ' + trafficgen_mac)
-
-        # Enable forwarding
-        self.execute('sysctl -w net.ipv4.ip_forward=1')
-
-        # Controls source route verification
-        # 0 means no source validation
-        self.execute('sysctl -w net.ipv4.conf.all.rp_filter=0')
-        self.execute('sysctl -w net.ipv4.conf.' + self._net1 + '.rp_filter=0')
-        self.execute('sysctl -w net.ipv4.conf.' + self._net2 + '.rp_filter=0')