bugfix: Fix failure caused by unset locale

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

diff --git a/conf/02_vswitch.conf b/conf/02_vswitch.conf
index c7fe03f..8085f3c 100644 (file)
--- a/conf/02_vswitch.conf
+++ b/conf/02_vswitch.conf
@@ -13,17 +13,23 @@
 # limitations under the License.
 
 # ############################
-# vswitch configuration
+# Directories
 # ############################
-RTE_SDK = '~/dpdk'
-OVS_DIR = '~/openvswitch'
+# use DPDK VHOST USER by default
+RTE_SDK = RTE_SDK_USER
+OVS_DIR = OVS_DIR_USER
+
+OVS_VAR_DIR = '/usr/local/var/run/openvswitch/'
+OVS_ETC_DIR = '/usr/local/etc/openvswitch/'
+
+VSWITCH_DIR = os.path.join(ROOT_DIR, 'vswitches')
 
 # ############################
 # DPDK configuration
 # ############################
 
 # DPDK target used when builing DPDK
-RTE_TARGET = 'x86_64-ivshmem-linuxapp-gcc'
+RTE_TARGET = 'x86_64-native-linuxapp-gcc'
 
 # list of NIC HWIDs which will be bound to the 'igb_uio' driver on
 # system init
@@ -34,29 +40,6 @@ WHITELIST_NICS = ['05:00.0', '05:00.1']
 BLACKLIST_NICS = ['0000:09:00.0', '0000:09:00.1', '0000:09:00.2',
                   '0000:09:00.3']
 
-# These are DPDK EAL parameters and they may need to be changed depending on
-# hardware configuration, like cpu numbering and NUMA.
-VSWITCHD_DPDK_ARGS = ['-c', '0x4', '-n', '4', '--socket-mem 1024,0']
-
-VSWITCHD_VANILLA_ARGS = ['--pidfile']
-VSWITCH_VANILLA_PHY_PORT_NAMES = ['', '']
-VSWITCH_VANILLA_KERNEL_MODULES = ['openvswitch']
-
-# directory where hugepages will be mounted on system init
-HUGEPAGE_DIR = '/dev/hugepages'
-
-# Sets OVS PMD core mask to 2 for CPU core 1 affinitization
-VSWITCH_PMD_CPU_MASK = '2'
-VSWITCH_AFFINITIZATION_ON = 1
-
-VSWITCH_FLOW_TIMEOUT = '30000'
-
-# list of tuples of format (path, module_name), which will be inserted
-# using 'insmod' on system init
-
-# for OVS modules the path is in reference to the OVS directory.
-OVS_MODULES = []
-
 # for DPDK_MODULES the path is in reference to the build directory
 DPDK_MODULES = [
     ('kmod', 'igb_uio'),
@@ -77,13 +60,42 @@ VHOST_USER_SOCKS = ['/tmp/dpdkvhostuser0', '/tmp/dpdkvhostuser1',
                     '/tmp/dpdkvhostuser2', '/tmp/dpdkvhostuser3',
                     '/tmp/myport0', '/tmp/helloworld123', '/tmp/abcstuff0']
 
+# ############################
+# vswitch configuration
+# ############################
+# These are DPDK EAL parameters and they may need to be changed depending on
+# hardware configuration, like cpu numbering and NUMA.
+VSWITCHD_DPDK_ARGS = ['-c', '0x4', '-n', '4', '--socket-mem 1024,0']
+
+VSWITCHD_VANILLA_ARGS = ['--pidfile']
+VSWITCH_VANILLA_PHY_PORT_NAMES = ['', '']
+
+# use full module path to load module matching OVS version built from the source
+VSWITCH_VANILLA_KERNEL_MODULES = [os.path.join(OVS_DIR_VANILLA, 'datapath/linux/openvswitch.ko')]
+
+# Bridge name to be used by VSWTICH
+VSWITCH_BRIDGE_NAME = 'br0'
+
+# directory where hugepages will be mounted on system init
+HUGEPAGE_DIR = '/dev/hugepages'
+
+# Sets OVS PMDs core mask to 0x30 for affinitization to 5th and 6th CPU core
+VSWITCH_PMD_CPU_MASK = '0x30'
+VSWITCH_AFFINITIZATION_ON = 1
+
+VSWITCH_FLOW_TIMEOUT = '30000'
+
+# list of tuples of format (path, module_name), which will be inserted
+# using 'insmod' on system init
+
+# for OVS modules the path is in reference to the OVS directory.
+OVS_MODULES = []
+
 # log file for ovs-vswitchd
 LOG_FILE_VSWITCHD = 'vswitchd.log'
 
 # log file for ovs-dpdk
 LOG_FILE_OVS = 'ovs.log'
 
-VSWITCH_DIR = os.path.join(ROOT_DIR, 'vswitches')
+# default vswitch implementation
 VSWITCH = "OvsDpdkVhost"
-
-VHOST_METHOD = 'cuse'