From patchwork Thu Feb 20 18:59:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 1241631 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=aGUULY/a; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48NkRt1Cfdz9sRf for ; Fri, 21 Feb 2020 06:00:09 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 7A8392152C; Thu, 20 Feb 2020 19:00:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Mm1PuvSiFbmh; Thu, 20 Feb 2020 19:00:06 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by silver.osuosl.org (Postfix) with ESMTP id 9BC782152F; Thu, 20 Feb 2020 19:00:02 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 62586C1D8F; Thu, 20 Feb 2020 19:00:02 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 583BEC013E for ; Thu, 20 Feb 2020 19:00:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 528CC8739D for ; Thu, 20 Feb 2020 19:00:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sPzi-IodbY0H for ; Thu, 20 Feb 2020 19:00:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by hemlock.osuosl.org (Postfix) with ESMTPS id 435A887D6A for ; Thu, 20 Feb 2020 19:00:00 +0000 (UTC) Received: by mail-pg1-f179.google.com with SMTP id y30so2370147pga.13 for ; Thu, 20 Feb 2020 11:00:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xxQzYpsnbD5MsnqJ54dKBdImW/EA7H6ZHzQK2t7nUp0=; b=aGUULY/aqaw9v8qfdEeYZTltP6bvyXY164YnankWkXljN7+i1GJsXZvIhpz6Gmdvxe CU7jKNDvd1pc0r8BRaYNSVH9umASMcXAht1Cz7JdplzTlJe9NLkX2x60xFv5GGenUFB3 5x7rtyivkKstT5JJVEInWsvp2VMmBHwlaUlfAQKTKN3P5pDrRIPp6qylRYHm73HggSpa tCZdyWm3vPGixILHJZKrjfBy78Z+54vgLn4C1dSCCgAnO0ivmm0GS7fesUEm5Mdzn0jX I6uZyDVZgnWDTV/6crNJNwIy19JXDeK6CkahRowD4lzUCUj5bOC6es5vQYdgOk8dSr1c XFVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xxQzYpsnbD5MsnqJ54dKBdImW/EA7H6ZHzQK2t7nUp0=; b=RHNrrCBQQELYJGSX2EF0Jx5RXr5iBep9XdLnnJ7TeE2QadX5qOJ05GnYw3pwFAPQG/ QvtezwUweYekxodYBDI9twhc4N1BlTZZPH1u1oDxsYo31bCXEahnNeNHBvGIv35MCzCQ Qg7td0/qs3wxtDxpuT+ty2xgHrEjr8Ea81ajSu0ioHsjJjYe8YE2MGgKOOWvwrIpb+dh HC6fd03NO41C2JWjDTrJZpVMXcapQc25wjj2rryGbqxn2tKw96DRV+NYjFtaVqL9BKIs gdHFVDbBDzz+n13KOij+xpvoj+qv6St9C6MlsLnsNdhOeUgfAE3d7udQrI5s+6u4U29t fc4Q== X-Gm-Message-State: APjAAAVG8mZoxQLXnioq5qZrOrZ1vR36vEjZCrJ2LDWIBIPafwIZkd1h o8Eltge3EhDsVj2ebilnzorJ2gsV X-Google-Smtp-Source: APXvYqwail3p6+89N2Jucs0EV7Ib/d2CcUCKJhDipF1mOOgytakdMcD5OESgiJE2/tUyNec06sZ0Ow== X-Received: by 2002:aa7:8502:: with SMTP id v2mr32058833pfn.232.1582225199370; Thu, 20 Feb 2020 10:59:59 -0800 (PST) Received: from sc9-mailhost3.vmware.com (c-76-21-95-192.hsd1.ca.comcast.net. [76.21.95.192]) by smtp.gmail.com with ESMTPSA id d14sm324689pfq.117.2020.02.20.10.59.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 20 Feb 2020 10:59:58 -0800 (PST) From: William Tu To: dev@openvswitch.org Date: Thu, 20 Feb 2020 10:59:32 -0800 Message-Id: <1582225172-78476-2-git-send-email-u9012063@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1582225172-78476-1-git-send-email-u9012063@gmail.com> References: <1582225172-78476-1-git-send-email-u9012063@gmail.com> Cc: fbl@sysclose.org, i.maximets@ovn.org Subject: [ovs-dev] [PATCHv2 2/2] tests: Add tests using tap device. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Similar to using veth across namespaces, this patch creates tap devices, assigns to namespaces, and allows traffic to go through different test cases. Signed-off-by: William Tu --- tests/atlocal.in | 3 +++ tests/automake.mk | 1 + tests/system-tap.at | 34 ++++++++++++++++++++++++++++++++++ tests/system-tso-testsuite.at | 1 + 4 files changed, 39 insertions(+) create mode 100644 tests/system-tap.at diff --git a/tests/atlocal.in b/tests/atlocal.in index 1dc7cd5d087a..a49c5047a0a5 100644 --- a/tests/atlocal.in +++ b/tests/atlocal.in @@ -165,6 +165,9 @@ find_command() # Set HAVE_NC find_command nc +# Set HAVE_TUNCTL +find_command tunctl + # Determine correct netcat option to quit on stdin EOF if nc --version 2>&1 | grep -q nmap.org; then # Nmap netcat diff --git a/tests/automake.mk b/tests/automake.mk index b8ddc069417e..b6100399f775 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -158,6 +158,7 @@ SYSTEM_USERSPACE_TESTSUITE_AT = \ SYSTEM_TSO_TESTSUITE_AT = \ tests/system-tso-testsuite.at \ + tests/system-tap.at \ tests/system-tso-macros.at SYSTEM_AFXDP_TESTSUITE_AT = \ diff --git a/tests/system-tap.at b/tests/system-tap.at new file mode 100644 index 000000000000..3b9015a550bb --- /dev/null +++ b/tests/system-tap.at @@ -0,0 +1,34 @@ +AT_SETUP([traffic between namespaces using tap]) +AT_KEYWORDS([http_tap]) +OVS_TRAFFIC_VSWITCHD_START() +AT_SKIP_IF([test $HAVE_TUNCTL = no]) + +AT_CHECK([ovs-ofctl add-flow br0 "actions=normal"]) + +ADD_NAMESPACES(at_ns0, at_ns1) + +AT_CHECK([tunctl -t tap0 1> /dev/null]) +on_exit 'tunctl -d tap0' +AT_CHECK([tunctl -t tap1 1> /dev/null]) +on_exit 'tunctl -d tap1' + +AT_CHECK([ovs-vsctl add-port br0 tap0 -- set int tap0 type=tap]) +AT_CHECK([ovs-vsctl add-port br0 tap1 -- set int tap1 type=tap]) +AT_CHECK([ip link set tap0 netns at_ns0]) +AT_CHECK([ip link set tap1 netns at_ns1]) + +AT_CHECK([ip netns exec at_ns0 ip link set dev tap0 up]) +AT_CHECK([ip netns exec at_ns1 ip link set dev tap1 up]) +AT_CHECK([ip netns exec at_ns0 ip addr add 10.1.1.1/24 dev tap0]) +AT_CHECK([ip netns exec at_ns1 ip addr add 10.1.1.2/24 dev tap1]) + +NS_CHECK_EXEC([at_ns0], [ping -q -c 3 -i 0.3 -w 2 10.1.1.2 | FORMAT_PING], [0], [dnl +3 packets transmitted, 3 received, 0% packet loss, time 0ms +]) + +OVS_START_L7([at_ns1], [http]) +NS_CHECK_EXEC([at_ns0], [wget 10.1.1.2 -t 3 -T 1 --retry-connrefused -v -o wget0.log]) + +OVS_TRAFFIC_VSWITCHD_STOP(["/.*ethtool command ETHTOOL_G.*/d"]) + +AT_CLEANUP diff --git a/tests/system-tso-testsuite.at b/tests/system-tso-testsuite.at index 99d748006a86..594d1a6fde85 100644 --- a/tests/system-tso-testsuite.at +++ b/tests/system-tso-testsuite.at @@ -23,4 +23,5 @@ m4_include([tests/system-common-macros.at]) m4_include([tests/system-userspace-macros.at]) m4_include([tests/system-tso-macros.at]) +m4_include([tests/system-tap.at]) m4_include([tests/system-traffic.at])