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

Misc fixes. Add a --skip-upperifaces option to ifup (given the confusion

Browse Source 
over ifup handling of upperifaces by default) + some fixes in the
reserved vlan check

Ticket: CM-3346
Reviewed By:
Testing Done: Tested ifupdown sanity.
This commit is contained in:
Roopa Prabhu
2014-11-25 10:19:35 -08:00
parent aa5751ba27
commit ad25e7bb98
5 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
addons/bridge.py
View File

@@ -336,6 +336,15 @@ class bridge(moduleBase):
b = list(b)
yield b[0][1], b[-1][1]
def _handle_reserved_vlan(self, vlanid):
if vlanid in range(self._resv_vlan_range[0],
self._resv_vlan_range[1]):
self.logger.warn('skipping reserved vlan %d' %vlanid +
' (reserved vlan range %d-%d)' %(self._resv_vlan_range[0],
self._resv_vlan_range[1]))
return True
return False
def _ranges_to_ints(self, rangelist):
""" returns expanded list of integers given set of string ranges
example: ['1', '2-4', '6'] returns [1, 2, 3, 4, 6]
@@ -345,9 +354,14 @@ class bridge(moduleBase):
if '-' in part:
a, b = part.split('-')
a, b = int(a), int(b)
if (self._handle_reserved_vlan(a) or
self._handle_reserved_vlan(b)):
continue
result.extend(range(a, b + 1))
else:
a = int(part)
if self._handle_reserved_vlan(a):
continue
result.append(a)
return result