tunnel: Mark GRE64 tunnel protocol deprecated.

[cascardo/ovs.git] / tests / ofproto-macros.at

diff --git a/tests/ofproto-macros.at b/tests/ofproto-macros.at
index 83b2480..aa09480 100644 (file)
--- a/tests/ofproto-macros.at
+++ b/tests/ofproto-macros.at
@@ -16,7 +16,7 @@ s/ hard_age=[0-9]*,//
 }
 
 # Filter (multiline) vconn debug messages from ovs-vswitchd.log.
-# Use with ofctl_strip()
+# Use with vconn_windows_sub() and ofctl_strip()
 print_vconn_debug () { awk -F\| < ovs-vswitchd.log '
 BEGIN { prt=0 }
 /\|vconn\|DBG\|/ { sub(/[ \t]*$/, ""); print $3 "|" $4 "|" $5; prt=1; next }
@@ -25,6 +25,13 @@ prt==1 { sub(/[ \t]*$/, ""); print $0 }
 '
 }
 
+vconn_windows_sub() {
+    sed '
+s/tcp:127.0.0.1:[0-9][0-9]*:/unix:/
+s/No error/Success/
+'
+}
+
 # parse_listening_port [SERVER]
 #
 # Parses the TCP or SSL port on which a server is listening from the
@@ -116,6 +123,7 @@ check_logs () {
 /timeval.*disk: [[0-9]]* reads, [[0-9]]* writes/d
 /timeval.*context switches: [[0-9]]* voluntary, [[0-9]]* involuntary/d
 /ovs_rcu.*blocked [[0-9]]* ms waiting for .* to quiesce/d
+/netdev_vport.*GRE64 tunnel protocol is deprecated*/d
 /|WARN|/p
 /|ERR|/p
 /|EMER|/p" ovs-vswitchd.log ovsdb-server.log