From patchwork Fri Sep 3 10:34:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladislav Odintsov X-Patchwork-Id: 1524202 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=UhcDz0MW; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4H1DhY1qwJz9s5R for ; Fri, 3 Sep 2021 20:35:25 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 5E44561564; Fri, 3 Sep 2021 10:35:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id b0ow0_r2r_T1; Fri, 3 Sep 2021 10:35:22 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTPS id ACC3D61551; Fri, 3 Sep 2021 10:35:21 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 87C19C0010; Fri, 3 Sep 2021 10:35:21 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 1875CC0010 for ; Fri, 3 Sep 2021 10:35:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id A73F8407E3 for ; Fri, 3 Sep 2021 10:35:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp2.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id o9XKoYBzCHkn for ; Fri, 3 Sep 2021 10:35:16 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by smtp2.osuosl.org (Postfix) with ESMTPS id 7DC26407D4 for ; Fri, 3 Sep 2021 10:35:16 +0000 (UTC) Received: by mail-ed1-x52a.google.com with SMTP id g22so7325448edy.12 for ; Fri, 03 Sep 2021 03:35:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=efg9Hf5qyLhtmYm1IR1fPVlpkIFf4UZ5aGSq/ZMIyX4=; b=UhcDz0MWBBEdicAPKbJj0rklK4jhaXYSlKhIIbkoOAuFXcJFjPhj98ZI52TfQoXWVe TXpPbcxaWMAy9l7UYYT932pbMxnBFaMotk31HaMnouiHuZvuKdGld5BvekEy8ATft8+a d0M9gCdl1WK1rgHq+1VdNrdbwDMAXv4Xx7Yqzk/e1Rh42zjLU0ceGP0Ni/9EMxHxymnd 3SXNcnxZ0uBmmp1RKZx1y7+iZJkCpKO8A26DJPsTkUB8hocODSJfEMbdT8F9NxhOWlq6 UIAbb6l4fZI9UvcLLA+faeznpnCwf1RT90k1IjWiHXVnMCH0ioTNERTFXl4Kkl64sIiW jejg== 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:mime-version:content-transfer-encoding; bh=efg9Hf5qyLhtmYm1IR1fPVlpkIFf4UZ5aGSq/ZMIyX4=; b=TGdPimShlAwIxyPx5p+iO2wVU6qlfZLUKim+xVgztdWnUSZZ9icaiVDkU6Gabs1yZb JxrvG8+b5Kb/vbRE2kSiaysa4VWkWZrv/rYXvZzT/h1QLjeaixzfpRei8unwANFNk1iJ QmNPbN+7qydh9lFmq3eiEXRLf8J/hiz0kQqsJ61vcTjw+ZDUjN780Y4kICxFoVVgy1Bc NUxkAJiTFVZEC/iHuVQhfijfOB2TxJvB37nA8+0wFiT/3uiE29kTF1LBUGc4e6CJspAf uzMcu6KWY9WGNQ+auVtDFoyERAsjqygidRVW0fjFtphGjIdjeCToe6Bwppppt/DmMIdG yJeA== X-Gm-Message-State: AOAM532AnazBPrcg0lejC+VnAnVS/kb0XFTFzSY9lgaQW1P/m/Q/WBN9 gX2lsoPz1uuC1O8w5Q9pO+Ihq/PShBM= X-Google-Smtp-Source: ABdhPJyuVUek8aWAYf7tU2fyKYs6bFbCQF0g6Wl87J7d52aHScAHLZZA40onAK1AZngV1HAK21yfCQ== X-Received: by 2002:a05:6402:1157:: with SMTP id g23mr3293769edw.90.1630665314557; Fri, 03 Sep 2021 03:35:14 -0700 (PDT) Received: from localhost.localdomain ([85.187.18.127]) by smtp.gmail.com with ESMTPSA id d22sm2609897ejj.47.2021.09.03.03.35.14 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Sep 2021 03:35:14 -0700 (PDT) From: Vladislav Odintsov To: dev@openvswitch.org Date: Fri, 3 Sep 2021 13:34:38 +0300 Message-Id: <20210903103441.33178-4-odivlad@gmail.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210903103441.33178-1-odivlad@gmail.com> References: <20210903103441.33178-1-odivlad@gmail.com> MIME-Version: 1.0 Cc: Vladislav Odintsov Subject: [ovs-dev] [PATCH ovn v2 3/6] tests: remove strict check for table=N for N > 9 X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Previously patch [1] with same summary was submitted, but it was applied lated then a new feature in commit [2] was accepted. There was added a new test, which also checks exact logical flow table number. This commit replaces table=NN with table=?? in those new tests. [1] https://github.com/ovn-org/ovn/commit/e3ae68ed9a1bb231f7b069539693474508f3ed86 [2] https://github.com/ovn-org/ovn/commit/c0085228893e7bf07190fcccf50cf588b028edaa Signed-off-by: Vladislav Odintsov --- tests/ovn-northd.at | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/ovn-northd.at b/tests/ovn-northd.at index 11886b94e..1c0cb7c0e 100644 --- a/tests/ovn-northd.at +++ b/tests/ovn-northd.at @@ -5131,15 +5131,15 @@ wait_row_count nb:Logical_Router_Static_Route 0 check ovn-nbctl --wait=sb lr-route-add lr0 1.0.0.0/24 192.168.0.10 ovn-sbctl dump-flows lr0 > lr0flows -AT_CHECK([grep -e "lr_in_ip_routing.*192.168.0.10" lr0flows |sort], [0], [dnl - table=10(lr_in_ip_routing ), priority=49 , match=(ip4.dst == 1.0.0.0/24), action=(ip.ttl--; reg8[[0..15]] = 0; reg0 = 192.168.0.10; reg1 = 192.168.0.1; eth.src = 00:00:20:20:12:13; outport = "lr0-public"; flags.loopback = 1; next;) +AT_CHECK([grep -e "lr_in_ip_routing.*192.168.0.10" lr0flows | sed 's/table=../table=??/' | sort], [0], [dnl + table=??(lr_in_ip_routing ), priority=49 , match=(ip4.dst == 1.0.0.0/24), action=(ip.ttl--; reg8[[0..15]] = 0; reg0 = 192.168.0.10; reg1 = 192.168.0.1; eth.src = 00:00:20:20:12:13; outport = "lr0-public"; flags.loopback = 1; next;) ]) check ovn-nbctl --wait=sb lr-route-add lr0 2.0.0.0/24 lr0-public ovn-sbctl dump-flows lr0 > lr0flows -AT_CHECK([grep -e "lr_in_ip_routing.*2.0.0.0" lr0flows |sort], [0], [dnl - table=10(lr_in_ip_routing ), priority=49 , match=(ip4.dst == 2.0.0.0/24), action=(ip.ttl--; reg8[[0..15]] = 0; reg0 = ip4.dst; reg1 = 192.168.0.1; eth.src = 00:00:20:20:12:13; outport = "lr0-public"; flags.loopback = 1; next;) +AT_CHECK([grep -e "lr_in_ip_routing.*2.0.0.0" lr0flows | sed 's/table=../table=??/' | sort], [0], [dnl + table=??(lr_in_ip_routing ), priority=49 , match=(ip4.dst == 2.0.0.0/24), action=(ip.ttl--; reg8[[0..15]] = 0; reg0 = ip4.dst; reg1 = 192.168.0.1; eth.src = 00:00:20:20:12:13; outport = "lr0-public"; flags.loopback = 1; next;) ]) AT_CLEANUP