That works for me, thanks Jarno. It would be nice for the module to be automatically loaded by the OVS kernel datapath when needed (I believe it happens with nf_conntrack_ftp), but I don't know if there's a way to do that.
Anyway, this fixes a problem, so: Acked-by: Daniele Di Proietto <diproiet...@vmware.com> On 02/12/2015 14:56, "Jarno Rajahalme" <ja...@ovn.org> wrote: >FTP NAT system tests fail if the corresponding modules are not loaded. >Add a probe for nf_nat_ftp module to make sure it is loaded before the >tests. > >Reported-by: Daniele Di Proietto <diproiet...@vmware.com> >Signed-off-by: Jarno Rajahalme <ja...@ovn.org> >--- > tests/system-kmod-macros.at | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > >diff --git a/tests/system-kmod-macros.at b/tests/system-kmod-macros.at >index 7253d2b..3ef38e1 100644 >--- a/tests/system-kmod-macros.at >+++ b/tests/system-kmod-macros.at >@@ -52,7 +52,7 @@ m4_define([OVS_TRAFFIC_VSWITCHD_STOP], > m4_define([CHECK_CONNTRACK], > [AT_SKIP_IF([test $HAVE_CONNTRACK = no]) > AT_SKIP_IF([test $HAVE_PYTHON = no]) >- m4_foreach([mod], [[nf_conntrack_ipv4], [nf_conntrack_ipv6]], >+ m4_foreach([mod], [[nf_conntrack_ipv4], [nf_conntrack_ipv6], >[nf_nat_ftp]], > [modprobe mod || echo "Module mod not loaded." > on_exit 'modprobe -r mod' > ]) >-- >2.1.4 > >_______________________________________________ >dev mailing list >dev@openvswitch.org >https://urldefense.proofpoint.com/v2/url?u=http-3A__openvswitch.org_mailma >n_listinfo_dev&d=BQIGaQ&c=Sqcl0Ez6M0X8aeM67LKIiDJAXVeAw-YihVMNtXt-uEs&r=Sm >B5nZacmXNq0gKCC1s_Cw5yUNjxgD4v5kJqZ2uWLlE&m=GXQJYvw0pkDYZw-DLGP382ejj1ZIGK >_8RmFhbPq-6AA&s=-WsJUPFZJmxizZDFDUTe9FquQol9cdIAaP8ctAQfknE&e= _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
