From patchwork Thu Oct 15 05:38:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Pettit X-Patchwork-Id: 530500 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (li376-54.members.linode.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 82F051402BF for ; Thu, 15 Oct 2015 16:38:18 +1100 (AEDT) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id EAFB510778; Wed, 14 Oct 2015 22:38:16 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e4.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id 57C3210773 for ; Wed, 14 Oct 2015 22:38:15 -0700 (PDT) Received: from bar2.cudamail.com (unknown [192.168.21.12]) by mx1e4.cudamail.com (Postfix) with ESMTPS id D04741E00CF for ; Wed, 14 Oct 2015 23:38:14 -0600 (MDT) X-ASG-Debug-ID: 1444887494-03dc53753a12bb0001-byXFYA Received: from mx1-pf1.cudamail.com ([192.168.24.1]) by bar2.cudamail.com with ESMTP id Z9S3R4wOTBvgP7Rn (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 14 Oct 2015 23:38:14 -0600 (MDT) X-Barracuda-Envelope-From: jpettit@nicira.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.1 Received: from unknown (HELO mail-pa0-f47.google.com) (209.85.220.47) by mx1-pf1.cudamail.com with ESMTPS (RC4-SHA encrypted); 15 Oct 2015 05:38:13 -0000 Received-SPF: unknown (mx1-pf1.cudamail.com: Multiple SPF records returned) X-Barracuda-RBL-Trusted-Forwarder: 209.85.220.47 Received: by pabrc13 with SMTP id rc13so76576131pab.0 for ; Wed, 14 Oct 2015 22:38:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=w/2sesF6v1Gtvfx12b3uc0nz/Vdtm5hvha84R6eFg3U=; b=TSLHwJ25xipsR0efTed+eLLD/aqcVILwambohyb3saRPovuupY/iH3TSFvdtUZzCFa dTCdW/uE4rV6E+k/EFK2XkMXmYcEnyLFXLN/HoWI8KJEZSuPxqoOyOKL4rPuTMh/AvuX N4eG9+ooEaD+z9F85ZCNo5BqO3DQ9ZA29byr7WPvc8jgCDQ5LBWSmJtjwGu2wkQHOQkR 1o8I5Jyg8ls1DyIgsE2mOde/kWPvqu916TZcNHSA/bIlONOMVgYXkuLUDJvI3ApRTz5F towwuB0RtgaJ7cRdotrdDldPXtghUfWiUXb5CFS+BjVDXB40QFz4P6vXx7gzgrNW7xyU udNA== X-Gm-Message-State: ALoCoQn6MPTn70QF89HUAtvXbcWZR5LjXefD7wKUcbTjwbRUARbQ4UDfcLSB2fPBGDp3MV1Gh9mm X-Received: by 10.66.102.65 with SMTP id fm1mr7985802pab.12.1444887493200; Wed, 14 Oct 2015 22:38:13 -0700 (PDT) Received: from localhost.localdomain (c-67-161-8-206.hsd1.ca.comcast.net. [67.161.8.206]) by smtp.gmail.com with ESMTPSA id yz3sm12835381pbb.37.2015.10.14.22.38.12 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 14 Oct 2015 22:38:12 -0700 (PDT) X-CudaMail-Envelope-Sender: jpettit@nicira.com X-Barracuda-Apparent-Source-IP: 67.161.8.206 From: Justin Pettit To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-E1-1013131092 X-CudaMail-DTE: 101415 X-CudaMail-Originating-IP: 209.85.220.47 Date: Wed, 14 Oct 2015 22:38:06 -0700 X-ASG-Orig-Subj: [##CM-E1-1013131092##][PATCH 3/3] ovn.at: Fix tab/space issues. Message-Id: <1444887486-106563-3-git-send-email-jpettit@nicira.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1444887486-106563-1-git-send-email-jpettit@nicira.com> References: <1444887486-106563-1-git-send-email-jpettit@nicira.com> X-Barracuda-Connect: UNKNOWN[192.168.24.1] X-Barracuda-Start-Time: 1444887494 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 3/3] ovn.at: Fix tab/space issues. 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" Signed-off-by: Justin Pettit Acked-by: Ben Pfaff --- tests/ovn.at | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/tests/ovn.at b/tests/ovn.at index 1eb6d0b..b8b9e36 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -521,7 +521,7 @@ for i in 1 2 3; do for j in 1 2 3; do ovs-vsctl add-port br-int vif$i$j -- set Interface vif$i$j external-ids:iface-id=lp$i$j options:tx_pcap=hv$i/vif$i$j-tx.pcap options:rxq_pcap=hv$i/vif$i$j-rx.pcap ofport-request=$i$j ovn-nbctl lport-add lsw0 lp$i$j - if test $j = 1; then + if test $j = 1; then ovn-nbctl lport-set-macs lp$i$j f0:00:00:00:00:$i$j unknown else ovn-nbctl lport-set-macs lp$i$j f0:00:00:00:00:$i$j @@ -594,9 +594,9 @@ for is in 1 2 3; do for js in 1 2 3; do s=$is$js bcast= - unknown= - bacl2= - bacl3= + unknown= + bacl2= + bacl3= for id in 1 2 3; do for jd in 1 2 3; do d=$id$jd @@ -605,14 +605,14 @@ for is in 1 2 3; do test_packet $s f000000000$d f000000000$s $s$d $unicast #1 if test $d != $s && test $js = 1; then - impersonate=$d - else - impersonate= - fi + impersonate=$d + else + impersonate= + fi test_packet $s f000000000$d f00000000055 55$d $impersonate #3 - if test $d != $s && test $s != 11; then acl2=$d; else acl2=; fi - if test $d != $s && test $d != 33; then acl3=$d; else acl3=; fi + if test $d != $s && test $s != 11; then acl2=$d; else acl2=; fi + if test $d != $s && test $d != 33; then acl3=$d; else acl3=; fi test_packet $s f000000000$d f000000000$s 1234 #7, acl1 test_packet $s f000000000$d f000000000$s 1235 $acl2 #7, acl2 test_packet $s f000000000$d f000000000$s 1236 $acl3 #7, acl3 @@ -620,23 +620,23 @@ for is in 1 2 3; do test_packet $s f000000000$d f00000000055 810000091234 #4 test_packet $s f000000000$d 0100000000$s $s$d #5 - if test $d != $s && test $jd = 1; then - unknown="$unknown $d" - fi + if test $d != $s && test $jd = 1; then + unknown="$unknown $d" + fi bcast="$bcast $unicast" bacl2="$bacl2 $acl2" bacl3="$bacl3 $acl3" done done - # Broadcast and multicast. + # Broadcast and multicast. test_packet $s ffffffffffff f000000000$s ${s}ff $bcast #2 test_packet $s 010000000000 f000000000$s ${s}ff $bcast #2 - if test $js = 1; then + if test $js = 1; then bcast_impersonate=$bcast else - bcast_impersonate= - fi + bcast_impersonate= + fi test_packet $s 010000000000 f00000000044 44ff $bcast_impersonate #3 test_packet $s f0000000ffff f000000000$s ${s}66 $unknown #6