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

addons: bridge: don't warn several times for duplicate bridge-ports in stanza

Browse Source 
auto br0
iface br0
      bridge-ports swp1 swp2
      bridge-ports swp3 swp4

running ifquery in this configuration gaves us 2 identical warnings:

warning: br0: ignoring duplicate bridge-ports lines: ['swp3 swp4']
warning: br0: ignoring duplicate bridge-ports lines: ['swp3 swp4']

when running ifreload -a we still see 2 warnings, this will need to be looked
at later.

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
This commit is contained in:
Julien Fortin
2016-12-01 07:31:52 +01:00
parent b62a7e7375
commit 4cbbf42e70
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
addons/bridge.py
View File

@@ -307,9 +307,9 @@ class bridge(moduleBase):
return True
return False
def _get_ifaceobj_bridge_ports(self, ifaceobj):
def _get_ifaceobj_bridge_ports(self, ifaceobj, warn=True):
ports = ifaceobj.get_attr_value('bridge-ports')
if ports and len(ports) > 1:
if warn and ports and len(ports) > 1:
self.log_warn('%s: ignoring duplicate bridge-ports lines: %s'
%(ifaceobj.name, ports[1:]))
return ports[0] if ports else None
@@ -822,7 +822,7 @@ class bridge(moduleBase):
self.logger.warn('%s: unable to parse vid \'%s\''
%(ifaceobj.name, v))
return ret
def _apply_bridge_port_pvids(self, bportifaceobj, pvid, running_pvid):
# Install pvids
try:
@@ -1291,7 +1291,7 @@ class bridge(moduleBase):
def _down(self, ifaceobj, ifaceobj_getfunc=None):
try:
if self._get_ifaceobj_bridge_ports(ifaceobj):
if self._get_ifaceobj_bridge_ports(ifaceobj, warn=False):
ports = self.brctlcmd.get_bridge_ports(ifaceobj.name)
self.brctlcmd.delete_bridge(ifaceobj.name)
if ports:
@@ -1641,7 +1641,8 @@ class bridge(moduleBase):
if not difference:
portliststatus = 0
try:
port_list = self._get_ifaceobj_bridge_ports(ifaceobj).split()
port_list = self._get_ifaceobj_bridge_ports(ifaceobj,
warn=False).split()
# we want to display the same bridge-ports list as provided
# in the interfaces file but if this list contains regexes or
# globs, for now, we won't try to change it.