From patchwork Fri Aug 19 04:44:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gurucharan Shetty X-Patchwork-Id: 660895 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (archives.nicira.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 3sG5Q412fwz9t0X for ; Sat, 20 Aug 2016 00:46:35 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 0D9D210B39; Fri, 19 Aug 2016 07:46:34 -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 8E51B10AFC for ; Fri, 19 Aug 2016 07:46:32 -0700 (PDT) Received: from bar5.cudamail.com (unknown [192.168.21.12]) by mx1e4.cudamail.com (Postfix) with ESMTPS id E30F71E00AC for ; Fri, 19 Aug 2016 08:46:31 -0600 (MDT) X-ASG-Debug-ID: 1471617991-09eadd61b105f30001-byXFYA Received: from mx1-pf1.cudamail.com ([192.168.24.1]) by bar5.cudamail.com with ESMTP id 11DeoreX1hEDbD6S (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Fri, 19 Aug 2016 08:46:31 -0600 (MDT) X-Barracuda-Envelope-From: guru.ovn@gmail.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.1 Received: from unknown (HELO mail-pf0-f194.google.com) (209.85.192.194) by mx1-pf1.cudamail.com with ESMTPS (AES128-SHA encrypted); 19 Aug 2016 14:46:31 -0000 Received-SPF: pass (mx1-pf1.cudamail.com: SPF record at _netblocks.google.com designates 209.85.192.194 as permitted sender) X-Barracuda-Apparent-Source-IP: 209.85.192.194 X-Barracuda-RBL-IP: 209.85.192.194 Received: by mail-pf0-f194.google.com with SMTP id y134so1583446pfg.3 for ; Fri, 19 Aug 2016 07:46:31 -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:cc:subject:date:message-id; bh=q5XZuMotk5nx3gOMR01t2dMUhws+qpngWSRJxzYVNrM=; b=cwZhVU3Zq27HcPjb/mzo4Rs3MbKLh3/cf1wRWQM1aE53XONQM4rdk7SuQOBcXgPmQa T7Jb4WkAS7A6nk7V+ovUwyFd+Ukni7RkKlS4KSwMO+UdLlxE/rSk1EcyjugkoRjz4PbH nUtfgfvSL/fZfsnPsE0yTdVorrnECzAtAPpB9vzN7TrqXT6rhZkdRa8yCi6rIjKGpeR7 Sy/tWBNhNYsn6RaoQ58TewGsXBCJO99uXOChwyUF9STfvL2qX/SimWEpB3yiaJ6Rx2QQ 2nqAMhQuhr/XR9B9DciG2g1y4Pnjz1+V54WPR2DK0/I/XGld3uePoDJRRVe+PUIGZAP+ C1gQ== X-Gm-Message-State: AEkoouv1Ue5sBX7ddHTOzHMV7D6JTWLpGgSEf4ud4azJ7qdzjWHYKP1WoMLMh1CuB0/HWw== X-Received: by 10.98.133.10 with SMTP id u10mr14778970pfd.134.1471617990145; Fri, 19 Aug 2016 07:46:30 -0700 (PDT) Received: from ubuntu.eng.vmware.com ([208.91.1.34]) by smtp.gmail.com with ESMTPSA id y9sm12232927pay.25.2016.08.19.07.46.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 19 Aug 2016 07:46:28 -0700 (PDT) X-CudaMail-Envelope-Sender: guru.ovn@gmail.com From: Gurucharan Shetty To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-E1-818022675 X-CudaMail-DTE: 081916 X-CudaMail-Originating-IP: 209.85.192.194 Date: Thu, 18 Aug 2016 21:44:56 -0700 X-ASG-Orig-Subj: [##CM-E1-818022675##][PATCH v2] system-ovn.at: Fix occasional test failures. Message-Id: <1471581896-10755-1-git-send-email-guru@ovn.org> X-Mailer: git-send-email 1.9.1 X-Barracuda-Connect: UNKNOWN[192.168.24.1] X-Barracuda-Start-Time: 1471617991 X-Barracuda-Encrypted: ECDHE-RSA-AES256-GCM-SHA384 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] system-ovn.at: Fix occasional test failures. 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" A run of the NAT unit tests hundred times showed some occasional unit test failures. With this commit, I haven't seen any failures for 100 runs. Reported-by: Joe Stringer Signed-off-by: Gurucharan Shetty --- tests/system-ovn.at | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/system-ovn.at b/tests/system-ovn.at index 09a5b6b..e267384 100755 --- a/tests/system-ovn.at +++ b/tests/system-ovn.at @@ -166,7 +166,8 @@ as northd OVS_APP_EXIT_AND_WAIT([ovn-northd]) as -OVS_TRAFFIC_VSWITCHD_STOP(["/failed to query port patch-.*/d"]) +OVS_TRAFFIC_VSWITCHD_STOP(["/failed to query port patch-.*/d +/connection dropped.*/d"]) AT_CLEANUP AT_SETUP([ovn -- 2 LRs connected via LS, gateway router, easy SNAT]) @@ -247,6 +248,8 @@ ovn-nbctl lsp-add alice alice1 \ ovn-nbctl -- --id=@nat create nat type="snat" logical_ip=192.168.1.2 \ external_ip=172.16.1.1 -- add logical_router R2 nat @nat +OVS_WAIT_UNTIL([ovs-ofctl dump-flows br-int | grep ct\( | grep nat]) + # South-North SNAT: 'foo1' pings 'alice1'. But 'alice1' receives traffic # from 172.16.1.1 NS_CHECK_EXEC([foo1], [ping -q -c 3 -i 0.3 -w 2 172.16.1.2 | FORMAT_PING], \ @@ -272,7 +275,8 @@ as northd OVS_APP_EXIT_AND_WAIT([ovn-northd]) as -OVS_TRAFFIC_VSWITCHD_STOP(["/failed to query port patch-.*/d"]) +OVS_TRAFFIC_VSWITCHD_STOP(["/failed to query port patch-.*/d +/connection dropped.*/d"]) AT_CLEANUP AT_SETUP([ovn -- load-balancing])