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

Fix ip addr parsing breakage on sid

Browse Source 
Ticket:
Reviewed By: stannous
Testing Done: sanity testing
This commit is contained in:
Roopa Prabhu
2015-07-13 14:33:01 -07:00
parent 06e398ff47
commit c78cae3d24
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ifupdownaddons/iproute2.py
View File

@ -128,6 +128,13 @@ class iproute2(utilsBase):
ifname = ifnamenlink[0] ifname = ifnamenlink[0]
else: else:
ifname = ifnamenlink[0].strip(':') ifname = ifnamenlink[0].strip(':')
if not linkout.get(ifname):
linkattrs = {}
linkattrs['addrs'] = OrderedDict({})
try:
linkout[ifname].update(linkattrs)
except KeyError:
linkout[ifname] = linkattrs
if citems[2] == 'inet': if citems[2] == 'inet':
if self._addr_filter(citems[3], scope=citems[5]): if self._addr_filter(citems[3], scope=citems[5]):
continue continue
@ -143,14 +150,6 @@ class iproute2(utilsBase):
addrattrs['scope'] = citems[5] addrattrs['scope'] = citems[5]
addrattrs['type'] = 'inet6' addrattrs['type'] = 'inet6'
linkout[ifname]['addrs'][citems[3]] = addrattrs linkout[ifname]['addrs'][citems[3]] = addrattrs
else:
linkattrs = {}
linkattrs['addrs'] = OrderedDict({})
try:
linkout[ifname].update(linkattrs)
except KeyError:
linkout[ifname] = linkattrs
[linkCache.update_attrdict([ifname], linkattrs) [linkCache.update_attrdict([ifname], linkattrs)
for ifname, linkattrs in linkout.items()] for ifname, linkattrs in linkout.items()]