From patchwork Fri Oct 2 21:32:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas F Herbert X-Patchwork-Id: 525818 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 1BD021402D5 for ; Sat, 3 Oct 2015 07:33:13 +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=H9EkWYSM; dkim-atps=neutral Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 775A222C4C2; Fri, 2 Oct 2015 14:33:08 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx3v1.cudamail.com (mx3.cudamail.com [64.34.241.5]) by archives.nicira.com (Postfix) with ESMTPS id 71AAB22C4C2 for ; Fri, 2 Oct 2015 14:33:07 -0700 (PDT) Received: from bar3.cudamail.com (bar1 [192.168.15.1]) by mx3v1.cudamail.com (Postfix) with ESMTP id 7547F618BA5 for ; Fri, 2 Oct 2015 15:33:06 -0600 (MDT) X-ASG-Debug-ID: 1443821585-03dd7b65e033760001-byXFYA Received: from mx3-pf2.cudamail.com ([192.168.14.1]) by bar3.cudamail.com with ESMTP id xstCHY83CDCNMPSM (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 02 Oct 2015 15:33:05 -0600 (MDT) X-Barracuda-Envelope-From: thomasfherbert@gmail.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.1 Received: from unknown (HELO mail-qk0-f174.google.com) (209.85.220.174) by mx3-pf2.cudamail.com with ESMTPS (RC4-SHA encrypted); 2 Oct 2015 21:32:57 -0000 Received-SPF: pass (mx3-pf2.cudamail.com: SPF record at _netblocks.google.com designates 209.85.220.174 as permitted sender) X-Barracuda-Apparent-Source-IP: 209.85.220.174 X-Barracuda-RBL-IP: 209.85.220.174 Received: by qkas79 with SMTP id s79so48517105qka.0 for ; Fri, 02 Oct 2015 14:32:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GzDhwrAGdHHqsduyXr1IVEoYdZpxQR7rX87lmab19uY=; b=H9EkWYSMczpGv6rjK1aKjsBv84VxBE/N5HZvy1Ny+2kvAjCGZxfuLwUTsHCntKv+nv zt73QecwPgZ9EKZUV9cJERRzn7ahaBrsX9Z2ZdQAaNu6dECt3e3+rkrCNyHpuJxlhOMh OuX5faQYrq4ARpnMP7D/QgV5F8aLl/kL727tn+25+JjGmC+Y7fY1W7xSSbVLEZLxV2Db CjpZVr4dIS568wYd5BT1DY9q28u9uqfDdhLstWrdo9UTGhv0mK27OaG37As2bYoBMaYh wTWGnjyTwoBiWgw6kKwQIehxTSr01ic+ICmELhShMpT2FWg0TrkK/Eg9YS4Ewf7kC/pu Z9CA== X-Received: by 10.55.198.11 with SMTP id b11mr22715437qkj.53.1443821577047; Fri, 02 Oct 2015 14:32:57 -0700 (PDT) Received: from localhost.localdomain (pool-173-53-26-105.rcmdva.fios.verizon.net. [173.53.26.105]) by smtp.gmail.com with ESMTPSA id 139sm5428928qhh.43.2015.10.02.14.32.55 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Oct 2015 14:32:56 -0700 (PDT) X-CudaMail-Envelope-Sender: thomasfherbert@gmail.com From: Thomas F Herbert To: dev@openvswitch.org, pshelar@nicira.com X-CudaMail-MID: CM-V2-1001057231 X-CudaMail-DTE: 100215 X-CudaMail-Originating-IP: 209.85.220.174 Date: Fri, 2 Oct 2015 17:32:01 -0400 X-ASG-Orig-Subj: [##CM-V2-1001057231##][PATCH V14 4/4] Test push and pop of vlan with both 802.1AD and 802.1Q Message-Id: <1443821521-14770-5-git-send-email-thomasfherbert@gmail.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1443821521-14770-1-git-send-email-thomasfherbert@gmail.com> References: <1443821521-14770-1-git-send-email-thomasfherbert@gmail.com> X-GBUdb-Analysis: 0, 209.85.220.174, Ugly c=0.369283 p=-0.222222 Source Normal X-MessageSniffer-Rules: 0-0-0-7052-c X-Barracuda-Connect: UNKNOWN[192.168.14.1] X-Barracuda-Start-Time: 1443821585 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.60 X-Barracuda-Spam-Status: No, SCORE=0.60 using per-user scores of TAG_LEVEL=3.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=3.0 tests=BSF_SC5_MJ1963, DKIM_SIGNED, RDNS_NONE X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.23130 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 DKIM_SIGNED Domain Keys Identified Mail: message has a signature 0.10 RDNS_NONE Delivered to trusted network by a host with no rDNS 0.50 BSF_SC5_MJ1963 Custom Rule MJ1963 Cc: therbert@redhat.com Subject: [ovs-dev] [PATCH V14 4/4] Test push and pop of vlan with both 802.1AD and 802.1Q 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" From: "Thomas F. Herbert" This patch adds tests of the user space actions for 802.1q and 802.1ad. Signed-off-by: Thomas F Herbert Signed-off-by: Dave Benson --- tests/ofproto-dpif.at | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at index 121f84d..784977a 100644 --- a/tests/ofproto-dpif.at +++ b/tests/ofproto-dpif.at @@ -1542,6 +1542,46 @@ NXST_FLOW reply: OVS_VSWITCHD_STOP AT_CLEANUP +AT_SETUP([ofproto-dpif - VLAN with 802.1AD Ethertype]) +OVS_VSWITCHD_START +ADD_OF_PORTS([br0], [1], [2], [3], [4]) + +AT_DATA([flows1.txt], [dnl +table=0 in_port=1 dl_type=0x8100 actions=pop_vlan,output:2 +table=0 in_port=1 dl_type=0x88a8 actions=pop_vlan,output:3 +]) +AT_CHECK([ovs-ofctl add-flows br0 flows1.txt]) +AT_DATA([flows2.txt], [dnl +table=0 in_port=2 dl_type=0x0800 actions=push_vlan:0x8100,mod_vlan_vid:9,output:1 +table=0 in_port=3 dl_type=0x0800 actions=push_vlan:0x88a8,set_field:0x1006->vlan_tci,output:1 +table=0 in_port=4 dl_type=0x0800 actions=push_vlan:0x88a8,mod_vlan_vid:11,output:1 +]) +AT_CHECK([ovs-ofctl -O OpenFlow11 add-flows br0 flows2.txt]) + +AT_CHECK([ovs-appctl ofproto/trace br0 'in_port=1,dl_dst=ff:ff:ff:ff:ff:ff,dl_type=0x8100,dl_vlan=9'], [0], [stdout]) +AT_CHECK([tail -1 stdout], [0], + [Datapath actions: pop_vlan,2 +]) +AT_CHECK([ovs-appctl ofproto/trace br0 'in_port=1,dl_dst=ff:ff:ff:ff:ff:ff,dl_type=0x88a8,dl_vlan=9'], [0], [stdout]) +AT_CHECK([tail -1 stdout], [0], + [Datapath actions: pop_vlan,3 +]) +AT_CHECK([ovs-appctl ofproto/trace br0 'in_port=2,dl_dst=ff:ff:ff:ff:ff:ff,dl_type=0x0800'], [0], [stdout]) +AT_CHECK([tail -1 stdout], [0], + [Datapath actions: push_vlan(vid=9,pcp=0),1 +]) +AT_CHECK([ovs-appctl ofproto/trace br0 'in_port=3,dl_dst=ff:ff:ff:ff:ff:ff,dl_type=0x0800'], [0], [stdout]) +AT_CHECK([tail -1 stdout], [0], + [Datapath actions: push_vlan(tpid=0x88a8,vid=6,pcp=0),1 +]) +AT_CHECK([ovs-appctl ofproto/trace br0 'in_port=4,dl_dst=ff:ff:ff:ff:ff:ff,dl_type=0x0800'], [0], [stdout]) +AT_CHECK([tail -1 stdout], [0], + [Datapath actions: push_vlan(tpid=0x88a8,vid=11,pcp=0),1 +]) + +OVS_VSWITCHD_STOP +AT_CLEANUP + AT_SETUP([ofproto-dpif - MPLS handling]) OVS_VSWITCHD_START([dnl add-port br0 p1 -- set Interface p1 type=dummy