diff options
| -rw-r--r-- | tests/system-kmod-macros.at | 7 | ||||
| -rw-r--r-- | tests/system-traffic.at | 5 | ||||
| -rw-r--r-- | tests/system-userspace-macros.at | 11 |
3 files changed, 22 insertions, 1 deletions
diff --git a/tests/system-kmod-macros.at b/tests/system-kmod-macros.at index 283898f81..9e89aec43 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 f53002f82..870a05efe 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 5d3b8b8e0..a419f30c1 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([:]) +]) |