trafficgen: Postponed call of connect()

[vswitchperf.git] / conf / 02_vswitch.conf

diff --git a/conf/02_vswitch.conf b/conf/02_vswitch.conf
index 2bac173..6a830a0 100644 (file)
--- a/conf/02_vswitch.conf
+++ b/conf/02_vswitch.conf
@@ -53,7 +53,7 @@ PATHS['dpdk'] = {
             # To use vfio set:
             # 'modules' : ['uio', 'vfio-pci'],
             'modules' : ['uio', os.path.join(RTE_TARGET, 'kmod/igb_uio.ko')],
-            'bind-tool': 'tools/dpdk*bind.py',
+            'bind-tool': '*tools/dpdk*bind.py',
             'testpmd': os.path.join(RTE_TARGET, 'app', 'testpmd'),
         },
         'bin': {
@@ -110,15 +110,17 @@ PATHS['vswitch'] = {
     'ovs_var_tmp': '/usr/local/var/run/openvswitch/',
     'ovs_etc_tmp': '/usr/local/etc/openvswitch/',
     'VppDpdkVhost': {
-        'type' : 'bin',
+        'type' : 'src',
         'src': {
-            'path': os.path.join(ROOT_DIR, 'src/vpp/vpp/build-root/build-vpp-native'),
-            'vpp': 'vpp',
-            'vppctl': 'vppctl',
+            'path': os.path.join(ROOT_DIR, 'src/vpp/vpp/build-root/install-vpp-native/vpp'),
+            'vpp': 'bin/vpp',
+            'vppctl': 'bin/vppctl',
+            'vpp_plugin_path' : 'lib64/vpp_plugins',
         },
         'bin': {
             'vpp': 'vpp',
             'vppctl': 'vppctl',
+            'vpp_plugin_path' : '/usr/lib/vpp_plugins',
         }
     },
 }
@@ -151,6 +153,13 @@ VSWITCHD_DPDK_CONFIG = {
 # Note: VSPERF will automatically detect, which type of DPDK configuration should
 # be used.
 
+# Defines if VSWITCH should be a server for sockets of DPDK vhost-user
+# interfaces (True) or not (False). Support of vhost user server mode
+# in Open vSwitch is deprecated and will be removed in future releases.
+# Note: Qemu 2.7 and newer is required to support settings
+# VSWITCH_VHOSTUSER_SERVER_MODE = False
+VSWITCH_VHOSTUSER_SERVER_MODE = True
+
 # To enable multi queue with dpdk modify the below param to the number of
 # queues for dpdk. 0 = disabled
 VSWITCH_DPDK_MULTI_QUEUES = 0
@@ -189,11 +198,15 @@ LOG_FILE_OVS = 'ovs.log'
 # default vswitch implementation
 VSWITCH = "OvsDpdkVhost"
 
+VSWITCH_JUMBO_FRAMES_ENABLED = False
+VSWITCH_JUMBO_FRAMES_SIZE = 9000
+
 #########################
 ## VPP
 #########################
 # Set of arguments used for startup of VPP
 # NOTE: DPDK socket mem allocation is driven by parameter DPDK_SOCKET_MEM
+VSWITCH_VPP_CLI_SOCK = ''
 VSWITCH_VPP_ARGS = {
     'unix' : [
         'interactive',      # required by VSPERF to detect successful VPP startup
@@ -201,7 +214,8 @@ VSWITCH_VPP_ARGS = {
         'full-coredump',
     ],
     'cpu' : [
-        'main-core 3',
+        'main-core 2',
+        'workers 2',
         'corelist-workers 4,5',
     ],
 }