Merge "testpmd_pvp: Adds pkt_fwd to allow pvp topology testing"

[vswitchperf.git] / vswitches / ovs_dpdk_vhost.py

diff --git a/vswitches/ovs_dpdk_vhost.py b/vswitches/ovs_dpdk_vhost.py
index 39c8b63..a273147 100644 (file)
--- a/vswitches/ovs_dpdk_vhost.py
+++ b/vswitches/ovs_dpdk_vhost.py
@@ -17,7 +17,6 @@
 
 import logging
 import subprocess
-import os
 
 from src.ovs import OFBridge
 from src.dpdk import dpdk
@@ -50,10 +49,6 @@ class OvsDpdkVhost(IVSwitchOvs):
             else:
                 self._vswitchd_args = vswitchd_args
 
-        if settings.getValue('VNF').endswith('Cuse'):
-            self._logger.info("Inserting VHOST Cuse modules into kernel...")
-            dpdk.insert_vhost_modules()
-
     def configure(self):
         """ Configure vswitchd DPDK options through ovsdb if needed
         """
@@ -74,11 +69,11 @@ class OvsDpdkVhost(IVSwitchOvs):
         super(OvsDpdkVhost, self).start()
         # old style OVS <= 2.5.0 multi-queue enable
         if settings.getValue('OVS_OLD_STYLE_MQ') and \
-                int(settings.getValue('VSWITCH_MULTI_QUEUES')):
+                int(settings.getValue('VSWITCH_DPDK_MULTI_QUEUES')):
             tmp_br = OFBridge(timeout=-1)
             tmp_br.set_db_attribute(
                 'Open_vSwitch', '.', 'other_config:' +
-                'n-dpdk-rxqs', settings.getValue('VSWITCH_MULTI_QUEUES'))
+                'n-dpdk-rxqs', settings.getValue('VSWITCH_DPDK_MULTI_QUEUES'))
 
     def stop(self):
         """See IVswitch for general description
@@ -88,7 +83,6 @@ class OvsDpdkVhost(IVSwitchOvs):
 
         super(OvsDpdkVhost, self).stop()
         dpdk.cleanup()
-        dpdk.remove_vhost_modules()
 
     def add_switch(self, switch_name, params=None):
         """See IVswitch for general description
@@ -114,12 +108,17 @@ class OvsDpdkVhost(IVSwitchOvs):
         bridge = self._bridges[switch_name]
         dpdk_count = self._get_port_count('type=dpdk')
         port_name = 'dpdk' + str(dpdk_count)
-        params = ['--', 'set', 'Interface', port_name, 'type=dpdk']
+        # PCI info. Please note there must be no blank space, eg must be
+        # like 'options:dpdk-devargs=0000:06:00.0'
+        _NICS = settings.getValue('NICS')
+        nic_pci = 'options:dpdk-devargs=' + _NICS[dpdk_count]['pci']
+        params = ['--', 'set', 'Interface', port_name, 'type=dpdk', nic_pci]
         # multi-queue enable
-        if int(settings.getValue('VSWITCH_MULTI_QUEUES')) and \
+
+        if int(settings.getValue('VSWITCH_DPDK_MULTI_QUEUES')) and \
                 not settings.getValue('OVS_OLD_STYLE_MQ'):
-                params += ['options:n_rxq={}'.format(
-                    settings.getValue('VSWITCH_MULTI_QUEUES'))]
+            params += ['options:n_rxq={}'.format(
+                settings.getValue('VSWITCH_DPDK_MULTI_QUEUES'))]
         of_port = bridge.add_port(port_name, params)
         return (port_name, of_port)
 
@@ -131,20 +130,14 @@ class OvsDpdkVhost(IVSwitchOvs):
         from 0
         """
         bridge = self._bridges[switch_name]
-        # Changed dpdkvhost to dpdkvhostuser to be able to run in Qemu 2.2
-        if settings.getValue('VNF').endswith('Cuse'):
-            vhost_count = self._get_port_count('type=dpdkvhostcuse')
-            port_name = 'dpdkvhostcuse' + str(vhost_count)
-            params = ['--', 'set', 'Interface', port_name, 'type=dpdkvhostcuse']
-        else:
-            vhost_count = self._get_port_count('type=dpdkvhostuser')
-            port_name = 'dpdkvhostuser' + str(vhost_count)
-            params = ['--', 'set', 'Interface', port_name, 'type=dpdkvhostuser']
-            # multi queue enable
-            if int(settings.getValue('VSWITCH_MULTI_QUEUES')) and \
-                    not settings.getValue('OVS_OLD_STYLE_MQ'):
-                params += ['options:n_rxq={}'.format(
-                    settings.getValue('VSWITCH_MULTI_QUEUES'))]
+        vhost_count = self._get_port_count('type=dpdkvhostuser')
+        port_name = 'dpdkvhostuser' + str(vhost_count)
+        params = ['--', 'set', 'Interface', port_name, 'type=dpdkvhostuser']
+        # multi queue enable
+        if int(settings.getValue('VSWITCH_DPDK_MULTI_QUEUES')) and \
+                not settings.getValue('OVS_OLD_STYLE_MQ'):
+            params += ['options:n_rxq={}'.format(
+                settings.getValue('VSWITCH_DPDK_MULTI_QUEUES'))]
         of_port = bridge.add_port(port_name, params)
 
         return (port_name, of_port)
@@ -156,7 +149,7 @@ class OvsDpdkVhost(IVSwitchOvs):
         :returns: True if legacy --dpdk option is supported, otherwise it returns False
         """
 
-        ovs_vswitchd_bin = os.path.join(settings.getValue('OVS_DIR'), 'vswitchd', 'ovs-vswitchd')
+        ovs_vswitchd_bin = settings.getValue('TOOLS')['ovs-vswitchd']
         try:
             subprocess.check_output(ovs_vswitchd_bin + r' --help | grep "\-\-dpdk"', shell=True)
             return True