From patchwork Tue Oct 2 13:59:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 977858 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com 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 42Pgm56m3gz9t2b for ; Wed, 3 Oct 2018 00:00:53 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 06ABCD7E; Tue, 2 Oct 2018 13:59:30 +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 2D987BF9 for ; Tue, 2 Oct 2018 13:59:26 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id A919B709 for ; Tue, 2 Oct 2018 13:59:25 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id u12-v6so2364605wrr.4 for ; Tue, 02 Oct 2018 06:59:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=FaGwr+abIPgaXwrmToIHozR/thWZYeSdWQ0C1xRjulI=; b=dqFF3plpmIhboxDyhDo6Owut7gZ93LwLi/2BnAJj2jv1VJFS5MJtITm7r8h0Kap4vC GowFvb+Vk/wuRhV8yZtU4r3LPbX6d1rUT256c5Hs4mSxZ41GvZ0EUotQQAIaMwp74i6z b8qK+5fTKPq76sxxBNrLMfF/bcBVmegw5JSz7LeHg3gSUNLGJuczreoGtMpbsK6Ga2L2 qs+p/grnirV8W959faJm5tDyzz458VA4YTubh51DaK5+zpvTsIx2rTN20hzOCykYf9BE jEQRxCRfkraFP1VAPFErAXsdb7+eUAVecNoAvg+W6ukQyjGUcTXc7G8FFmsPpygI2/Kd foqQ== X-Gm-Message-State: ABuFfohMB5C9LC4J6WqEGnLXBJHA+pdp/SecrL21aDnqEWIKpZgkAZDh 58FHqkBLM+4iI5RLSarJXUBqEOxlCLs= X-Google-Smtp-Source: ACcGV62idKKiNQwBHGjjp9gVySXEHkN95UNpNKjnmzJyFyDkPbfen/HeMSLFIWoD75Fxym0a+E4VoQ== X-Received: by 2002:adf:a547:: with SMTP id j7-v6mr11700787wrb.220.1538488763987; Tue, 02 Oct 2018 06:59:23 -0700 (PDT) Received: from localhost.localdomain.com (nat-pool-mxp-t.redhat.com. [149.6.153.186]) by smtp.gmail.com with ESMTPSA id m2-v6sm11254516wrj.80.2018.10.02.06.59.23 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 Oct 2018 06:59:23 -0700 (PDT) From: Lorenzo Bianconi To: dev@openvswitch.org Date: Tue, 2 Oct 2018 15:59:14 +0200 Message-Id: <15da8c89ab5acef7339923451628e62b266b0491.1538487934.git.lorenzo.bianconi@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,LOTS_OF_MONEY, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH v2 3/3] OVN: fix automatic tests broken by ip-buffering support 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 Fix following automatic tests broken by ip-buffering support since now original ip packets are transmitted by OVN logical router: - ovn -- 3 HVs, 3 LS, 3 lports/LS, 1 LR - ovn -- /32 router IP address Signed-off-by: Lorenzo Bianconi --- tests/ovn.at | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/ovn.at b/tests/ovn.at index e4fcc53b6..943ee96f6 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -2617,6 +2617,11 @@ for is in 1 2 3; do echo $arp >> $id$jd2$kd.expected done done + if test $(vif_to_hv ${is}${js}${ks}) = $(vif_to_hv ${id}${jd}1); then + hmac=8000000000$o4 + rmac=00000000ff$id$jd + echo ${hmac}${rmac}08004500001c00000000"3f1101"00${sip}${dip}0035111100080000 >> ${id}11.expected + fi done done done @@ -8870,8 +8875,6 @@ packet=${dst_mac}${src_mac}08004500001c0000000040110000${src_ip}${dst_ip}0035111 as hv1 ovs-appctl netdev-dummy/receive hv1-vif1 $packet OVS_WAIT_UNTIL([test `ovn-sbctl find mac_binding ip="10.0.0.2" | wc -l` -gt 0]) ovn-nbctl --wait=hv sync -# Send the second packet to reach the destination. -as hv1 ovs-appctl netdev-dummy/receive hv1-vif1 $packet # Packet to Expect at 'alice1' src_mac="000000010204"