diff options
author | Martin Klozik <martin.klozik@tieto.com> | 2018-06-05 10:12:49 +0200 |
---|---|---|
committer | Martin Klozik <martin.klozik@tieto.com> | 2018-06-05 10:12:49 +0200 |
commit | 89018d21b6383f853a01c57a2270153d266fe087 (patch) | |
tree | cbedb55d5b6d5fdd1c61d71abdfe90a6c0ab55be /conf/integration/02_vswitch.conf | |
parent | 3daf5942e2ede8088898a9589d41b797e27b6d4e (diff) |
ovs: Change default bridge names
Default names of OVS bridges used by vsperf were changed
to avoid accidental collision with 3rd party bridges
(e.g. linux bridges) already configured at DUT.
Step driven testcases, which extend existing deployment
scenarios, were updated to use appropriate configuration
options instead of hardcoded bridge names.
JIRA: VSPERF-580
Change-Id: I8c7eee6d8f6532485ec3a2cc06f26515e665fb7e
Signed-off-by: Martin Klozik <martin.klozik@tieto.com>
Reviewed-by: Al Morton <acmorton@att.com>
Reviewed-by: Christian Trautman <ctrautma@redhat.com>
Reviewed-by: Sridhar Rao <sridhar.rao@spirent.com>
Reviewed-by: Richard Elias <richard.elias@tieto.com>
Diffstat (limited to 'conf/integration/02_vswitch.conf')
-rw-r--r-- | conf/integration/02_vswitch.conf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/conf/integration/02_vswitch.conf b/conf/integration/02_vswitch.conf index 63ffe1bc..9477a1d0 100644 --- 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,8 +16,8 @@ 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 |