odp-util: Fix formatting and parsing of 'frag' in tnl_push ipv4 argument.

[cascardo/ovs.git] / tests / interface-reconfigure.at

diff --git a/tests/interface-reconfigure.at b/tests/interface-reconfigure.at
index 26a77eb..22a3e2e 100644 (file)
--- a/tests/interface-reconfigure.at
+++ b/tests/interface-reconfigure.at
@@ -697,6 +697,7 @@ AT_BANNER([interface-reconfigure])
 AT_SETUP([non-VLAN, non-bond])
 AT_KEYWORDS([interface-reconfigure])
 AT_SKIP_IF([$non_ascii_cwd])
+AT_SKIP_IF([test "$IS_WIN32" = "yes"])
 ifr_setup
 
 AT_CHECK([ifr_run --force xenbr2 up], [0], [], [stderr])
@@ -773,6 +774,7 @@ AT_CLEANUP
 AT_SETUP([VLAN, non-bond])
 AT_KEYWORDS([interface-reconfigure])
 AT_SKIP_IF([$non_ascii_cwd])
+AT_SKIP_IF([test "$IS_WIN32" = "yes"])
 ifr_setup
 
 AT_CHECK([ifr_run --force xapi3 up], [0], [], [stderr])
@@ -847,6 +849,7 @@ AT_CLEANUP
 AT_SETUP([Bond, non-VLAN])
 AT_KEYWORDS([interface-reconfigure])
 AT_SKIP_IF([$non_ascii_cwd])
+AT_SKIP_IF([test "$IS_WIN32" = "yes"])
 ifr_setup
 
 # Pretend that bond0 exists, even though it would really be created by
@@ -936,6 +939,7 @@ AT_CLEANUP
 AT_SETUP([VLAN on bond])
 AT_KEYWORDS([interface-reconfigure])
 AT_SKIP_IF([$non_ascii_cwd])
+AT_SKIP_IF([test "$IS_WIN32" = "yes"])
 ifr_setup
 
 # Pretend that bond0 exists, even though it would really be created by
@@ -1028,3 +1032,20 @@ action_down: bring down physical devices - [u'eth0', u'eth1']
 ]])
 
 AT_CLEANUP
+
+dnl This test configures two tunnels, then deletes the second and re-uses its
+dnl name for different types of ports. This was introduced to detect errors
+dnl where port configuration persists even when the port is deleted and
+dnl readded.
+AT_SETUP([Re-create port with different types])
+AT_KEYWORDS([interface-reconfigure])
+OVS_VSWITCHD_START(
+  [add-port br0 p0 -- set int p0 type=gre options:remote_ip=127.0.0.1 -- \
+   add-port br0 p1 -- set int p1 type=dummy -- \
+   add-port br0 p2 -- set int p2 type=dummy])
+
+AT_CHECK([ovs-vsctl set int p1 type=gre options:remote_ip=127.0.0.1])
+AT_CHECK([ovs-vsctl del-port p1])
+AT_CHECK([ovs-vsctl add-port br0 p1 -- set int p1 type=dummy])
+
+AT_CLEANUP