From patchwork Sun Jul 16 18:27:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Darrell Ball X-Patchwork-Id: 789103 X-Patchwork-Delegate: joestringer@nicira.com 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 3x9Zf04YMBz9t1m for ; Mon, 17 Jul 2017 04:27:20 +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="Jal/+mJC"; dkim-atps=neutral Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 253125A9; Sun, 16 Jul 2017 18:27:15 +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 AF5275A9 for ; Sun, 16 Jul 2017 18:27:13 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pg0-f67.google.com (mail-pg0-f67.google.com [74.125.83.67]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id B8EEC86 for ; Sun, 16 Jul 2017 18:27:12 +0000 (UTC) Received: by mail-pg0-f67.google.com with SMTP id y129so16829772pgy.3 for ; Sun, 16 Jul 2017 11:27:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=I7mkeMV+V1KTNfclb5MOrMpqALNNGTkZdHoDE4nKrHo=; b=Jal/+mJC8bYzYC1bnN6K/XwJbYiTY4bCF21+VvabmQZ38DtGMfy6xdAgxyXxzzjhvv J26yCFe7A7a5t9P/LptDy6QL6QnCtwT/GslZXyuMxHVHNXUDgshdawvdZqRKzbpdnLcE F1i3nuBi4P5SlezCmulM78ENx3WD/yI74RS3fZ20A4Xujtu6Qei8RuN2ZzDl3ENUoH0g TwikssCa2jrocoqEoGiJwvTSYfATJ+v3OOLVX6H5g0G5HA1A7Y7hDsaMlIGwQ42tPnlE GWTu49l6bzYZCy0ELbyEU4HL+zzju0gnob3+px3UHJscg1AXZ9vYYmpBqu5gjMeROSud LOtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=I7mkeMV+V1KTNfclb5MOrMpqALNNGTkZdHoDE4nKrHo=; b=Ikb9/6aTSUFOEfqXkoOTlp5Gg7BxjUmlrOKmCLJLWdsA14cRnmIKC/wYVyhkTeLSg3 CljxjmoEym7xqJRwba8ymdODFTCI8Gjv34zVAMsF2VIF0lVDGWfee5wwyHpCzTCkffEi dBzT42VphipjBaiwmaCZ5BQPd2qMp1cUytpiOKYpgFIzHbTDTn4Nu4urn6PPVPGjilMR C/Jvk+q3du7f7PDck/eRkGzq6OvSRLd/4y2ujZSKhGzKhXkz3M2XvDAbUv3OaESkTP0w +g169v7FlF45tmEUCdDmaOC5eIsEFR3GHSFZbGOJYAuARRSSUAuWmu3Cju9Lb28s+pp1 enKg== X-Gm-Message-State: AIVw111F8m8AVGwpUgOsaelx2EMgialutGZC0mysLUqtvIxH/Jifv0ju oQqgMsiPW6nEbenA X-Received: by 10.84.238.199 with SMTP id l7mr3983419pln.267.1500229632113; Sun, 16 Jul 2017 11:27:12 -0700 (PDT) Received: from localhost.localdomain (c-73-162-236-45.hsd1.ca.comcast.net. [73.162.236.45]) by smtp.gmail.com with ESMTPSA id x25sm30515413pfi.58.2017.07.16.11.27.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 16 Jul 2017 11:27:11 -0700 (PDT) From: Darrell Ball To: dev@openvswitch.org Date: Sun, 16 Jul 2017 11:27:00 -0700 Message-Id: <1500229621-18299-1-git-send-email-dlu998@gmail.com> X-Mailer: git-send-email 1.9.1 X-Spam-Status: No, score=-1.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [patch_v1 1/2] System Tests: Allow SNAT address variability retries. 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 Three of the SNAT tests allow for wget retries, which occasionally happen. However, these tests did not allow for SNAT address variability for the retries, which is now tolerated. Signed-off-by: Darrell Ball --- tests/system-traffic.at | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/system-traffic.at b/tests/system-traffic.at index b2393f5..1ebf928 100644 --- a/tests/system-traffic.at +++ b/tests/system-traffic.at @@ -2678,7 +2678,7 @@ dnl HTTP requests from p0->p1 should work fine. OVS_START_L7([at_ns1], [http]) NS_CHECK_EXEC([at_ns0], [wget 10.1.1.2 -t 5 -T 1 --retry-connrefused -v -o wget0.log]) -AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2) | sed -e 's/dst=10.1.1.2[[45]][[0-9]]/dst=10.1.1.2XX/'], [0], [dnl +AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2) | sed -e 's/dst=10.1.1.2[[45]][[0-9]]/dst=10.1.1.2XX/' | uniq], [0], [dnl tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=,dport=),reply=(src=10.1.1.2,dst=10.1.1.2XX,sport=,dport=),zone=1,protoinfo=(state=) ]) @@ -2777,7 +2777,7 @@ dnl HTTP requests from p0->p1 should work fine. OVS_START_L7([at_ns1], [http]) NS_CHECK_EXEC([at_ns0], [wget 10.1.1.2 -t 5 -T 1 --retry-connrefused -v -o wget0.log]) -AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2) | sed -e 's/dst=10.1.1.2[[45]][[0-9]]/dst=10.1.1.2XX/'], [0], [dnl +AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2) | sed -e 's/dst=10.1.1.2[[45]][[0-9]]/dst=10.1.1.2XX/' | uniq], [0], [dnl tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=,dport=),reply=(src=10.1.1.2,dst=10.1.1.2XX,sport=,dport=),zone=1,protoinfo=(state=) ]) @@ -2830,7 +2830,7 @@ dnl HTTP requests from p0->p1 should work fine. OVS_START_L7([at_ns1], [http]) NS_CHECK_EXEC([at_ns0], [wget 10.1.1.2 -t 5 -T 1 --retry-connrefused -v -o wget0.log]) -AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2) | sed -e 's/dst=10.1.1.2[[45]][[0-9]]/dst=10.1.1.2XX/'], [0], [dnl +AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2) | sed -e 's/dst=10.1.1.2[[45]][[0-9]]/dst=10.1.1.2XX/' | uniq], [0], [dnl tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=,dport=),reply=(src=10.1.1.2,dst=10.1.1.2XX,sport=,dport=),zone=1,protoinfo=(state=) ])