X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=conf%2F02_vswitch.conf;h=84ef71cb014b0e6b42c8121f38c6beec5e3d34a7;hb=755894494dc58e093d7376bf41f15dcbbdb5e53b;hp=4d0fc46b0596177786a9137d8ccbb492730a3271;hpb=e1c33f5984089d32ff6615df5c993187d6c132e2;p=vswitchperf.git

diff --git a/conf/02_vswitch.conf b/conf/02_vswitch.conf
index 4d0fc46b..84ef71cb 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.
@@ -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'
@@ -206,6 +210,15 @@ 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
 #########################