From patchwork Tue May 30 21:21:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Darrell Ball X-Patchwork-Id: 768808 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wcmmX3L4dz9s7h for ; Wed, 31 May 2017 07:23:08 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EkT5CTd8"; dkim-atps=neutral Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id C4060BFD; Tue, 30 May 2017 21:22:00 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id BF119BAF for ; Tue, 30 May 2017 21:21:57 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 367B1203 for ; Tue, 30 May 2017 21:21:57 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id u26so20533231pfd.2 for ; Tue, 30 May 2017 14:21:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=rlba2XYMXSAoGFo5i759r443yyv7YCJYOZqSnZmWrj4=; b=EkT5CTd84yWszo4wbxR6FZwr43K7u2SeHwyObwlzuEYVSrsULo1S2UzyLSJLjkE8v9 Hc2vRUty/Hms4qfYj83TMhcrElsloeI25R8j/VM+B+gNUcgU0Hbe5EFme8c0OypCOZKa vI9W3uiyZLCOumLkiFUWLm+sC33OZBBv3n6jNTmSH+kDUF9djlezoHc0m1BWc7zwka/T yZVcS5jD+zYbkwdE3s8C08naRQR6xzXUbZBwh2yV9/mvrVGzGjflhXxWo8isKgaAl4NX HKQqOs+ihmYZhWyS0Zo+GFOFeSyhOqIadOaR0fU/E8IqMlYxVW1NggTL5n8/dcZ2QaRS 9/Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=rlba2XYMXSAoGFo5i759r443yyv7YCJYOZqSnZmWrj4=; b=Gxs575RGpFsuRxuJCDQaVzoyZ6I1z+dIzpVOJhsCNtC2gk4931h3Rmhkd4lKjJt3Qd RMGFIPfWKrzoFBoENBjM/GK1Dtosu8JvYVnA7tMp9L6bJLzimKxyte9A3FQI/Seus8dn o7Uv6XkRdlPXlHEtroGcBe6KxYVRyMraOIYZNgd53hfwIeew2zZ1F+9Lr8saLOLdi83g sOcEe7UI4gHvgnJMKsEQ4WTEAZRndN/4MfXX2X/WKNKtlW5kLweaivO/pl9mA3njDstL wN5pJPMwvN/roNlq5g7lRa/mGSJjk5wOt3uu7DlpEGo+FrDOWLM/GJhUkjUvTX3PW/x0 mupA== X-Gm-Message-State: AODbwcDvd1JlEhga0CNI36krD6MXakPP3rjhIUOZp9kF6DqqV/bJuyrR NUyuYNavcwxzNLVq X-Received: by 10.84.217.8 with SMTP id o8mr48381193pli.50.1496179316896; Tue, 30 May 2017 14:21:56 -0700 (PDT) Received: from ubuntu.localdomain (c-73-162-236-45.hsd1.ca.comcast.net. [73.162.236.45]) by smtp.gmail.com with ESMTPSA id b72sm24363925pfd.118.2017.05.30.14.21.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 30 May 2017 14:21:56 -0700 (PDT) From: Darrell Ball To: dlu998@gmail.com, dev@openvswitch.org Date: Tue, 30 May 2017 14:21:35 -0700 Message-Id: <1496179296-14972-4-git-send-email-dlu998@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1496179296-14972-1-git-send-email-dlu998@gmail.com> References: <1496179296-14972-1-git-send-email-dlu998@gmail.com> X-Spam-Status: No, score=-1.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM,UPPERCASE_50_75 autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [patch_v1 3/4] tests: Enable userspace datapath FTP v4. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Signed-off-by: Darrell Ball --- 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([:]) ])