From patchwork Mon Jun 12 22:28:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 774878 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 3wmp4P0dP7z9s06 for ; Tue, 13 Jun 2017 08:49:41 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 30BB7BC6; Mon, 12 Jun 2017 22:49:39 +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 DA7D3B3F for ; Mon, 12 Jun 2017 22:49:37 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from slow1-d.mail.gandi.net (slow1-d.mail.gandi.net [217.70.178.86]) by smtp1.linuxfoundation.org (Postfix) with ESMTP id 363F91B4 for ; Mon, 12 Jun 2017 22:49:37 +0000 (UTC) Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by slow1-d.mail.gandi.net (Postfix) with ESMTP id 60BAC47AA4E for ; Tue, 13 Jun 2017 00:29:53 +0200 (CEST) Received: from mfilter15-d.gandi.net (mfilter15-d.gandi.net [217.70.178.143]) by relay6-d.mail.gandi.net (Postfix) with ESMTP id C0094FB8A1; Tue, 13 Jun 2017 00:29:52 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter15-d.gandi.net Received: from relay6-d.mail.gandi.net ([IPv6:::ffff:217.70.183.198]) by mfilter15-d.gandi.net (mfilter15-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id ha0V9JOqZlkn; Tue, 13 Jun 2017 00:29:51 +0200 (CEST) X-Originating-IP: 208.91.2.3 Received: from sigabrt.benpfaff.org (unknown [208.91.2.3]) (Authenticated sender: blp@ovn.org) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 5963CFB87D; Tue, 13 Jun 2017 00:29:50 +0200 (CEST) From: Ben Pfaff To: dev@openvswitch.org Date: Mon, 12 Jun 2017 15:28:53 -0700 Message-Id: <20170612222856.14108-29-blp@ovn.org> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170612222856.14108-1-blp@ovn.org> References: <20170612222856.14108-1-blp@ovn.org> X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Ben Pfaff Subject: [ovs-dev] [PATCH 28/31] fixup: Make tests set legacy-l3-pipeline instead of packet-type-aware. 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: Ben Pfaff --- tests/ofproto.at | 4 ++-- tests/system-userspace-packet-type-aware.at | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/ofproto.at b/tests/ofproto.at index dc0a90c873ed..67eeced58ebd 100644 --- a/tests/ofproto.at +++ b/tests/ofproto.at @@ -4195,7 +4195,7 @@ AT_SETUP([ofproto - packet-out with set_field metadata with packet_type PT_IPV4 OVS_VSWITCHD_START AT_CHECK([ - ovs-vsctl set bridge br0 other-config:packet-type-aware=true + ovs-vsctl set bridge br0 other-config:legacy-l3-pipeline=false ], [0]) # Start a monitor listening for packet-ins. @@ -4214,7 +4214,7 @@ ovs-appctl -t ovs-ofctl exit AT_CHECK([sed 's/ (xid=0x[[0-9a-fA-F]]*)//' monitor.log], [0], [dnl OFPT_PACKET_IN (OF1.3): total_len=32 packet_type=(1,0x800),metadata=0xfafafafa5a5a5a5a,in_port=CONTROLLER (via action) data_len=32 (unbuffered) -nw_src=10.0.0.20,nw_dst=10.0.0.30,nw_proto=17,nw_tos=0,nw_ecn=0,nw_ttl=255,tp_src=100,tp_dst=200 udp_csum:ea78 +packet_type=(1,0x800),nw_src=10.0.0.20,nw_dst=10.0.0.30,nw_proto=17,nw_tos=0,nw_ecn=0,nw_ttl=255,tp_src=100,tp_dst=200 udp_csum:ea78 OFPT_BARRIER_REPLY (OF1.3): ]) diff --git a/tests/system-userspace-packet-type-aware.at b/tests/system-userspace-packet-type-aware.at index ec2514cbbde9..8ecde6648b30 100644 --- a/tests/system-userspace-packet-type-aware.at +++ b/tests/system-userspace-packet-type-aware.at @@ -72,7 +72,7 @@ AT_CHECK([ ovs-vsctl add-br br-in1 -- \ set bridge br-in1 datapath_type=netdev fail-mode=standalone ovs-vsctl add-br br-in2 -- \ - set bridge br-in2 datapath_type=netdev fail-mode=standalone other-config:packet-type-aware=true + set bridge br-in2 datapath_type=netdev fail-mode=standalone other-config:legacy-l3-pipeline=true ovs-vsctl add-br br-in3 -- \ set bridge br-in3 datapath_type=netdev fail-mode=standalone ovs-vsctl add-br br-p1 -- \