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

networkinterfaces: make allow/auto behave the same

Browse Source 
This change goal is to make auto behave like allow-auto.
This commit will also provide the interfaces range capability to any
other allow-class names.
This commit is contained in:
Adrien Banlin
2023-06-12 10:49:48 +02:00
parent eb92c38042
commit 65b3f523f9
1 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
ifupdown2/ifupdown/networkinterfaces.py
View File

@ -142,6 +142,20 @@ class networkInterfaces():
return 1 return 1
return 0 return 0
def _add_ifaces_to_class(self, classname, ifaces):
if classname not in self.allow_classes:
self.allow_classes[classname] = []
# This is a specific uses case: everything is considered auto if all
# is being given to the auto or allow-auto classe.
if classname == 'auto' and 'all' in ifaces:
self.auto_all = True
return # nothing is to be done.
for ifname in ifaces:
ifnames = utils.expand_iface_range(ifname) or [ifname]
self.allow_classes[classname].extend(ifnames)
def process_allow(self, lines, cur_idx, lineno): def process_allow(self, lines, cur_idx, lineno):
allow_line = lines[cur_idx] allow_line = lines[cur_idx]
@ -152,12 +166,7 @@ class networkInterfaces():
allow_class = words[0].split('-')[1] allow_class = words[0].split('-')[1]
ifacenames = words[1:] ifacenames = words[1:]
self._add_ifaces_to_class(allow_class, ifacenames)
if self.allow_classes.get(allow_class):
for i in ifacenames:
self.allow_classes[allow_class].append(i)
else:
self.allow_classes[allow_class] = ifacenames
return 0 return 0
def process_source(self, lines, cur_idx, lineno): def process_source(self, lines, cur_idx, lineno):
@ -201,25 +210,12 @@ class networkInterfaces():
def process_auto(self, lines, cur_idx, lineno): def process_auto(self, lines, cur_idx, lineno):
auto_ifaces = re.split(self._ws_split_regex, lines[cur_idx])[1:] auto_ifaces = re.split(self._ws_split_regex, lines[cur_idx])[1:]
if not auto_ifaces: if not auto_ifaces:
self._parse_error(self._currentfile, lineno, self._parse_error(self._currentfile, lineno,
'invalid auto line \'%s\''%lines[cur_idx]) 'invalid auto line \'%s\''%lines[cur_idx])
return 0 else:
for a in auto_ifaces: self._add_ifaces_to_class('auto', auto_ifaces)
if a == 'all':
self.auto_all = True
break
r = utils.parse_iface_range(a)
if r:
if len(r) == 3:
# eg swp1.[2-4], r = "swp1.", 2, 4)
for i in range(r[1], r[2]+1):
self.auto_ifaces.append('%s%d' %(r[0], i))
elif len(r) == 4:
for i in range(r[1], r[2]+1):
# eg swp[2-4].100, r = ("swp", 2, 4, ".100")
self.auto_ifaces.append('%s%d%s' %(r[0], i, r[3]))
self.auto_ifaces.append(a)
return 0 return 0
def _add_to_iface_config(self, ifacename, iface_config, attrname, def _add_to_iface_config(self, ifacename, iface_config, attrname,