diff options
author | Lorenzo Bianconi <lorenzo.bianconi@redhat.com> | 2019-03-05 14:22:50 +0100 |
---|---|---|
committer | Ben Pfaff <blp@ovn.org> | 2019-03-05 15:44:59 -0800 |
commit | f1301a259a92e526672b2f3119a9b234a5013387 (patch) | |
tree | 334f9e743dcda4ca74430f4229abcdd4561ce6f1 /tests | |
parent | 2257757aa15f25bf64b96d918c79f4606d0cad2c (diff) | |
download | openvswitch-f1301a259a92e526672b2f3119a9b234a5013387.tar.gz |
OVN: select a random mac_prefix if not provided
Select a random IPAM mac_prefix if it has not been provided by the user.
With this patch the admin can avoid to configure mac_prefix in order to
avoid L2 address collisions if multiple OVN deployments share the same
broadcast domain.
Remove MAC_ADDR_PREFIX definitions/occurrences since now mac_prefix is
always provided to ovn-northd
Acked-by: Numan Siddique <nusiddiq@redhat.com>
Tested-by: Miguel Duarte de Mora Barroso <mdbarroso@redhat.com>
Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/ovn.at | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/tests/ovn.at b/tests/ovn.at index ec79651bd..2af225a67 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -5596,6 +5596,7 @@ ovn_start # 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" ovn-nbctl ls-add sw0 ovn-nbctl lsp-add sw0 p0 -- lsp-set-addresses p0 dynamic ovn-nbctl --wait=sb add Logical-Switch sw0 other_config subnet=192.168.1.0/24 @@ -5963,6 +5964,16 @@ AT_CHECK([ovn-nbctl get Logical-Switch-Port p83 dynamic_addresses], [0], ["00:11:22:00:00:08" ]) +# clear mac_prefix and check it is allocated in a random manner +ovn-nbctl --wait=hv remove NB_Global . options mac_prefix +ovn-nbctl ls-add sw9 +ovn-nbctl --wait=sb set Logical-Switch sw9 other_config:mac_only=true +ovn-nbctl --wait=sb lsp-add sw9 p91 -- lsp-set-addresses p91 dynamic + +mac_prefix=$(ovn-nbctl --wait=sb get NB_Global . options:mac_prefix | tr -d \") +port_addr=$(ovn-nbctl get Logical-Switch-Port p91 dynamic_addresses | tr -d \") +AT_CHECK([test "$port_addr" = "${mac_prefix}:00:00:09"], [0], []) + as ovn-sb OVS_APP_EXIT_AND_WAIT([ovsdb-server]) @@ -5981,6 +5992,7 @@ ovn_start ovn-nbctl 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" ovn-nbctl ls-add foo -- add Logical_Switch foo other_config subnet=192.168.1.0/24 ovn-nbctl ls-add alice -- add Logical_Switch alice other_config subnet=192.168.2.0/24 @@ -12232,6 +12244,7 @@ AT_CLEANUP AT_SETUP([ovn -- ipam to non-ipam]) ovn_start +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 ovn-nbctl --wait=sb add Logical-Switch sw0 other_config subnet=192.168.1.0/24 |