openstack
/
neutron
Code Issues Proposed changes

Merge "Don't warn in VLAN Plumber on tagless children" into stable/newton

This commit is contained in:
Jenkins 2016-09-20 05:39:42 +00:00 committed by Gerrit Code Review
parent 6566057b7e 9ed27c520f
commit 9153f03a9b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
neutron/services/trunk/drivers/linuxbridge/agent/trunk_plumber.py
View File

@ -165,11 +165,11 @@ class _InterfaceInfo(object):
self.devname = name_section
self.parent_devname = self.vlan_tag = None
else:
self.devname, self.parent_devname = name_section.split('@')
self.devname, parent = name_section.split('@')
m = re.match(r'.*802\.1Q id (\d+).*', line)
self.vlan_tag = int(m.group(1)) if m else None
if self.vlan_tag is None:
LOG.warning(_LW("Failed to parse VLAN from: %s"), line)
# we only care about parent interfaces if it's a vlan sub-interface
self.parent_devname = parent if self.vlan_tag is not None else None
def __repr__(self):
return ('_InterfaceInfo(devname=%s, parent=%s, vlan=%s)' %