From patchwork Tue Jul 18 14:55:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miguel Angel Ajo X-Patchwork-Id: 790339 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=) 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 3xBjtz0CWJz9ryr for ; Wed, 19 Jul 2017 00:57:31 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id BF957A73; Tue, 18 Jul 2017 14:55:18 +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 C0932970 for ; Tue, 18 Jul 2017 14:55:16 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-lf0-f54.google.com (mail-lf0-f54.google.com [209.85.215.54]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 31E6E152 for ; Tue, 18 Jul 2017 14:55:16 +0000 (UTC) Received: by mail-lf0-f54.google.com with SMTP id z78so16397766lff.0 for ; Tue, 18 Jul 2017 07:55:16 -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:cc:subject:date:message-id:in-reply-to :references; bh=u0N8ActtxEvCilWZ4jQydB5NDapaheyrSlj1kMzhDpo=; b=pDIuAp0sawtsj5IjYDsWucRqjPwRYAkZbhSmlRLpUT76zMYMJL54SMrS8rtqBB5UxK mi4y/psv7wXmpHF7ZBOK/awdRAN0ryYUnh20D9T0cuQsfvt+4cpCRuuTw46wIAo37zlx CEgeSJeuWjBEF9Z1axVnb6k4ZLgTi3FwlJS0FiWBnUSQ0ZXh6b1/nbzRkEcdeKX/6wjP syLYSOo2iefnq9bS8M5jVD1De9rgNzf1YN1Kmp/IScY6aHxWlHjslzunlVpX6kn4sn4y Oc8x2uQjzgzsd1G+ZbQqcIyA3pBD+2AwQWPdOoMpFpDfeAM2Kz4VlhHJ+T4TwqPjpr2V bhBA== X-Gm-Message-State: AIVw111Kg3KT6VKcJhFY83X7S/nB/uj2+a/ts/4W8D1oWVgUXOrviN8g n/QPjdYlWHVvYWTLEWQS3Q== X-Received: by 10.28.213.205 with SMTP id m196mr2313175wmg.109.1500389714312; Tue, 18 Jul 2017 07:55:14 -0700 (PDT) Received: from gw2.localdomain (111.148.134.37.dynamic.jazztel.es. [37.134.148.111]) by smtp.gmail.com with ESMTPSA id m26sm3535501wrm.4.2017.07.18.07.55.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Jul 2017 07:55:13 -0700 (PDT) From: Miguel Angel Ajo To: dev@openvswitch.org Date: Tue, 18 Jul 2017 14:55:02 +0000 Message-Id: <1500389703-5928-3-git-send-email-majopela@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1500389703-5928-1-git-send-email-majopela@redhat.com> References: <1500389703-5928-1-git-send-email-majopela@redhat.com> X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00, 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 Cc: Miguel Angel Ajo Subject: [ovs-dev] [PATCH v1 3/4] ovn: l3ha make packet checks more robust by filtering 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 We're now filtering out packets that we don't care about before comparing with expected data. Also, we're less strict on the number of gARPs we expect to receive by using uniq filter, and looking for just one (or none where it should be none). Signed-off-by: Miguel Angel Ajo --- tests/ovn.at | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/tests/ovn.at b/tests/ovn.at index d8b8693..229755c 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -8034,18 +8034,22 @@ trim_zeros() { sed 's/\(00\)\{1,\}$//' } +only_broadcast_from_lrp1() { + grep "fffffffffffff00000000001" +} + garp="fffffffffffff0000000000108060001080006040001f00000000001c0a80064000000000000c0a80064" -echo $garp >> expout -echo $garp >> expout -$PYTHON "$top_srcdir/utilities/ovs-pcap.in" hv1/snoopvif-tx.pcap | trim_zeros > hv1_snoop_tx +echo $garp > expout + +$PYTHON "$top_srcdir/utilities/ovs-pcap.in" hv1/snoopvif-tx.pcap | trim_zeros | only_broadcast_from_lrp1 | uniq > hv1_snoop_tx echo "packets on hv1-snoopvif:" cat hv1_snoop_tx AT_CHECK([sort hv1_snoop_tx], [0], [expout]) -$PYTHON "$top_srcdir/utilities/ovs-pcap.in" hv2/br-phys_n1-tx.pcap | trim_zeros > hv2_br_phys_tx +$PYTHON "$top_srcdir/utilities/ovs-pcap.in" hv2/br-phys_n1-tx.pcap | trim_zeros | only_broadcast_from_lrp1 | uniq > hv2_br_phys_tx echo "packets on hv2 br-phys tx" cat hv2_br_phys_tx AT_CHECK([grep $garp hv2_br_phys_tx | sort], [0], [expout]) -$PYTHON "$top_srcdir/utilities/ovs-pcap.in" hv3/br-phys_n1-tx.pcap | trim_zeros > hv3_br_phys_tx +$PYTHON "$top_srcdir/utilities/ovs-pcap.in" hv3/br-phys_n1-tx.pcap | trim_zeros | only_broadcast_from_lrp1 | uniq > hv3_br_phys_tx echo "packets on hv3 br-phys tx" cat hv3_br_phys_tx AT_CHECK([grep $garp hv3_br_phys_tx | sort], [0], []) @@ -8071,11 +8075,11 @@ trim_zeros() { sed 's/\(00\)\{1,\}$//' } -$PYTHON "$top_srcdir/utilities/ovs-pcap.in" hv1/snoopvif-tx.pcap | trim_zeros > hv1_snoopvif_tx +$PYTHON "$top_srcdir/utilities/ovs-pcap.in" hv1/snoopvif-tx.pcap | trim_zeros | only_broadcast_from_lrp1 | uniq > hv1_snoopvif_tx AT_CHECK([sort hv1_snoopvif_tx], [0], [expout]) -$PYTHON "$top_srcdir/utilities/ovs-pcap.in" hv3/br-phys_n1-tx.pcap | trim_zeros > hv3_br_phys_tx +$PYTHON "$top_srcdir/utilities/ovs-pcap.in" hv3/br-phys_n1-tx.pcap | trim_zeros | only_broadcast_from_lrp1 | uniq > hv3_br_phys_tx AT_CHECK([grep $garp hv3_br_phys_tx | sort], [0], [expout]) -$PYTHON "$top_srcdir/utilities/ovs-pcap.in" hv2/br-phys_n1-tx.pcap | trim_zeros > hv2_br_phys_tx +$PYTHON "$top_srcdir/utilities/ovs-pcap.in" hv2/br-phys_n1-tx.pcap | trim_zeros | only_broadcast_from_lrp1 | uniq > hv2_br_phys_tx AT_CHECK([grep $garp hv2_br_phys_tx | sort], [0], []) OVN_CLEANUP([hv1],[hv2],[hv3])