Code Review
/
vswitchperf.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Xena_Flow_Fix: Fixes multistream of greater than 64k values"
[vswitchperf.git]
/
conf
/
integration
/
02_vswitch.conf
diff --git
a/conf/integration/02_vswitch.conf
b/conf/integration/02_vswitch.conf
index
63ffe1b
..
9477a1d
100644
(file)
--- a/
conf/integration/02_vswitch.conf
+++ b/
conf/integration/02_vswitch.conf
@@
-1,4
+1,4
@@
-# Copyright 2015-201
6 Intel Corporation.
+# Copyright 2015-201
8 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.
#
# 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'
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_EXTERNAL_BRIDGE_IP = '192.168.240.1/24'
# vxlan|gre|geneve