> I don't think the parentheses are necessary around "ct-tuple". > > I've attached an incremental patch to this message. Can you take a look? If > you agree with the changes, I'll commit this patch and the first from this > series. > > Thanks, > > --Justin
Thanks for the review. I think all the comments are valuable, I fold them in v3. As you mentioned in the review comment on the second patch, I will pull out the second patch first, and re-submit it separately once I fix the conntrack expectation issue. Moreover, since the userspace datapath does not support flush by ct-tuple for now, I add a macro to skip the system traffic test on the userspace datapath. The diff after fold in your comments are as following. Thanks, -Yi-Hung =========================================== diff --git a/tests/system-kmod-macros.at b/tests/system-kmod-macros.at index a7c6808ad1b4..34db21a564ae 100644 --- a/tests/system-kmod-macros.at +++ b/tests/system-kmod-macros.at @@ -96,3 +96,11 @@ m4_define([CHECK_CONNTRACK_LOCAL_STACK]) # always supports NAT, so no check is needed. # m4_define([CHECK_CONNTRACK_NAT]) + +# CHECK_CT_DPIF_FLUSH_BY_CT_TUPLE() +# +# Perform requirements checks for running ovs-dpctl flush-conntrack by +# conntrack 5-tuple test. The kernel datapath does support this +# feature. Will remove this check after both kernel and userspace datapath +# support it. +m4_define([CHECK_CT_DPIF_FLUSH_BY_CT_TUPLE]) diff --git a/tests/system-traffic.at b/tests/system-traffic.at index 4c638118d234..56aae69538cf 100644 --- a/tests/system-traffic.at +++ b/tests/system-traffic.at @@ -834,6 +834,7 @@ AT_CLEANUP AT_SETUP([conntrack - ct flush by 5-tuple]) CHECK_CONNTRACK() +CHECK_CT_DPIF_FLUSH_BY_CT_TUPLE() OVS_TRAFFIC_VSWITCHD_START() ADD_NAMESPACES(at_ns0, at_ns1) diff --git a/tests/system-userspace-macros.at b/tests/system-userspace-macros.at index d3d27bb2b8f2..f22061298985 100644 --- a/tests/system-userspace-macros.at +++ b/tests/system-userspace-macros.at @@ -99,3 +99,13 @@ m4_define([CHECK_CONNTRACK_LOCAL_STACK], # datapath supports NAT. # m4_define([CHECK_CONNTRACK_NAT]) + +# CHECK_CT_DPIF_FLUSH_BY_CT_TUPLE() +# +# Perform requirements checks for running ovs-dpctl flush-conntrack by +# conntrack 5-tuple test. The userspace datapath does not support +# this feature yet. +m4_define([CHECK_CT_DPIF_FLUSH_BY_CT_TUPLE], +[ + AT_SKIP_IF([:]) +]) =========================================== _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
