mirror/CumulusNetworks-ifupdown2
1
0
Fork 0
mirror of https://github.com/CumulusNetworks/ifupdown2.git synced 2024-05-06 15:54:50 +00:00
Code

addons: bridge: fix bridge/vxlan learning sync mechanism

Browse Source 
Old code was a bit messy and all over the place. This
resulted in a loophole breaking sync between bridge-learning
and vxlan-learning. This patch simplifies the existing code
and fixes the bug.

Signed-off-by: Julien Fortin <jfortin@nvidia.com>
This commit is contained in:
Julien Fortin
2022-03-22 12:52:32 +01:00
parent ab287bc42c
commit 6861404b8e
1 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
ifupdown2/addons/bridge.py
View File

@ -2079,9 +2079,7 @@ class bridge(Bridge, moduleBase):
before. This is done this way to avoid calling this method on
non vlan & bridge port interfaces thus wasting a bit less time
"""
kind = None
synced = False
ifla_info_data = {}
if user_config_brport_learning_nl is None:
@ -2094,8 +2092,6 @@ class bridge(Bridge, moduleBase):
= cached_brport_learning \
= user_config_brport_learning_nl
synced = True
self.logger.info(
"%s: %s: set bridge-learning %s"
% (bridge_name, brport_name, "on" if user_config_brport_learning_nl else "off")
@ -2112,36 +2108,40 @@ class bridge(Bridge, moduleBase):
#
# vxlan-learning sync:
#
brport_vxlan_learning_config_synced = False
user_brport_vxlan_learning_config = brport_ifaceobj.get_attr_value_first("vxlan-learning")
brport_vxlan_learning_config = brport_ifaceobj.get_attr_value_first("vxlan-learning")
# if vxlan-learning is defined by the user or via policy file we need
# to honor his config and not sync vxlan-learning with bridge-learning
if not user_brport_vxlan_learning_config:
# if vxlan-learning is not defined on the brport
if not brport_vxlan_learning_config and synced:
# vxlan-learning is not defined by the user but bridge-learning was set using bridge-vxlan-port-learning
# vxlan-learning needs to be synced as well
brport_vxlan_learning_config_nl = user_config_brport_learning_nl
brport_vxlan_learning_config_synced = True
if user_config_brport_learning_nl is not None:
# if bridge-learning is defined on the brport use it's value to sync vxlan-learning
user_brport_vxlan_learning_config_nl = user_config_brport_learning_nl
if not brport_vxlan_learning_config:
# check policy file
brport_vxlan_learning_config = policymanager.policymanager_api.get_attr_default("vxlan", "vxlan-learning")
else:
# if bridge-learning is not defined, we check for policy and convert it into netlink format
brport_vxlan_learning_config = policymanager.policymanager_api.get_attr_default("vxlan", "vxlan-learning")
if not brport_vxlan_learning_config_synced:
# convert vxlan-learning string to netlink value (if None use brport-learning value instead)
brport_vxlan_learning_config_nl = utils.get_boolean_from_string(brport_vxlan_learning_config) \
if brport_vxlan_learning_config \
else cached_brport_learning
if brport_vxlan_learning_config is not None:
user_brport_vxlan_learning_config_nl = utils.get_boolean_from_string(brport_vxlan_learning_config)
if brport_vxlan_learning_config_nl != self.cache.get_link_info_data_attribute(brport_name, Link.IFLA_VXLAN_LEARNING):
else:
# None = no policy set, default to the current brport learning
user_brport_vxlan_learning_config_nl = cached_brport_learning
else:
# if vxlan-learning is set we need to honor the user config
user_brport_vxlan_learning_config_nl = utils.get_boolean_from_string(user_brport_vxlan_learning_config)
if user_brport_vxlan_learning_config_nl != self.cache.get_link_info_data_attribute(
brport_name,
Link.IFLA_VXLAN_LEARNING
):
self.logger.info(
"%s: %s: vxlan learning and bridge learning out of sync: set vxlan-learning %s"
% (bridge_name, brport_name, "on" if brport_vxlan_learning_config_nl else "off")
% (bridge_name, brport_name, "on" if user_brport_vxlan_learning_config_nl else "off")
)
ifla_info_data = {Link.IFLA_VXLAN_LEARNING: brport_vxlan_learning_config_nl}
ifla_info_data = {Link.IFLA_VXLAN_LEARNING: user_brport_vxlan_learning_config_nl}
kind = "vxlan"
# if kind and ifla_info_data are set they will be added to the
# netlink request on the VXLAN brport, to sync IFLA_VXLAN_LEARNING
return kind, ifla_info_data