diff mbox series

[ovs-dev,1/4] tests: Fix "vlan traffic for external network with distributed..."

Message ID 20210702005509.1626937-2-blp@ovn.org
State Accepted
Headers show
Series Fix test "ovn -- vlan traffic for external network with distributed router gateway port" | expand

Checks

Context Check Description
ovsrobot/apply-robot success apply and check: success
ovsrobot/github-robot success github build: passed

Commit Message

Ben Pfaff July 2, 2021, 12:55 a.m. UTC
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 <blp@ovn.org>
---
 tests/ovn.at | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

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 | \