The replacement accidentally removed a couple of --wait conditions,
this would cause some tests to become flaky. Add them back, also
remove stray conflict marker.
Fixes: a999668e0f31 ("tests: Replace router and localnet port definitions with
the helper commands.")
Signed-off-by: Ales Musil <[email protected]>
---
tests/ovn-nbctl.at | 1 -
tests/ovn-northd.at | 16 ++++++++--------
tests/ovn.at | 10 +++++-----
3 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/tests/ovn-nbctl.at b/tests/ovn-nbctl.at
index 64f87b1fa..955b90c21 100644
--- a/tests/ovn-nbctl.at
+++ b/tests/ovn-nbctl.at
@@ -3336,7 +3336,6 @@ AT_CHECK([ovn-nbctl nf-del nf2])
AT_CHECK([ovn-nbctl nf-list | uuidfilt], [0], [])
])
-<<<<<<< HEAD
AT_SETUP([ovn-nbctl - TLS server name indication (SNI) with --ssl-server-name])
AT_KEYWORDS([ovn-nbctl ssl tls sni client])
AT_SKIP_IF([test "$HAVE_OPENSSL" = no])
diff --git a/tests/ovn-northd.at b/tests/ovn-northd.at
index b01cf3e95..477064241 100644
--- a/tests/ovn-northd.at
+++ b/tests/ovn-northd.at
@@ -228,7 +228,7 @@ check ovn-nbctl lr-add R1
check ovn-nbctl lrp-add R1 R1-S1 02:ac:10:01:00:01 172.16.1.1/24
check ovn-nbctl ls-add S1
-check ovn-nbctl lsp-add-router-port S1 S1-R1 R1-S1
+check ovn-nbctl --wait=sb lsp-add-router-port S1 S1-R1 R1-S1
AT_CHECK([test x`ovn-nbctl lsp-get-up S1-R1` = xup])
AT_CLEANUP
@@ -244,7 +244,7 @@ check_uuid ovn-nbctl create Logical_Router name=R1
options:chassis=gw1
check ovn-nbctl lrp-add R1 R1-S1 02:ac:10:01:00:01 172.16.1.1/24
check ovn-nbctl ls-add S1
-check ovn-nbctl lsp-add-router-port S1 S1-R1 R1-S1
+check ovn-nbctl --wait=sb lsp-add-router-port S1 S1-R1 R1-S1
check ovn-sbctl lsp-bind S1-R1 gw1
AT_CHECK([test x`ovn-nbctl lsp-get-up S1-R1` = xup])
@@ -263,7 +263,7 @@ check ovn-nbctl lrp-add R1 R1-S1 02:ac:10:01:00:01
172.16.1.1/24
check ovn-nbctl lrp-set-gateway-chassis R1-S1 gw1
check ovn-nbctl ls-add S1
-check ovn-nbctl lsp-add-router-port S1 S1-R1 R1-S1
+check ovn-nbctl --wait=sb lsp-add-router-port S1 S1-R1 R1-S1
AT_CHECK([test x`ovn-nbctl lsp-get-up S1-R1` = xup])
AT_CLEANUP
@@ -610,7 +610,7 @@ check ovn-sbctl chassis-add comp2 geneve 127.0.0.6
check ovn-sbctl chassis-add cadd1 geneve 127.0.0.7
check ovn-nbctl lrp-add lr0 lr0-sw0 00:00:20:20:12:14 10.0.0.1/24
-check ovn-nbctl lsp-add-router-port sw0 sw0-lr0 lr0-sw0
+check ovn-nbctl --wait=sb lsp-add-router-port sw0 sw0-lr0 lr0-sw0
check ovn-sbctl lsp-bind sw0-p1 comp1
wait_row_count nb:Logical_Switch_Port 1 name=sw0-p1 up=true
@@ -641,7 +641,7 @@ wait_column "$comp2_ch_uuid" HA_Chassis_Group ref_chassis
check ovn-nbctl ls-add sw1
check ovn-nbctl lsp-add sw1 sw1-p1
check ovn-nbctl lrp-add lr1 lr1-sw1 00:00:20:20:12:15 20.0.0.1/24
-check ovn-nbctl lsp-add-router-port sw1 sw1-lr1 lr1-sw1
+check ovn-nbctl --wait=sb lsp-add-router-port sw1 sw1-lr1 lr1-sw1
# Bind sw1-p1 in comp1.
check ovn-sbctl lsp-bind sw1-p1 comp1
@@ -653,7 +653,7 @@ wait_column "$comp2_ch_uuid" HA_Chassis_Group ref_chassis
# Now attach sw0 to lr1
check ovn-nbctl lrp-add lr1 lr1-sw0 00:00:20:20:12:16 10.0.0.10/24
-check ovn-nbctl lsp-add-router-port sw0 sw0-lr1 lr1-sw0
+check ovn-nbctl --wait=sb lsp-add-router-port sw0 sw0-lr1 lr1-sw0
# Both comp1 and comp2 should be in 'ref_chassis' as sw1 is indirectly
# connected to lr0
@@ -12051,7 +12051,7 @@ check ovn-nbctl lrp-set-gateway-chassis R1-S1 gw1
# Add a external network connected to R1
check ovn-nbctl ls-add S1
-check ovn-nbctl lsp-add-router-port S1 S1-R1 R1-S1
+check ovn-nbctl --wait=sb lsp-add-router-port S1 S1-R1 R1-S1
AT_CHECK([test x`ovn-nbctl lsp-get-up S1-R1` = xup])
# Add a external network vif
@@ -12861,7 +12861,7 @@ check ovn-nbctl ls-add sw0
check ovn-nbctl lr-add lr0
check ovn-nbctl lsp-add sw0 sw0-p1 -- lsp-set-addresses sw0-p1
"00:00:20:20:00:03 10.0.0.3"
check ovn-nbctl lrp-add lr0 lr0-sw0 00:00:20:20:12:14 10.0.0.1/24
-check ovn-nbctl lsp-add-router-port sw0 sw0-lr0 lr0-sw0
+check ovn-nbctl --wait=sb lsp-add-router-port sw0 sw0-lr0 lr0-sw0
check as northd ovn-appctl -t ovn-northd inc-engine/clear-stats
# This should not result in recomputes.
diff --git a/tests/ovn.at b/tests/ovn.at
index abf0ef43a..393b5e8b3 100644
--- a/tests/ovn.at
+++ b/tests/ovn.at
@@ -9828,7 +9828,7 @@ AT_CHECK([ovs-vsctl set Open_vSwitch .
external-ids:ovn-bridge-mappings=physnet1
AT_CHECK([ovs-vsctl add-port br-eth0 snoopvif -- set Interface snoopvif
options:tx_pcap=hv1/snoopvif-tx.pcap options:rxq_pcap=hv1/snoopvif-rx.pcap])
# Create a localnet port.
-AT_CHECK([ovn-nbctl lsp-add-localnet-port ls0 ln_port physnet1])
+AT_CHECK([ovn-nbctl --wait=hv lsp-add-localnet-port ls0 ln_port physnet1])
# Wait until the patch ports are created in hv1 to connect br-int to br-eth0
OVS_WAIT_UNTIL([test 1 = `as hv1 ovs-vsctl show | \
@@ -9887,7 +9887,7 @@ check ovn-nbctl lsp-add ls0 ls0-lr0 -- set
Logical_Switch_Port ls0-lr0 \
type=router options:router-port=lr0-ls0 addresses='"f0:00:00:00:00:01"'
# Create a localnet port.
-check ovn-nbctl lsp-add-localnet-port ls0 ln_port physnet1
+check ovn-nbctl --wait=hv lsp-add-localnet-port ls0 ln_port physnet1
# Prepare packets
touch empty_expected
@@ -13056,7 +13056,7 @@ ovn_attach n1 br-phys 192.168.1.3
# Initially test with no bridge-mapping on hv3
# Create a localnet port.
-AT_CHECK([ovn-nbctl lsp-add-localnet-port ls0 ln_port physnet1])
+AT_CHECK([ovn-nbctl --wait=hv lsp-add-localnet-port ls0 ln_port physnet1])
# Expect no packets when hv2 bridge-mapping is not present
: > packets
@@ -21053,7 +21053,7 @@ grep controller | grep tp_src=546 | grep \
])
# Add the localnet port to the logical switch ls1
-check ovn-nbctl lsp-add-localnet-port ls1 ln-public phys
+check ovn-nbctl --wait=hv lsp-add-localnet-port ls1 ln-public phys
ln_public_key=$(fetch_column Port_Binding tunnel_key logical_port=ln-public)
@@ -40706,7 +40706,7 @@ check ovn-nbctl lsp-set-addresses vm1
"f0:00:0f:01:02:04 10.0.0.4 1000::4"
check ovn-nbctl lr-add lr0
check ovn-nbctl lrp-add lr0 lr0-sw0 fa:16:3e:00:00:01 10.0.0.1 1000::1/64
-check ovn-nbctl lsp-add-router-port sw0 sw0-lr0 lr0-sw0
+check ovn-nbctl --wait=hv lsp-add-router-port sw0 sw0-lr0 lr0-sw0
net_add n1
sim_add hv
--
2.51.0
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
