Skip to content

Commit

Permalink
tests: fixed race_condition with max_prefix
Browse files Browse the repository at this point in the history
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 <xsimonar@redhat.com>
Signed-off-by: Dumitru Ceara <dceara@redhat.com>
(cherry picked from commit 0cd5dd1)
  • Loading branch information
simonartxavier authored and dceara committed Nov 17, 2023
1 parent b9a019f commit 3e5f6ac
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion tests/ovn.at
Expand Up @@ -7965,6 +7965,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"
Expand Down Expand Up @@ -8280,7 +8281,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"
Expand Down Expand Up @@ -18488,6 +18489,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
Expand Down

0 comments on commit 3e5f6ac

Please sign in to comment.