diff options
Diffstat (limited to 'conf/02_vswitch.conf')
-rw-r--r-- | conf/02_vswitch.conf | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/conf/02_vswitch.conf b/conf/02_vswitch.conf index 6a830a05..4eca1a52 100644 --- a/conf/02_vswitch.conf +++ b/conf/02_vswitch.conf @@ -1,4 +1,4 @@ -# Copyright 2015-2016 Intel Corporation. +# Copyright 2015-2018 Intel Corporation, Tieto and others. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -115,7 +115,7 @@ PATHS['vswitch'] = { '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', + 'vpp_plugin_path' : 'lib/vpp_plugins', }, 'bin': { 'vpp': 'vpp', @@ -172,7 +172,11 @@ OVS_OLD_STYLE_MQ = False VSWITCHD_VANILLA_ARGS = [] # Bridge name to be used by VSWTICH -VSWITCH_BRIDGE_NAME = 'br0' +VSWITCH_BRIDGE_NAME = 'vsperf-br0' + +# A tunnel type used by OP2P and PTUNP deployments +# Supported values: 'vxlan', 'gre' or 'geneve' +TUNNEL_TYPE = 'vxlan' # directory where hugepages will be mounted on system init HUGEPAGE_DIR = '/dev/hugepages' @@ -201,12 +205,26 @@ VSWITCH = "OvsDpdkVhost" VSWITCH_JUMBO_FRAMES_ENABLED = False VSWITCH_JUMBO_FRAMES_SIZE = 9000 +# default arguments of OVS ctl tools +OVS_VSCTL_ARGS = [] +OVS_OFCTL_ARGS = ['-O', 'OpenFlow13'] # backward compatible default value +OVS_APPCTL_ARGS = [] + +# default flow template to be used by OVS classes +OVS_FLOW_TEMPLATE = { + 'idle_timeout': '0' +} + +# enable or disable configuration of routing tables; See vswitchperf_design.rst +# for details. +OVS_ROUTING_TABLES = False + ######################### ## 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_CLI_SOCK = '/run/vpp/cli.sock' VSWITCH_VPP_ARGS = { 'unix' : [ 'interactive', # required by VSPERF to detect successful VPP startup @@ -218,6 +236,9 @@ VSWITCH_VPP_ARGS = { 'workers 2', 'corelist-workers 4,5', ], + 'socksvr' : [ + 'socket-name /run/vpp-api.sock', + ], } # log file for VPP |