ovs: Change default bridge names

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

diff --git a/conf/integration/02_vswitch.conf b/conf/integration/02_vswitch.conf
index 20cec3e..9477a1d 100644 (file)
--- a/conf/integration/02_vswitch.conf
+++ b/conf/integration/02_vswitch.conf
@@ -1,4 +1,4 @@
-# Copyright 2015-2016 Intel Corporation.
+# Copyright 2015-2018 Intel Corporation., Tieto
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,9 +16,21 @@
 VTEP_IP1 = '192.168.0.1/24'
 VTEP_IP2 = '192.168.240.10'
 VTEP_IP2_SUBNET = '192.168.240.0/24'
-TUNNEL_INTEGRATION_BRIDGE = 'br0'
-TUNNEL_EXTERNAL_BRIDGE = 'br-ext'
+TUNNEL_INTEGRATION_BRIDGE = 'vsperf-br0'
+TUNNEL_EXTERNAL_BRIDGE = 'vsperf-br-ext'
 TUNNEL_EXTERNAL_BRIDGE_IP = '192.168.240.1/24'
 
 # vxlan|gre|geneve
 TUNNEL_TYPE = 'vxlan'
+
+#Tunnel bridge configuration for P-TUN-P(VxLAN) deployment scenario
+# to test VxLAN performance without any overlay ingress traffic by doing the
+# encap decap inside the virtual switch itself.
+TUNNEL_EXTERNAL_BRIDGE1 = 'br-phy1'
+TUNNEL_EXTERNAL_BRIDGE2 = 'br-phy2'
+TUNNEL_MODIFY_BRIDGE1 = 'br-mod1'
+TUNNEL_MODIFY_BRIDGE2 = 'br-mod2'
+TUNNEL_MODIFY_BRIDGE_MAC1 = '00:00:10:00:00:01'
+TUNNEL_MODIFY_BRIDGE_MAC2 = '00:00:20:00:00:01'
+TUNNEL_MODIFY_BRIDGE_IP1 = '10.0.0.1/24'
+TUNNEL_MODIFY_BRIDGE_IP2 = '20.0.0.1/24'