From patchwork Sat Nov 7 00:10:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarno Rajahalme X-Patchwork-Id: 541192 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (unknown [IPv6:2600:3c00::f03c:91ff:fe6e:bdf7]) by ozlabs.org (Postfix) with ESMTP id DBCD31402D5 for ; Sat, 7 Nov 2015 11:11:22 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=nicira_com.20150623.gappssmtp.com header.i=@nicira_com.20150623.gappssmtp.com header.b=gxYWa3Bh; dkim-atps=neutral Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 3D2EC109C7; Fri, 6 Nov 2015 16:11:08 -0800 (PST) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e3.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id 7FC9B1099C for ; Fri, 6 Nov 2015 16:11:07 -0800 (PST) Received: from bar5.cudamail.com (localhost [127.0.0.1]) by mx1e3.cudamail.com (Postfix) with ESMTPS id 099AF420048 for ; Fri, 6 Nov 2015 17:11:07 -0700 (MST) X-ASG-Debug-ID: 1446855066-09eadd036536b20001-byXFYA Received: from mx1-pf1.cudamail.com ([192.168.24.1]) by bar5.cudamail.com with ESMTP id 0Fr1nAtLC5cu62bb (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 06 Nov 2015 17:11:06 -0700 (MST) X-Barracuda-Envelope-From: jrajahalme@nicira.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.1 Received: from unknown (HELO mail-pa0-f46.google.com) (209.85.220.46) by mx1-pf1.cudamail.com with ESMTPS (RC4-SHA encrypted); 7 Nov 2015 00:11:06 -0000 Received-SPF: unknown (mx1-pf1.cudamail.com: Multiple SPF records returned) X-Barracuda-Apparent-Source-IP: 209.85.220.46 X-Barracuda-RBL-IP: 209.85.220.46 Received: by pabfh17 with SMTP id fh17so137257371pab.0 for ; Fri, 06 Nov 2015 16:11:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nicira_com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=E8FZZiGytllNzaphdO/dyAszNNJd1g/DuQIxOqRvBsU=; b=gxYWa3BhM+/KpFDjesLPCPTMusvWDaXGss3cdfYsXYV+q+ujxVoep5GRa3ZiGHLkOX GfbQBfZEeTwnmZGA1z4sLyPS88kg+AvgdvZk9PsRYNqT9dsb1zKyowucJuw5DvfcS8YC IvBurF3vVlOzf9L88FF8C29tFsnEkT6Gablx6ULSUSJM1VRwBWpjGMcwVMBW8KPvG0uK Kaz0ZoEmpZgVa1inei1HUU1cUeXFMy9vVQGgyw4p385i+4a3cs+KWgCuLaJMtiUreEaX oPvVgQLQIuWVFlWZqFJFRbYoN7OEh4Uwt+KhrL2jDim0US1z8H4NvhVyPcwYyGrNb6+s ubPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=E8FZZiGytllNzaphdO/dyAszNNJd1g/DuQIxOqRvBsU=; b=VE7MG+jDEQ8FTGwvt/IPIhOTELaU2LQv+jFXQ0hJvqlyBlOJqbqloBRg90xKB0a7/I pkKy8e0d/D1Z0v1tUWiv5ypvl9fGPtsd6ujbrMYpQjlMRMcBg/UdLopNhUCEP8nNO/CO mEcPFgNbYz4rXBy/IrZHALUyRBml97bpudi05wAl2+GvbJAPMt4QSeXIUPrwru/5XK5l e3DSIRmE4ZW17J5VHKlr4GHQlOvPcdJxZc4Dj71hIz69RvQkHFL2ChjyHAIQc9Dr6aN5 FkApUfwdQ2xTpl3ecZYZAhabEoHSF9gTNsdGYUme6jUaG02Ortga5eYJHJpoeNG8NnOr 2GLQ== X-Gm-Message-State: ALoCoQkFpxVVEyHpyBQ9LTSis/jYBflVqInsFH2WWTCvTbKtwXiY0tTIcSa2RLjy6kP7jLCl4bRD X-Received: by 10.66.160.35 with SMTP id xh3mr21513184pab.22.1446855065808; Fri, 06 Nov 2015 16:11:05 -0800 (PST) Received: from sc9-mailhost1.vmware.com ([208.91.1.34]) by smtp.gmail.com with ESMTPSA id kj3sm2137013pbc.59.2015.11.06.16.11.05 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 06 Nov 2015 16:11:05 -0800 (PST) X-CudaMail-Envelope-Sender: jrajahalme@nicira.com From: Jarno Rajahalme To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-E1-1105094742 X-CudaMail-DTE: 110615 X-CudaMail-Originating-IP: 209.85.220.46 Date: Fri, 6 Nov 2015 16:10:50 -0800 X-ASG-Orig-Subj: [##CM-E1-1105094742##][PATCH v2 3/8] system-tests: Make bridge creation more consistent. Message-Id: <1446855055-38378-4-git-send-email-jrajahalme@nicira.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1446855055-38378-1-git-send-email-jrajahalme@nicira.com> References: <1446855055-38378-1-git-send-email-jrajahalme@nicira.com> X-Barracuda-Connect: UNKNOWN[192.168.24.1] X-Barracuda-Start-Time: 1446855066 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Subject: [ovs-dev] [PATCH v2 3/8] system-tests: Make bridge creation more consistent. X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" Create all bridges with the same set of supported OpenFlow protocols and fail-safe-mode secure, so that each test explicitly specifies flow handling. Signed-off-by: Jarno Rajahalme Acked-by: Ben Pfaff --- tests/system-kmod-macros.at | 6 +-- tests/system-traffic.at | 105 +++++++++++++++++---------------------- tests/system-userspace-macros.at | 6 +-- 3 files changed, 51 insertions(+), 66 deletions(-) diff --git a/tests/system-kmod-macros.at b/tests/system-kmod-macros.at index a48e8d9..7253d2b 100644 --- a/tests/system-kmod-macros.at +++ b/tests/system-kmod-macros.at @@ -1,8 +1,8 @@ # _ADD_BR([name]) # # Expands into the proper ovs-vsctl commands to create a bridge with the -# appropriate type -m4_define([_ADD_BR], [[add-br $1]]) +# appropriate type and properties +m4_define([_ADD_BR], [[add-br $1 -- set Bridge $1 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure ]]) # OVS_TRAFFIC_VSWITCHD_START([vsctl-args], [vsctl-output], [=override]) # @@ -24,7 +24,7 @@ m4_define([OVS_TRAFFIC_VSWITCHD_START], on_exit 'ovs-dpctl del-dp ovs-system' _OVS_VSWITCHD_START([]) dnl Add bridges, ports, etc. - AT_CHECK([ovs-vsctl -- _ADD_BR([br0]) -- set bridge br0 protocols=[[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15]] fail-mode=secure -- $1 m4_if([$2], [], [], [| ${PERL} $srcdir/uuidfilt.pl])], [0], [$2]) + AT_CHECK([ovs-vsctl -- _ADD_BR([br0]) -- $1 m4_if([$2], [], [], [| ${PERL} $srcdir/uuidfilt.pl])], [0], [$2]) ]) # OVS_TRAFFIC_VSWITCHD_STOP([WHITELIST], [extra_cmds]) diff --git a/tests/system-traffic.at b/tests/system-traffic.at index 3b2de83..ab05b51 100644 --- a/tests/system-traffic.at +++ b/tests/system-traffic.at @@ -1,8 +1,9 @@ AT_BANNER([datapath-sanity]) AT_SETUP([datapath - ping between two ports]) -OVS_TRAFFIC_VSWITCHD_START( - [set-fail-mode br0 standalone -- ]) +OVS_TRAFFIC_VSWITCHD_START() + +AT_CHECK([ovs-ofctl add-flow br0 "actions=normal"]) ADD_NAMESPACES(at_ns0, at_ns1) @@ -23,8 +24,9 @@ OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP AT_SETUP([datapath - ping between two ports on vlan]) -OVS_TRAFFIC_VSWITCHD_START( - [set-fail-mode br0 standalone -- ]) +OVS_TRAFFIC_VSWITCHD_START() + +AT_CHECK([ovs-ofctl add-flow br0 "actions=normal"]) ADD_NAMESPACES(at_ns0, at_ns1) @@ -48,8 +50,9 @@ OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP AT_SETUP([datapath - ping6 between two ports]) -OVS_TRAFFIC_VSWITCHD_START( - [set-fail-mode br0 standalone -- ]) +OVS_TRAFFIC_VSWITCHD_START() + +AT_CHECK([ovs-ofctl add-flow br0 "actions=normal"]) ADD_NAMESPACES(at_ns0, at_ns1) @@ -74,8 +77,9 @@ OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP AT_SETUP([datapath - ping6 between two ports on vlan]) -OVS_TRAFFIC_VSWITCHD_START( - [set-fail-mode br0 standalone -- ]) +OVS_TRAFFIC_VSWITCHD_START() + +AT_CHECK([ovs-ofctl add-flow br0 "actions=normal"]) ADD_NAMESPACES(at_ns0, at_ns1) @@ -105,9 +109,12 @@ AT_CLEANUP AT_SETUP([datapath - ping over vxlan tunnel]) AT_SKIP_IF([! ip link add foo type vxlan help 2>&1 | grep dstport >/dev/null]) -OVS_TRAFFIC_VSWITCHD_START( - [set-fail-mode br0 standalone -- ]) -ADD_BR([br-underlay], [set-fail-mode br-underlay standalone]) +OVS_TRAFFIC_VSWITCHD_START() +ADD_BR([br-underlay]) + +AT_CHECK([ovs-ofctl add-flow br0 "actions=normal"]) +AT_CHECK([ovs-ofctl add-flow br-underlay "actions=normal"]) + ADD_NAMESPACES(at_ns0) dnl Set up underlay link from host into the namespace using veth pair. @@ -142,8 +149,7 @@ AT_CLEANUP AT_SETUP([conntrack - controller]) CHECK_CONNTRACK() -OVS_TRAFFIC_VSWITCHD_START( - [set-fail-mode br0 standalone -- ]) +OVS_TRAFFIC_VSWITCHD_START() ADD_NAMESPACES(at_ns0, at_ns1) @@ -186,8 +192,7 @@ AT_CLEANUP AT_SETUP([conntrack - IPv4 HTTP]) CHECK_CONNTRACK() -OVS_TRAFFIC_VSWITCHD_START( - [set-fail-mode br0 standalone -- ]) +OVS_TRAFFIC_VSWITCHD_START() ADD_NAMESPACES(at_ns0, at_ns1) @@ -227,8 +232,7 @@ AT_CLEANUP AT_SETUP([conntrack - IPv6 HTTP]) CHECK_CONNTRACK() -OVS_TRAFFIC_VSWITCHD_START( - [set-fail-mode br0 standalone -- ]) +OVS_TRAFFIC_VSWITCHD_START() ADD_NAMESPACES(at_ns0, at_ns1) @@ -265,8 +269,7 @@ AT_CLEANUP AT_SETUP([conntrack - commit, recirc]) CHECK_CONNTRACK() -OVS_TRAFFIC_VSWITCHD_START( - [set-fail-mode br0 standalone -- ]) +OVS_TRAFFIC_VSWITCHD_START() ADD_NAMESPACES(at_ns0, at_ns1, at_ns2, at_ns3) @@ -306,8 +309,7 @@ AT_CLEANUP AT_SETUP([conntrack - preserve registers]) CHECK_CONNTRACK() -OVS_TRAFFIC_VSWITCHD_START( - [set-fail-mode br0 standalone -- ]) +OVS_TRAFFIC_VSWITCHD_START() ADD_NAMESPACES(at_ns0, at_ns1, at_ns2, at_ns3) @@ -347,8 +349,7 @@ AT_CLEANUP AT_SETUP([conntrack - invalid]) CHECK_CONNTRACK() -OVS_TRAFFIC_VSWITCHD_START( - [set-fail-mode br0 standalone -- ]) +OVS_TRAFFIC_VSWITCHD_START() ADD_NAMESPACES(at_ns0, at_ns1, at_ns2, at_ns3) @@ -391,8 +392,7 @@ AT_CLEANUP AT_SETUP([conntrack - zones]) CHECK_CONNTRACK() -OVS_TRAFFIC_VSWITCHD_START( - [set-fail-mode br0 standalone -- ]) +OVS_TRAFFIC_VSWITCHD_START() ADD_NAMESPACES(at_ns0, at_ns1, at_ns2, at_ns3) @@ -439,8 +439,7 @@ AT_CLEANUP AT_SETUP([conntrack - zones from field]) CHECK_CONNTRACK() -OVS_TRAFFIC_VSWITCHD_START( - [set-fail-mode br0 standalone -- ]) +OVS_TRAFFIC_VSWITCHD_START() ADD_NAMESPACES(at_ns0, at_ns1, at_ns2, at_ns3) @@ -487,8 +486,7 @@ AT_CLEANUP AT_SETUP([conntrack - multiple bridges]) CHECK_CONNTRACK() OVS_TRAFFIC_VSWITCHD_START( - [set-fail-mode br0 standalone --\ - add-br br1 --\ + [_ADD_BR([br1]) --\ add-port br0 patch+ -- set int patch+ type=patch options:peer=patch- --\ add-port br1 patch- -- set int patch- type=patch options:peer=patch+ --]) @@ -531,8 +529,7 @@ AT_CLEANUP AT_SETUP([conntrack - multiple zones]) CHECK_CONNTRACK() -OVS_TRAFFIC_VSWITCHD_START( - [set-fail-mode br0 standalone -- ]) +OVS_TRAFFIC_VSWITCHD_START() ADD_NAMESPACES(at_ns0, at_ns1) @@ -568,8 +565,7 @@ AT_CLEANUP AT_SETUP([conntrack - multiple zones, local]) CHECK_CONNTRACK() -OVS_TRAFFIC_VSWITCHD_START( - [set-fail-mode br0 secure -- ]) +OVS_TRAFFIC_VSWITCHD_START() ADD_NAMESPACES(at_ns0) @@ -616,8 +612,7 @@ AT_CLEANUP AT_SETUP([conntrack - multi-stage pipeline, local]) CHECK_CONNTRACK() -OVS_TRAFFIC_VSWITCHD_START( - [set-fail-mode br0 secure -- ]) +OVS_TRAFFIC_VSWITCHD_START() ADD_NAMESPACES(at_ns0) @@ -686,8 +681,7 @@ AT_CLEANUP AT_SETUP([conntrack - ct_mark]) CHECK_CONNTRACK() -OVS_TRAFFIC_VSWITCHD_START( - [set-fail-mode br0 standalone -- ]) +OVS_TRAFFIC_VSWITCHD_START() ADD_NAMESPACES(at_ns0, at_ns1, at_ns2, at_ns3) @@ -734,8 +728,7 @@ AT_CLEANUP AT_SETUP([conntrack - ct_mark from register]) CHECK_CONNTRACK() -OVS_TRAFFIC_VSWITCHD_START( - [set-fail-mode br0 standalone -- ]) +OVS_TRAFFIC_VSWITCHD_START() ADD_NAMESPACES(at_ns0, at_ns1, at_ns2, at_ns3) @@ -781,8 +774,7 @@ AT_CLEANUP AT_SETUP([conntrack - ct_label]) CHECK_CONNTRACK() -OVS_TRAFFIC_VSWITCHD_START( - [set-fail-mode br0 standalone -- ]) +OVS_TRAFFIC_VSWITCHD_START() ADD_NAMESPACES(at_ns0, at_ns1, at_ns2, at_ns3) @@ -821,8 +813,7 @@ AT_CLEANUP AT_SETUP([conntrack - ICMP related]) CHECK_CONNTRACK() -OVS_TRAFFIC_VSWITCHD_START( - [set-fail-mode br0 secure -- ]) +OVS_TRAFFIC_VSWITCHD_START() ADD_NAMESPACES(at_ns0, at_ns1) @@ -858,8 +849,7 @@ AT_CLEANUP AT_SETUP([conntrack - ICMP related 2]) CHECK_CONNTRACK() -OVS_TRAFFIC_VSWITCHD_START( - [set-fail-mode br0 standalone -- ]) +OVS_TRAFFIC_VSWITCHD_START() ADD_NAMESPACES(at_ns0, at_ns1) @@ -904,8 +894,7 @@ AT_CLEANUP AT_SETUP([conntrack - FTP]) AT_SKIP_IF([test $HAVE_PYFTPDLIB = no]) CHECK_CONNTRACK() -OVS_TRAFFIC_VSWITCHD_START( - [set-fail-mode br0 standalone -- ]) +OVS_TRAFFIC_VSWITCHD_START() ADD_NAMESPACES(at_ns0, at_ns1) @@ -987,8 +976,7 @@ AT_CLEANUP AT_SETUP([conntrack - FTP with multiple expectations]) AT_SKIP_IF([test $HAVE_PYFTPDLIB = no]) CHECK_CONNTRACK() -OVS_TRAFFIC_VSWITCHD_START( - [set-fail-mode br0 standalone -- ]) +OVS_TRAFFIC_VSWITCHD_START() ADD_NAMESPACES(at_ns0, at_ns1) @@ -1048,8 +1036,7 @@ AT_CLEANUP AT_SETUP([conntrack - IPv4 fragmentation ]) CHECK_CONNTRACK() -OVS_TRAFFIC_VSWITCHD_START( - [set-fail-mode br0 secure -- ]) +OVS_TRAFFIC_VSWITCHD_START() ADD_NAMESPACES(at_ns0, at_ns1) @@ -1087,8 +1074,7 @@ AT_CLEANUP AT_SETUP([conntrack - IPv4 fragmentation + vlan]) CHECK_CONNTRACK() -OVS_TRAFFIC_VSWITCHD_START( - [set-fail-mode br0 secure -- ]) +OVS_TRAFFIC_VSWITCHD_START() ADD_NAMESPACES(at_ns0, at_ns1) @@ -1128,8 +1114,7 @@ AT_CLEANUP AT_SETUP([conntrack - IPv6 fragmentation]) CHECK_CONNTRACK() -OVS_TRAFFIC_VSWITCHD_START( - [set-fail-mode br0 secure -- ]) +OVS_TRAFFIC_VSWITCHD_START() ADD_NAMESPACES(at_ns0, at_ns1) @@ -1172,8 +1157,7 @@ AT_CLEANUP AT_SETUP([conntrack - IPv6 fragmentation + vlan]) CHECK_CONNTRACK() -OVS_TRAFFIC_VSWITCHD_START( - [set-fail-mode br0 secure -- ]) +OVS_TRAFFIC_VSWITCHD_START() ADD_NAMESPACES(at_ns0, at_ns1) @@ -1221,9 +1205,10 @@ AT_SETUP([conntrack - Fragmentation over vxlan]) AT_SKIP_IF([! ip link help 2>&1 | grep vxlan >/dev/null]) CHECK_CONNTRACK() -OVS_TRAFFIC_VSWITCHD_START( - [set-fail-mode br0 standalone --]) -ADD_BR([br-underlay], [set-fail-mode br-underlay standalone]) +OVS_TRAFFIC_VSWITCHD_START() +ADD_BR([br-underlay]) +AT_CHECK([ovs-ofctl add-flow br-underlay "actions=normal"]) + ADD_NAMESPACES(at_ns0) dnl Sending ping through conntrack diff --git a/tests/system-userspace-macros.at b/tests/system-userspace-macros.at index 16256cb..565a7a0 100644 --- a/tests/system-userspace-macros.at +++ b/tests/system-userspace-macros.at @@ -1,8 +1,8 @@ # _ADD_BR([name]) # # Expands into the proper ovs-vsctl commands to create a bridge with the -# appropriate type -m4_define([_ADD_BR], [[add-br $1 -- set Bridge $1 datapath_type="netdev" ]]) +# appropriate type and properties +m4_define([_ADD_BR], [[add-br $1 -- set Bridge $1 datapath_type="netdev" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure ]]) # OVS_TRAFFIC_VSWITCHD_START([vsctl-args], [vsctl-output], [=override]) # @@ -16,7 +16,7 @@ m4_define([OVS_TRAFFIC_VSWITCHD_START], [ _OVS_VSWITCHD_START([--disable-system]) dnl Add bridges, ports, etc. - AT_CHECK([ovs-vsctl -- _ADD_BR([br0]) -- set bridge br0 protocols=[[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15]] fail-mode=secure -- $1 m4_if([$2], [], [], [| ${PERL} $srcdir/uuidfilt.pl])], [0], [$2]) + AT_CHECK([ovs-vsctl -- _ADD_BR([br0]) -- $1 m4_if([$2], [], [], [| ${PERL} $srcdir/uuidfilt.pl])], [0], [$2]) ]) # OVS_TRAFFIC_VSWITCHD_STOP([WHITELIST], [extra_cmds])