From patchwork Mon Jun 12 22:28:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 774881 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 3wmp6P35YBz9s06 for ; Tue, 13 Jun 2017 08:51:25 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 81E86CAF; Mon, 12 Jun 2017 22:50:12 +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 9FD71C7C for ; Mon, 12 Jun 2017 22:50:11 +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 079A2FD for ; Mon, 12 Jun 2017 22:50:10 +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 76A9147AA79 for ; Tue, 13 Jun 2017 00:29:56 +0200 (CEST) Received: from mfilter18-d.gandi.net (mfilter18-d.gandi.net [217.70.178.146]) by relay6-d.mail.gandi.net (Postfix) with ESMTP id D2898FB89F; Tue, 13 Jun 2017 00:29:55 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter18-d.gandi.net Received: from relay6-d.mail.gandi.net ([IPv6:::ffff:217.70.183.198]) by mfilter18-d.gandi.net (mfilter18-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id vyghJ37E3WPL; Tue, 13 Jun 2017 00:29:54 +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 63921FB8A1; Tue, 13 Jun 2017 00:29:53 +0200 (CEST) From: Ben Pfaff To: dev@openvswitch.org Date: Mon, 12 Jun 2017 15:28:55 -0700 Message-Id: <20170612222856.14108-31-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 30/31] fixup: Update test expected results. 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 The code now suppresses the default packet_type. Signed-off-by: Ben Pfaff --- tests/ofp-print.at | 12 ++++++------ tests/ofproto.at | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/ofp-print.at b/tests/ofp-print.at index fc444f62bf4c..a00e3f3fe74b 100644 --- a/tests/ofp-print.at +++ b/tests/ofp-print.at @@ -731,7 +731,7 @@ b9 7c c0 a8 00 02 c0 a8 00 01 00 00 2b 60 00 00 \ 00 00 6a 4f 2b 58 50 14 00 00 6d 75 00 00 00 00 \ 00 00 00 00 \ "], [0], [dnl -OFPT_PACKET_OUT (xid=0x0): packet_type=(0,0),in_port=1 actions=output:3 buffer=0x00000114 +OFPT_PACKET_OUT (xid=0x0): in_port=1 actions=output:3 buffer=0x00000114 ]) AT_CLEANUP @@ -745,7 +745,7 @@ b9 7c c0 a8 00 02 c0 a8 00 01 00 00 2b 60 00 00 \ 00 00 6a 4f 2b 58 50 14 00 00 6d 75 00 00 00 00 \ 00 00 00 00 \ "], [0], [dnl -OFPT_PACKET_OUT (xid=0x0): packet_type=(0,0),in_port=1 actions=output:3 data_len=60 +OFPT_PACKET_OUT (xid=0x0): in_port=1 actions=output:3 data_len=60 tcp,vlan_tci=0x0000,dl_src=50:54:00:00:00:06,dl_dst=50:54:00:00:00:05,nw_src=192.168.0.2,nw_dst=192.168.0.1,nw_tos=0,nw_ecn=0,nw_ttl=64,tp_src=0,tp_dst=11104,tcp_flags=rst|ack tcp_csum:6d75 ]) AT_CLEANUP @@ -760,7 +760,7 @@ b9 7c c0 a8 00 02 c0 a8 00 01 00 00 2b 60 00 00 \ 00 00 6a 4f 2b 58 50 14 00 00 6d 75 00 00 00 00 \ 00 00 00 00 \ " 3], [0], [dnl -OFPT_PACKET_OUT (xid=0x0): packet_type=(0,0),in_port=1 actions=output:3 data_len=60 +OFPT_PACKET_OUT (xid=0x0): in_port=1 actions=output:3 data_len=60 tcp,vlan_tci=0x0000,dl_src=50:54:00:00:00:06,dl_dst=50:54:00:00:00:05,nw_src=192.168.0.2,nw_dst=192.168.0.1,nw_tos=0,nw_ecn=0,nw_ttl=64,tp_src=0,tp_dst=11104,tcp_flags=rst|ack tcp_csum:6d75 00000000 50 54 00 00 00 05 50 54-00 00 00 06 08 00 45 00 00000010 00 28 00 00 40 00 40 06-b9 7c c0 a8 00 02 c0 a8 @@ -776,7 +776,7 @@ AT_CHECK([ovs-ofctl ofp-print "\ 00 10 00 00 00 00 00 00 00 00 00 10 ff ff ff fb \ 05 dc 00 00 00 00 00 00 \ "], [0], [dnl -OFPT_PACKET_OUT (OF1.2) (xid=0x8858dfc5): packet_type=(0,0),in_port=LOCAL actions=FLOOD buffer=0xffffff00 +OFPT_PACKET_OUT (OF1.2) (xid=0x8858dfc5): in_port=LOCAL actions=FLOOD buffer=0xffffff00 ]) AT_CLEANUP @@ -791,7 +791,7 @@ b9 7c c0 a8 00 02 c0 a8 00 01 00 00 2b 60 00 00 \ 00 00 6a 4f 2b 58 50 14 00 00 6d 75 00 00 00 00 \ 00 00 00 00 \ "], [0], [dnl -OFPT_PACKET_OUT (OF1.2) (xid=0x8858dfc5): packet_type=(0,0),in_port=LOCAL actions=FLOOD data_len=60 +OFPT_PACKET_OUT (OF1.2) (xid=0x8858dfc5): in_port=LOCAL actions=FLOOD data_len=60 tcp,vlan_tci=0x0000,dl_src=50:54:00:00:00:06,dl_dst=50:54:00:00:00:05,nw_src=192.168.0.2,nw_dst=192.168.0.1,nw_tos=0,nw_ecn=0,nw_ttl=64,tp_src=0,tp_dst=11104,tcp_flags=rst|ack tcp_csum:6d75 ]) AT_CLEANUP @@ -3670,7 +3670,7 @@ b9 7c c0 a8 00 02 c0 a8 00 01 00 00 2b 60 00 00 \ "], [0], [dnl OFPT_BUNDLE_ADD_MESSAGE (OF1.4) (xid=0x3): bundle_id=0x1 flags=atomic -OFPT_PACKET_OUT (OF1.4) (xid=0x3): packet_type=(0,0),in_port=LOCAL actions=FLOOD data_len=60 +OFPT_PACKET_OUT (OF1.4) (xid=0x3): in_port=LOCAL actions=FLOOD data_len=60 tcp,vlan_tci=0x0000,dl_src=50:54:00:00:00:06,dl_dst=50:54:00:00:00:05,nw_src=192.168.0.2,nw_dst=192.168.0.1,nw_tos=0,nw_ecn=0,nw_ttl=64,tp_src=0,tp_dst=11104,tcp_flags=rst|ack tcp_csum:6d75 ]) AT_CLEANUP diff --git a/tests/ofproto.at b/tests/ofproto.at index 67eeced58ebd..3dd5cbea0063 100644 --- a/tests/ofproto.at +++ b/tests/ofproto.at @@ -2141,7 +2141,7 @@ packet-out in_port=6, packet=0001020304050010203040501234 actions=table packet-out in_port=6, packet=0001020304050010203040501234 actions=group:2 ]) AT_CHECK([ovs-ofctl bundle br0 bundle.txt 2>&1 | sed '/talking to/,$d' | strip_xids], [], [dnl -Error OFPBAC_BAD_OUT_GROUP for: OFPT_PACKET_OUT (OF1.4): packet_type=(0,0),in_port=6 actions=group:2 data_len=14 +Error OFPBAC_BAD_OUT_GROUP for: OFPT_PACKET_OUT (OF1.4): in_port=6 actions=group:2 data_len=14 vlan_tci=0x0000,dl_src=00:10:20:30:40:50,dl_dst=00:01:02:03:04:05,dl_type=0x1234 Error OFPBFC_MSG_FAILED for: OFPT_BUNDLE_CONTROL (OF1.4): bundle_id=0 type=COMMIT_REQUEST flags=atomic ordered