FIX: Vhost tests in latest VPP nightly

[csit.git] / resources / libraries / python / QemuUtils.py

diff --git a/resources/libraries/python/QemuUtils.py b/resources/libraries/python/QemuUtils.py
index 6a63798..41b5f54 100644 (file)
--- a/resources/libraries/python/QemuUtils.py
+++ b/resources/libraries/python/QemuUtils.py
@@ -196,7 +196,7 @@ class QemuUtils(object):
         self._params.add_with_value(
             'append', '"ro rootfstype=9p rootflags=trans=virtio '
                       'root=virtioroot console={console} tsc=reliable '
-                      'hugepages=256 init={init}"'.format(
+                      'hugepages=256 init={init} fastboot"'.format(
                           console=console, init=self._temp.get('ini')))
 
     def create_kernelvm_config_vpp(self, **kwargs):
@@ -222,6 +222,7 @@ class QemuUtils(object):
         vpp_config.add_unix_nodaemon()
         vpp_config.add_unix_cli_listen()
         vpp_config.add_unix_exec(running)
+        vpp_config.add_socksvr()
         vpp_config.add_cpu_main_core('0')
         if self._opt.get('smp') > 1:
             vpp_config.add_cpu_corelist_workers('1-{smp}'.format(
@@ -234,6 +235,7 @@ class QemuUtils(object):
             vpp_config.add_dpdk_no_tx_checksum_offload()
         vpp_config.add_plugin('disable', 'default')
         vpp_config.add_plugin('enable', 'dpdk_plugin.so')
+        vpp_config.add_plugin('enable', 'memif_plugin.so')
         vpp_config.write_config(startup)
 
         # Create VPP running configuration.
@@ -261,9 +263,8 @@ class QemuUtils(object):
             pmd_num_mbufs=16384,
             pmd_rxq=kwargs['queues'],
             pmd_txq=kwargs['queues'],
-            pmd_tx_offloads=False,
+            pmd_tx_offloads='0x0',
             pmd_disable_hw_vlan=False,
-            pmd_max_pkt_len=9200 if kwargs['jumbo_frames'] else None,
             pmd_nb_cores=str(self._opt.get('smp') - 1))
 
         self._opt['vnf_bin'] = ('{testpmd_path}/{testpmd_cmd}'.
@@ -286,9 +287,8 @@ class QemuUtils(object):
             pmd_eth_peer_1='1,{mac}'.format(mac=kwargs['vif2_mac']),
             pmd_rxq=kwargs['queues'],
             pmd_txq=kwargs['queues'],
-            pmd_tx_offloads=False,
+            pmd_tx_offloads='0x0',
             pmd_disable_hw_vlan=False,
-            pmd_max_pkt_len=9200 if kwargs['jumbo_frames'] else None,
             pmd_nb_cores=str(self._opt.get('smp') - 1))
 
         self._opt['vnf_bin'] = ('{testpmd_path}/{testpmd_cmd}'.