Update the test after commit 847ddeab372220170f431f1b9dd504237066729a
("meta-flow: Add support for ONF OpenFlow 1.3 extension ONFOXM_ET_TCP_FLAGS.")
Signed-off-by: YAMAMOTO Takashi <yamam...@valinux.co.jp>
---
tests/ovs-ofctl.at | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/tests/ovs-ofctl.at b/tests/ovs-ofctl.at
index eafaa63..d616656 100644
--- a/tests/ovs-ofctl.at
+++ b/tests/ovs-ofctl.at
@@ -2340,15 +2340,21 @@ AT_CHECK([echo "$tcp_flags" | ovs-ofctl parse-nxm], [0],
[NXM_OF_ETH_TYPE(0800), NXM_OF_IP_PROTO(06), NXM_NX_TCP_FLAGS(0fff)
])
-# Check that marshaling in OXM for OF1.2 through OF1.4 gives OXM
-# headers except for TCP flags, which didn't have an OXM definition until
-# OF1.5.
-for version in OpenFlow12 OpenFlow13 OpenFlow14; do
+# Check that marshaling in OXM for OF1.2 gives OXM headers except for
+# TCP flags, which didn't have an OXM definition.
+for version in OpenFlow12; do
AT_CHECK([echo "$tcp_flags" | ovs-ofctl parse-oxm $version], [0],
[OXM_OF_ETH_TYPE(0800), OXM_OF_IP_PROTO(06), NXM_NX_TCP_FLAGS(0fff)
])
done
+# OpenFlow 1.3 and later has ONF extension for TCP flags.
+for version in OpenFlow13 OpenFlow14; do
+ AT_CHECK([echo "$tcp_flags" | ovs-ofctl parse-oxm $version], [0],
+ [OXM_OF_ETH_TYPE(0800), OXM_OF_IP_PROTO(06), ONFOXM_ET_TCP_FLAGS(0fff)
+])
+done
+
# OpenFlow 1.5 added an OXM header for TCP flags:
AT_CHECK([echo "$tcp_flags" | ovs-ofctl parse-oxm OpenFlow15], [0],
[OXM_OF_ETH_TYPE(0800), OXM_OF_IP_PROTO(06), OXM_OF_TCP_FLAGS(0fff)
--
1.9.4
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
