The recently added test to check for the correct L3 L4 protocol
information after conntrack reassembles a packet should not run
in the userspace datapath. It is specific to a kernel datapath
regression.
Also change the name of the test to make it more informative and
less redundant and add comments with a short explanation.
Fixes: d7fd61a ("tests: Add check for correct l3l4 conntrack frag reassembly")
Suggested-by: Darrell Ball <[email protected]>
Signed-off-by: Greg Rose <[email protected]>
---
tests/system-kmod-macros.at | 7 +++++++
tests/system-traffic.at | 5 ++++-
tests/system-userspace-macros.at | 11 +++++++++++
3 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/tests/system-kmod-macros.at b/tests/system-kmod-macros.at
index 283898f..9e89aec 100644
--- a/tests/system-kmod-macros.at
+++ b/tests/system-kmod-macros.at
@@ -204,3 +204,10 @@ m4_define([VSCTL_ADD_DATAPATH_TABLE],
AT_CHECK([ovs-vsctl -- --id=@m create Datapath datapath_version=0 -- set
Open_vSwitch . datapaths:"system"=@m], [0], [stdout])
DP_TYPE=$(echo "system")
])
+
+# CHECK_L3L4_CONNTRACK_REASM()
+#
+# Only allow this test to run on the kernel datapath - it is not useful
+# or necessary for the userspace datapath as it is checking for a kernel
+# specific regression.
+m4_define([CHECK_L3L4_CONNTRACK_REASM])
diff --git a/tests/system-traffic.at b/tests/system-traffic.at
index f53002f..870a05e 100644
--- a/tests/system-traffic.at
+++ b/tests/system-traffic.at
@@ -3263,8 +3263,11 @@ AT_CHECK([ovs-appctl dpctl/dump-conntrack |
FORMAT_CT(10.1.1.2)], [0], [dnl
OVS_TRAFFIC_VSWITCHD_STOP
AT_CLEANUP
-AT_SETUP([conntrack - fragment reassembly test])
+dnl Check kernel datapath to make sure conntrack fills in L3 and L4
+dnl protocol information
+AT_SETUP([conntrack - fragment reassembly with L3 L4 protocol information])
CHECK_CONNTRACK()
+CHECK_L3L4_CONNTRACK_REASM()
OVS_TRAFFIC_VSWITCHD_START()
AT_DATA([flows.txt], [dnl
diff --git a/tests/system-userspace-macros.at b/tests/system-userspace-macros.at
index 5d3b8b8..a419f30 100644
--- a/tests/system-userspace-macros.at
+++ b/tests/system-userspace-macros.at
@@ -312,3 +312,14 @@ m4_define([VSCTL_ADD_DATAPATH_TABLE],
AT_CHECK([ovs-vsctl -- --id=@m create Datapath datapath_version=0 -- set
Open_vSwitch . datapaths:"netdev"=@m], [0], [stdout])
DP_TYPE=$(echo "netdev")
])
+
+
+# CHECK_L3L4_CONNTRACK_REASM()
+#
+# Only allow this test to run on the kernel datapath - it is not useful
+# or necessary for the userspace datapath as it is checking for a kernel
+# specific regression.
+m4_define([CHECK_L3L4_CONNTRACK_REASM],
+[
+ AT_SKIP_IF([:])
+])
--
1.8.3.1
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
