@@ -9239,9 +9239,9 @@ as hv1 ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys
as hv3 ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys
-# Allow some time for ovn-northd and ovn-controller to catch up.
-# XXX This should be more systematic.
-sleep 2
+dnl Allow some time for ovn-northd and ovn-controller to catch up.
+ovn-nbctl --wait=sb --timeout=3 sync
+ovn-nbctl --wait=hv --timeout=3 sync
echo "---------NB dump-----"
ovn-nbctl show
@@ -9356,6 +9356,9 @@ as hv2 ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys
OVS_WAIT_UNTIL([test 1 = `as hv2 ovs-vsctl show | \
grep "Port patch-br-int-to-ln-alice" | wc -l`])
+dnl Allow some time for ovn-controller to catch up.
+ovn-nbctl --wait=sb --timeout=3 sync
+
# ARP for router IP address from outside1
test_arp 3 1 f00000010204 $outside_ip $rtr_ip 000002010203
The test case "78: ovn -- 1 LR with distributed router gateway port" fails sometimes. This patch fixes this by leveraging the command ovn-nbctl sync The failed test would look like this: <snip> grep "Port patch-br-int-to-ln-alice" | wc -l`... ovn.at:9356: wait succeeded immediately checking packets in hv3/vif1-tx.pcap against hv3-vif1.expected: ovn.at:12: waiting until $PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" $rcv_pcap > $rcv_text rcv_n=`wc -l < "$rcv_text"` echo "rcv_n=$rcv_n exp_n=$exp_n" test $rcv_n -ge $exp_n... rcv_n=0 exp_n=2 rcv_n=0 exp_n=2 rcv_n=1 exp_n=2 rcv_n=1 exp_n=2 rcv_n=1 exp_n=2 rcv_n=1 exp_n=2 rcv_n=2 exp_n=2 ovn.at:12: wait succeeded after 5 seconds ./ovn.at:9367: sort $rcv_text expout 2020-04-17 20:17:08.255531551 +0000 /home/vagrant/ovn/tests/testsuite.dir/at-groups/78/stdout 2020-04-17 20:17:08.258531517 +0000 -1,2 +1,2 -f0000001020400000201020308060001080006040002000002010203ac100101f00000010204ac100103 +ffffffffffff00000201020308060001080006040001000002010203ac100101000000000000ac100101 ffffffffffff00000201020308060001080006040001000002010203ac100101000000000000ac100101 78. ovn.at:9139: 78. ovn -- 1 LR with distributed router gateway port (ovn.at:9139): FAILED (ovn.at:9367) Signed-off-by: Flavio Fernandes <flavio@flaviof.com> --- tests/ovn.at | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)