From b8b8e4bd6477a99e3e6cf5debcb4dfae270113d3 Mon Sep 17 00:00:00 2001 From: Xavier Simonart Date: Fri, 3 Nov 2023 14:42:57 +0100 Subject: [PATCH] tests: fixed race_condition with max_prefix The following tests: - ipam - ipam connectivity - ipam to non-ipam set the mac_prefix using nbctl. However, it can happen that both northd and nbctl sets the mac_prefix at the same time, which might result in the mac_prefix from nbctl to be dropped. Signed-off-by: Xavier Simonart Signed-off-by: Dumitru Ceara (cherry picked from commit 0cd5dd1c884749aabe2dbdc2fb19aa14cc25c2b3) --- tests/ovn.at | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/ovn.at b/tests/ovn.at index d45919c144..3863ab0811 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -8232,6 +8232,7 @@ check_dynamic_addresses() { check_row_count nb:Logical_Switch_Port 1 name="$1" dynamic_addresses="$arg" } +check ovn-nbctl --wait=sb sync # Add a port to a switch that does not have a subnet set, then set the # subnet which should result in an address being allocated for the port. ovn-nbctl --wait=hv set NB_Global . options:mac_prefix="0a:00:00:00:00:00" @@ -8547,7 +8548,7 @@ OVN_FOR_EACH_NORTHD([ AT_SETUP([ipam connectivity]) ovn_start -ovn-nbctl lr-add R1 +ovn-nbctl --wait=sb lr-add R1 # Test for a ping using dynamically allocated addresses. ovn-nbctl --wait=hv set NB_Global . options:mac_prefix="0a:00:00:00:00:00" @@ -20741,6 +20742,7 @@ OVN_FOR_EACH_NORTHD([ AT_SETUP([ipam to non-ipam]) ovn_start +check ovn-nbctl --wait=sb sync ovn-nbctl --wait=hv set NB_Global . options:mac_prefix="0a:00:00:00:00:00" ovn-nbctl ls-add sw0 ovn-nbctl lsp-add sw0 p0 -- lsp-set-addresses p0 dynamic