Merge "docs: Update step driven test documentation"

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

diff --git a/conf/02_vswitch.conf b/conf/02_vswitch.conf
index 6a830a0..c9ffa0b 100644 (file)
--- 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.
@@ -174,6 +174,10 @@ VSWITCHD_VANILLA_ARGS = []
 # Bridge name to be used by VSWTICH
 VSWITCH_BRIDGE_NAME = '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,6 +205,11 @@ 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 = []
+
 #########################
 ## VPP
 #########################