[ovs-dev] [patch_v1 3/4] tests: Enable userspace datapath FTP v4.

[Darrell Ball]

Signed-off-by: Darrell Ball <dlu998 at gmail.com>
---
 tests/system-kmod-macros.at      | 10 +++++++---
 tests/system-traffic.at          | 14 +++++++-------
 tests/system-userspace-macros.at | 13 ++++++++++---
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/tests/system-kmod-macros.at b/tests/system-kmod-macros.at
index e1b5707..f1b48bc 100644
--- a/tests/system-kmod-macros.at
+++ b/tests/system-kmod-macros.at
@@ -68,12 +68,16 @@ m4_define([CHECK_CONNTRACK],
     ]
 )
 
-# CHECK_CONNTRACK_ALG()
+# CHECK_CONNTRACK_FTP_V4(), CHECK_CONNTRACK_FTP_V6() and CHECK_CONNTRACK_TFTP()
 #
 # Perform requirements checks for running conntrack ALG tests. The kernel
-# supports ALG, so no check is needed.
+# supports ALGs, so no check is needed.
 #
-m4_define([CHECK_CONNTRACK_ALG])
+m4_define([CHECK_CONNTRACK_FTP_V4])
+
+m4_define([CHECK_CONNTRACK_FTP_V6])
+
+m4_define([CHECK_CONNTRACK_TFTP])
 
 # CHECK_CONNTRACK_FRAG()
 #
diff --git a/tests/system-traffic.at b/tests/system-traffic.at
index 7ccbbdf..9dffc1b 100644
--- a/tests/system-traffic.at
+++ b/tests/system-traffic.at
@@ -2273,7 +2273,7 @@ AT_CLEANUP
 AT_SETUP([conntrack - FTP])
 AT_SKIP_IF([test $HAVE_FTP = no])
 CHECK_CONNTRACK()
-CHECK_CONNTRACK_ALG()
+CHECK_CONNTRACK_FTP_V4()
 OVS_TRAFFIC_VSWITCHD_START()
 
 ADD_NAMESPACES(at_ns0, at_ns1)
@@ -2358,7 +2358,7 @@ AT_CLEANUP
 AT_SETUP([conntrack - FTP over IPv6])
 AT_SKIP_IF([test $HAVE_FTP = no])
 CHECK_CONNTRACK()
-CHECK_CONNTRACK_ALG()
+CHECK_CONNTRACK_FTP_V6()
 OVS_TRAFFIC_VSWITCHD_START()
 
 ADD_NAMESPACES(at_ns0, at_ns1)
@@ -2413,7 +2413,7 @@ AT_CLEANUP
 AT_SETUP([conntrack - FTP with multiple expectations])
 AT_SKIP_IF([test $HAVE_FTP = no])
 CHECK_CONNTRACK()
-CHECK_CONNTRACK_ALG()
+CHECK_CONNTRACK_FTP_V4()
 OVS_TRAFFIC_VSWITCHD_START()
 
 ADD_NAMESPACES(at_ns0, at_ns1)
@@ -2479,7 +2479,7 @@ AT_CLEANUP
 AT_SETUP([conntrack - TFTP])
 AT_SKIP_IF([test $HAVE_TFTP = no])
 CHECK_CONNTRACK()
-CHECK_CONNTRACK_ALG()
+CHECK_CONNTRACK_TFTP()
 OVS_TRAFFIC_VSWITCHD_START()
 
 ADD_NAMESPACES(at_ns0, at_ns1)
@@ -2943,7 +2943,7 @@ m4_define([CHECK_FTP_NAT],
     AT_SKIP_IF([test $HAVE_FTP = no])
     CHECK_CONNTRACK()
     CHECK_CONNTRACK_NAT()
-    CHECK_CONNTRACK_ALG()
+    CHECK_CONNTRACK_FTP_V4()
 
     OVS_TRAFFIC_VSWITCHD_START()
 
@@ -3380,7 +3380,7 @@ AT_SETUP([conntrack - IPv6 FTP with NAT])
 AT_SKIP_IF([test $HAVE_FTP = no])
 CHECK_CONNTRACK()
 CHECK_CONNTRACK_NAT()
-CHECK_CONNTRACK_ALG()
+CHECK_CONNTRACK_FTP_V6()
 
 OVS_TRAFFIC_VSWITCHD_START()
 
@@ -3441,7 +3441,7 @@ AT_SETUP([conntrack - IPv6 FTP with NAT - orig tuple])
 AT_SKIP_IF([test $HAVE_FTP = no])
 CHECK_CONNTRACK()
 CHECK_CONNTRACK_NAT()
-CHECK_CONNTRACK_ALG()
+CHECK_CONNTRACK_FTP_V6()
 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 6e3d468..9baca85 100644
--- a/tests/system-userspace-macros.at
+++ b/tests/system-userspace-macros.at
@@ -66,12 +66,19 @@ m4_define([CHECK_CONNTRACK],
     [AT_SKIP_IF([test $HAVE_PYTHON = no])]
 )
 
-# CHECK_CONNTRACK_ALG()
+# CHECK_CONNTRACK_FTP_V4(), CHECK_CONNTRACK_FTP_V6() and CHECK_CONNTRACK_TFTP()
 #
 # Perform requirements checks for running conntrack ALG tests. The userspace
-# doesn't support ALGs yet, so skip the tests
+# doesn't support V6 FTP and TFTP yet.
 #
-m4_define([CHECK_CONNTRACK_ALG],
+m4_define([CHECK_CONNTRACK_FTP_V4])
+
+m4_define([CHECK_CONNTRACK_FTP_V6],
+[
+    AT_SKIP_IF([:])
+])
+
+m4_define([CHECK_CONNTRACK_TFTP],
 [
     AT_SKIP_IF([:])
 ])
-- 
1.9.1