Merge "Enable BURST_MODE for l2fwd"

[vswitchperf.git] / vnfs / qemu / qemu.py

diff --git a/vnfs/qemu/qemu.py b/vnfs/qemu/qemu.py
index c735062..9382ede 100644 (file)
--- a/vnfs/qemu/qemu.py
+++ b/vnfs/qemu/qemu.py
@@ -21,6 +21,7 @@ import locale
 import re
 import subprocess
 import time
+import pexpect
 
 from conf import settings as S
 from conf import get_test_param
@@ -133,15 +134,24 @@ class IVnfQemu(IVnf):
         """
         Stops VNF instance gracefully first.
         """
-        # exit testpmd if needed
-        if self._guest_loopback == 'testpmd':
-            self.execute_and_wait('stop', 120, "Done")
-            self.execute_and_wait('quit', 120, "bye")
+        try:
+            # exit testpmd if needed
+            if self._guest_loopback == 'testpmd':
+                self.execute_and_wait('stop', 120, "Done")
+                self.execute_and_wait('quit', 120, "[bB]ye")
+
+            # turn off VM
+            self.execute_and_wait('poweroff', 120, "Power down")
 
-        # turn off VM
-        self.execute_and_wait('poweroff', 120, "Power down")
-        # VM OS is off, but wait until qemu shutdowns
-        time.sleep(2)
+        except pexpect.TIMEOUT:
+            self.kill()
+
+        # wait until qemu shutdowns
+        self._logger.debug('Wait for QEMU to terminate')
+        for dummy in range(30):
+            time.sleep(1)
+            if not self.is_running():
+                break
 
         # just for case that graceful shutdown failed
         super(IVnfQemu, self).stop()
@@ -266,7 +276,7 @@ class IVnfQemu(IVnf):
         self.execute_and_wait('mount -o ro,iocharset=utf8 /dev/sdb1 ' +
                               S.getValue('OVS_DPDK_SHARE'))
         self.execute_and_wait('mkdir -p ' + S.getValue('GUEST_OVS_DPDK_DIR'))
-        self.execute_and_wait('cp -ra ' + os.path.join(S.getValue('OVS_DPDK_SHARE'), dirname) +
+        self.execute_and_wait('cp -r ' + os.path.join(S.getValue('OVS_DPDK_SHARE'), dirname) +
                               ' ' + S.getValue('GUEST_OVS_DPDK_DIR'))
         self.execute_and_wait('umount /dev/sdb1')
 
@@ -344,9 +354,22 @@ class IVnfQemu(IVnf):
                               '/DPDK/app/test-pmd')
         self.execute_and_wait('make clean')
         self.execute_and_wait('make')
-        self.execute_and_wait('./testpmd -c 0x3 -n 4 --socket-mem 512 --'
-                              ' --burst=64 -i --txqflags=0xf00 ' +
-                              '--disable-hw-vlan', 60, "Done")
+        if int(S.getValue('GUEST_NIC_QUEUES')):
+            self.execute_and_wait(
+                './testpmd {} -n4 --socket-mem 512 --'.format(
+                    S.getValue('GUEST_TESTPMD_CPU_MASK')) +
+                ' --burst=64 -i --txqflags=0xf00 ' +
+                '--nb-cores={} --rxq={} --txq={} '.format(
+                    S.getValue('GUEST_TESTPMD_NB_CORES'),
+                    S.getValue('GUEST_TESTPMD_TXQ'),
+                    S.getValue('GUEST_TESTPMD_RXQ')) +
+                '--disable-hw-vlan', 60, "Done")
+        else:
+            self.execute_and_wait(
+                './testpmd {} -n 4 --socket-mem 512 --'.format(
+                    S.getValue('GUEST_TESTPMD_CPU_MASK')) +
+                ' --burst=64 -i --txqflags=0xf00 ' +
+                '--disable-hw-vlan', 60, "Done")
         self.execute('set fwd ' + self._testpmd_fwd_mode, 1)
         self.execute_and_wait('start', 20,
                               'TX RS bit threshold=.+ - TXQ flags=0xf00')
@@ -374,17 +397,23 @@ class IVnfQemu(IVnf):
         """
         self._configure_disable_firewall()
 
-        self.execute('ifconfig ' + self._net1 + ' ' +
-                     S.getValue('VANILLA_NIC1_IP_CIDR')[self._number])
+        self.execute('ip addr add ' +
+                     S.getValue('VANILLA_NIC1_IP_CIDR')[self._number] +
+                     ' dev ' + self._net1)
+        self.execute('ip link set dev ' + self._net1 + ' up')
 
-        self.execute('ifconfig ' + self._net2 + ' ' +
-                     S.getValue('VANILLA_NIC2_IP_CIDR')[self._number])
+        self.execute('ip addr add ' +
+                     S.getValue('VANILLA_NIC2_IP_CIDR')[self._number] +
+                     ' dev ' + self._net2)
+        self.execute('ip link set dev ' + self._net2 + ' up')
 
         # 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])
+        self.execute('ip addr add ' +
+                     S.getValue('VANILLA_BRIDGE_IP')[self._number] +
+                     ' dev br0')
+        self.execute('ip link set dev br0 up')
 
         # Add the arp entries for the IXIA ports and the bridge you are using.
         # Use command line values if provided.