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: skip bridge-bridgeprio if mstpctl-treeprio is configured on the bridge

Browse Source 
Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
This commit is contained in:
Julien Fortin
2021-02-16 18:42:47 +01:00
committed by Julien Fortin
parent 3eb08b79e0
commit 01f27c6789
1 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
ifupdown2/addons/bridge.py
View File

@ -464,7 +464,7 @@ class bridge(Bridge, moduleBase):
'bridge-maxage': Link.IFLA_BR_MAX_AGE,
'bridge-ageing': Link.IFLA_BR_AGEING_TIME,
'bridge-stp': Link.IFLA_BR_STP_STATE,
'bridge-bridgeprio': Link.IFLA_BR_PRIORITY,
# 'bridge-bridgeprio': Link.IFLA_BR_PRIORITY,
'bridge-vlan-aware': Link.IFLA_BR_VLAN_FILTERING,
'bridge-vlan-protocol': Link.IFLA_BR_VLAN_PROTOCOL,
# Link.IFLA_BR_GROUP_FWD_MASK,
@ -1487,6 +1487,29 @@ class bridge(Bridge, moduleBase):
cached_value=cached_ifla_info_data.get(nl_attr)
)
# special cases ########################################################
# bridge-bridgeprio
# if mstpctl-treeprio is configured on the bridge
# do not reset the bridge-bridgeprio to the default value
# NOTE: this is the case for every bridge/mstpctl attribute pairs.
# TODO: more code should be added to handle this in the future.
mstpctl_treeprio = ifaceobj.get_attr_value_first("mstpctl-treeprio")
bridge_bridgeprio = ifaceobj.get_attr_value_first("bridge-bridgeprio")
if mstpctl_treeprio:
self.logger.info("%s: mstpctl-treeprio attribute is set - ignorning bridge-bridgeprio" % ifname)
else:
self.fill_ifla_info_data_with_ifla_br_attribute(
ifla_info_data=ifla_info_data,
link_just_created=link_just_created,
ifname=ifname,
nl_attr=Link.IFLA_BR_PRIORITY,
attr_name='bridge-bridgeprio',
user_config=bridge_bridgeprio,
cached_value=cached_ifla_info_data.get(Link.IFLA_BR_PRIORITY)
)
# bridge-mcsnoop
self.fill_ifla_info_data_with_ifla_br_attribute(
ifla_info_data=ifla_info_data,