tests: Only run test on kernel datapath

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 <dlu998@gmail.com>
Signed-off-by: Greg Rose <gvrose8192@gmail.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>

diff --git a/tests/system-kmod-macros.at b/tests/system-kmod-macros.at
index 283898f8153c32c268eff9bb72c86a1d40da7ed0..9e89aec43734e9c4f6da1c1539ff4283eea88ca4 100644 (file)
--- 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 f53002f825b6733fbbe088695cedc1440a83679f..870a05efe04c0c9751d1cc074a3ed3c4acfe2261 100644 (file)
--- 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 5d3b8b8e09c538a16b7d0f577623e07ec0c63a0a..a419f30c1563442e4f9d8edca72a61704ee2db37 100644 (file)
--- 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([:])
+])