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 Activity

Merge pull request #17 from BarbarossaTM/bridge-ports-condone-regex

Browse Source 
Add bridge-ports-condone-regex option.
This commit is contained in:
Julien Fortin
2018-01-09 15:30:28 +11:00
committed by GitHub
parent 83d348192e a517f4c648
commit dbb67bd856
1 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
addons/bridge.py
View File

@@ -46,6 +46,10 @@ class bridge(moduleBase):
'example' : ['bridge-ports swp1.100 swp2.100 swp3.100',
'bridge-ports glob swp1-3.100',
'bridge-ports regex (swp[1|2|3].100)']},
'bridge-ports-condone-regex' :
{'help' : 'bridge ports to ignore/condone when reloading config / removing interfaces',
'required' : False,
'example' : [ 'bridge-ports-condone-regex ^[a-zA-Z0-9]+_v[0-9]{1,4}$']},
'bridge-stp' :
{'help': 'bridge-stp yes/no',
'example' : ['bridge-stp no'],
@@ -347,6 +351,19 @@ class bridge(moduleBase):
else:
return None
def _get_bridge_port_condone_regex(self, ifaceobj, get_string = False):
bridge_port_condone_regex = ifaceobj.get_attr_value_first('bridge-ports-condone-regex')
# If bridge-ports-ignore-regex is configured, do NOT use the parse_port_list()
# function to gather a list of ports matching the regex here and now but set
# up a compiled regex to be used in a match later. This way we try to avoid
# a race condition where an (possibly VM) interface is created after this
# function has been called but before the bridgeports are validated.
if bridge_port_condone_regex:
if get_string:
return bridge_port_condone_regex
return re.compile (r"%s" % bridge_port_condone_regex)
return None
def _process_bridge_waitport(self, ifaceobj, portlist):
waitport_value = ifaceobj.get_attr_value_first('bridge-waitport')
if not waitport_value: return
@@ -418,6 +435,7 @@ class bridge(moduleBase):
def _add_ports(self, ifaceobj):
bridgeports = self._get_bridge_port_list(ifaceobj)
bridgeportscondoneregex = self._get_bridge_port_condone_regex(ifaceobj)
runningbridgeports = []
removedbridgeports = []
@@ -430,6 +448,8 @@ class bridge(moduleBase):
if runningbridgeports:
for bport in runningbridgeports:
if not bridgeports or bport not in bridgeports:
if bridgeportscondoneregex and bridgeportscondoneregex.match(bport):
continue
self.ipcmd.link_set(bport, 'nomaster')
removedbridgeports.append(bport)
else:
@@ -1565,6 +1585,7 @@ class bridge(moduleBase):
filterattrs = ['bridge-vids', 'bridge-port-vids',
'bridge-port-pvids']
bridge_port_condone_regex = self._get_bridge_port_condone_regex(ifaceobj)
for k in Set(ifaceattrs).difference(filterattrs):
# get the corresponding ifaceobj attr
v = ifaceobj.get_attr_value_first(k)
@@ -1599,6 +1620,9 @@ class bridge(moduleBase):
else:
ifaceobjcurr.update_config_with_status('bridge-stp',
rv, 1)
elif k == 'bridge-ports-condone-regex':
bridge_port_condone_regex_str = self._get_bridge_port_condone_regex(ifaceobj, True)
ifaceobjcurr.update_config_with_status(k, bridge_port_condone_regex_str, 0)
elif k == 'bridge-ports':
# special case ports because it can contain regex or glob
running_port_list = rv.keys() if rv else []
@@ -1609,10 +1633,16 @@ class bridge(moduleBase):
if running_port_list and bridge_port_list:
difference = set(running_port_list
).symmetric_difference(bridge_port_list)
running_port_list_pretty = running_port_list
if bridge_port_condone_regex:
# Drop any condoned port from the difference set
difference = [port for port in difference if not bridge_port_condone_regex.match (port)]
# Tag all condoned ports in brackets in output
running_port_list_pretty = ["(%s)" % port if port not in bridge_port_list and bridge_port_condone_regex.match (port) else port for port in running_port_list]
if not difference:
portliststatus = 0
portliststatus = 0
ifaceobjcurr.update_config_with_status('bridge-ports',
' '.join(running_port_list)
' '.join(running_port_list_pretty)
if running_port_list else '', portliststatus)
elif (k == 'bridge-pathcosts' or
k == 'bridge-portprios' or k == 'bridge-portmcrouter'