| Message ID | 1460486215-63242-1-git-send-email-joe@ovn.org |
|---|---|
| State | Accepted |
| Headers | show |
On Tue, Apr 12, 2016 at 11:36:55AM -0700, Joe Stringer wrote: > Signed-off-by: Joe Stringer <joe@ovn.org> > --- > tests/system-traffic.at | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tests/system-traffic.at b/tests/system-traffic.at > index 58212c1ed014..2e0dd9b4894a 100644 > --- a/tests/system-traffic.at > +++ b/tests/system-traffic.at > @@ -1401,7 +1401,7 @@ AT_CHECK([ip link set dev br-underlay up]) > > dnl Set up tunnel endpoints on OVS outside the namespace and with a native > dnl linux device inside the namespace. > -ADD_OVS_TUNNEL([vxlan], [br0], [at_ns0], [172.31.1.1], [10.1.1.100/24]) > +ADD_OVS_TUNNEL([vxlan], [br0], [at_vxlan0], [172.31.1.1], [10.1.1.100/24]) > ADD_NATIVE_TUNNEL([vxlan], [at_vxlan1], [at_ns0], [172.31.1.100], [10.1.1.1/24], > [id 0 dstport 4789]) > > @@ -1455,7 +1455,7 @@ AT_CHECK([ip link set dev br-underlay up]) > > dnl Set up tunnel endpoints on OVS outside the namespace and with a native > dnl linux device inside the namespace. > -ADD_OVS_TUNNEL([vxlan], [br0], [at_ns0], [172.31.1.1], ["fc00::2/96"]) > +ADD_OVS_TUNNEL([vxlan], [br0], [at_vxlan0], [172.31.1.1], ["fc00::2/96"]) > ADD_NATIVE_TUNNEL([vxlan], [at_vxlan1], [at_ns0], [172.31.1.100], ["fc00::1/96"], > [id 0 dstport 4789]) If I'm reading this right, then at_ns0 was being used as both a port name and a network namespace name. If that's right, then this seems like a change likely to reduce confusion, so: Acked-by: Ben Pfaff <blp@ovn.org>
On 12 April 2016 at 21:15, Ben Pfaff <blp@ovn.org> wrote: > On Tue, Apr 12, 2016 at 11:36:55AM -0700, Joe Stringer wrote: >> Signed-off-by: Joe Stringer <joe@ovn.org> >> --- >> tests/system-traffic.at | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/tests/system-traffic.at b/tests/system-traffic.at >> index 58212c1ed014..2e0dd9b4894a 100644 >> --- a/tests/system-traffic.at >> +++ b/tests/system-traffic.at >> @@ -1401,7 +1401,7 @@ AT_CHECK([ip link set dev br-underlay up]) >> >> dnl Set up tunnel endpoints on OVS outside the namespace and with a native >> dnl linux device inside the namespace. >> -ADD_OVS_TUNNEL([vxlan], [br0], [at_ns0], [172.31.1.1], [10.1.1.100/24]) >> +ADD_OVS_TUNNEL([vxlan], [br0], [at_vxlan0], [172.31.1.1], [10.1.1.100/24]) >> ADD_NATIVE_TUNNEL([vxlan], [at_vxlan1], [at_ns0], [172.31.1.100], [10.1.1.1/24], >> [id 0 dstport 4789]) >> >> @@ -1455,7 +1455,7 @@ AT_CHECK([ip link set dev br-underlay up]) >> >> dnl Set up tunnel endpoints on OVS outside the namespace and with a native >> dnl linux device inside the namespace. >> -ADD_OVS_TUNNEL([vxlan], [br0], [at_ns0], [172.31.1.1], ["fc00::2/96"]) >> +ADD_OVS_TUNNEL([vxlan], [br0], [at_vxlan0], [172.31.1.1], ["fc00::2/96"]) >> ADD_NATIVE_TUNNEL([vxlan], [at_vxlan1], [at_ns0], [172.31.1.100], ["fc00::1/96"], >> [id 0 dstport 4789]) > > If I'm reading this right, then at_ns0 was being used as both a port > name and a network namespace name. If that's right, then this seems > like a change likely to reduce confusion, so: > Acked-by: Ben Pfaff <blp@ovn.org> Yes, that was the intention (I could have explained that better in the commit message ;-) ) Applied to master, thanks.
diff --git a/tests/system-traffic.at b/tests/system-traffic.at index 58212c1ed014..2e0dd9b4894a 100644 --- a/tests/system-traffic.at +++ b/tests/system-traffic.at @@ -1401,7 +1401,7 @@ AT_CHECK([ip link set dev br-underlay up]) dnl Set up tunnel endpoints on OVS outside the namespace and with a native dnl linux device inside the namespace. -ADD_OVS_TUNNEL([vxlan], [br0], [at_ns0], [172.31.1.1], [10.1.1.100/24]) +ADD_OVS_TUNNEL([vxlan], [br0], [at_vxlan0], [172.31.1.1], [10.1.1.100/24]) ADD_NATIVE_TUNNEL([vxlan], [at_vxlan1], [at_ns0], [172.31.1.100], [10.1.1.1/24], [id 0 dstport 4789]) @@ -1455,7 +1455,7 @@ AT_CHECK([ip link set dev br-underlay up]) dnl Set up tunnel endpoints on OVS outside the namespace and with a native dnl linux device inside the namespace. -ADD_OVS_TUNNEL([vxlan], [br0], [at_ns0], [172.31.1.1], ["fc00::2/96"]) +ADD_OVS_TUNNEL([vxlan], [br0], [at_vxlan0], [172.31.1.1], ["fc00::2/96"]) ADD_NATIVE_TUNNEL([vxlan], [at_vxlan1], [at_ns0], [172.31.1.100], ["fc00::1/96"], [id 0 dstport 4789])
Signed-off-by: Joe Stringer <joe@ovn.org> --- tests/system-traffic.at | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)