From patchwork Fri Jul 2 00:55:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 1499828 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (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 4GGGpS2Fw4z9sRK for ; Fri, 2 Jul 2021 10:55:28 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 86A1E83D64; Fri, 2 Jul 2021 00:55:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id y0hTFGHqWYzm; Fri, 2 Jul 2021 00:55:24 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id A96D083D4C; Fri, 2 Jul 2021 00:55:23 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id DCC73C0024; Fri, 2 Jul 2021 00:55:21 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 17E96C0010 for ; Fri, 2 Jul 2021 00:55:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 0754760AB2 for ; Fri, 2 Jul 2021 00:55:20 +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 2_vfzSmQYhzL for ; Fri, 2 Jul 2021 00:55:19 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by smtp3.osuosl.org (Postfix) with ESMTPS id 0E5C060AA0 for ; Fri, 2 Jul 2021 00:55:18 +0000 (UTC) Received: (Authenticated sender: blp@ovn.org) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 48D6F1BF204; Fri, 2 Jul 2021 00:55:15 +0000 (UTC) From: Ben Pfaff To: dev@openvswitch.org Date: Thu, 1 Jul 2021 17:55:06 -0700 Message-Id: <20210702005509.1626937-2-blp@ovn.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210702005509.1626937-1-blp@ovn.org> References: <20210702005509.1626937-1-blp@ovn.org> MIME-Version: 1.0 Cc: Ben Pfaff Subject: [ovs-dev] [PATCH ovn 1/4] tests: Fix "vlan traffic for external network with distributed..." 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" This fixes the test case "ovn -- vlan traffic for external network with distributed router gateway port", which often failed, especially under ddlog. The problem was that the test case was setting a column that only ovn-northd is supposed to set. The "tag" column in Logical_Switch_Port is for ovn-northd to report the tag for a logical switch port. It's documented that way in ovn-nb(5): tag: optional integer, in range 1 to 4,095 The VLAN tag allocated by ovn-northd based on the contents of the tag_request column. The right way to request a particular tag is to use tag_request. This commit fixes that. This also fixes the similar problem I found in the test "ovn -- send gratuitous ARP for NAT rules on HA distributed router", even though I hadn't seen similar failures there. Signed-off-by: Ben Pfaff --- tests/ovn.at | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/ovn.at b/tests/ovn.at index db1a0a35c2db..722659739627 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -11375,7 +11375,7 @@ ovn-nbctl lsp-add foo ln-foo ovn-nbctl lsp-set-addresses ln-foo unknown ovn-nbctl lsp-set-options ln-foo network_name=public ovn-nbctl lsp-set-type ln-foo localnet -AT_CHECK([ovn-nbctl set Logical_Switch_Port ln-foo tag=2]) +check ovn-nbctl set Logical_Switch_Port ln-foo tag_request=2 # Create localnet port in alice ovn-nbctl lsp-add alice ln-alice @@ -12783,7 +12783,7 @@ $PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv2/br-phys_n1-tx.pcap | trim_zeros AT_CHECK([grep $garp hv2_br_phys_tx | sort], [0], []) # change localnet port tag. -AT_CHECK([ovn-nbctl set Logical_Switch_Port ln_port tag=2014]) +check ovn-nbctl set Logical_Switch_Port ln_port tag_request=2014 # wait for earlier changes to take effect OVS_WAIT_UNTIL([test 1 = `as hv2 ovs-ofctl dump-flows br-int table=65 | \