saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #25151 from jleroy/ipv6-scope-support

Browse source 
Support for IPv6 addresses scopes in network.interfaces
This commit is contained in:
Mike Place 2015-07-06 08:43:03 -06:00
commit 3599b8abab
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
salt/utils/network.py
View file

@ -402,6 +402,7 @@ def _interfaces_ip(out):
based on the current set of cols
'''
brd = None
scope = None
if '/' in value: # we have a CIDR in this address
ip, cidr = value.split('/') # pylint: disable=C0103
else:
@ -414,7 +415,8 @@ def _interfaces_ip(out):
brd = cols[cols.index('brd') + 1]
elif type_ == 'inet6':
mask = cidr
return (ip, mask, brd)
scope = cols[cols.index('scope') + 1]
return (ip, mask, brd, scope)
groups = re.compile('\r?\n\\d').split(out)
for group in groups:
@ -441,7 +443,7 @@ def _interfaces_ip(out):
iflabel = cols[-1:][0]
if type_ in ('inet', 'inet6'):
if 'secondary' not in cols:
ipaddr, netmask, broadcast = parse_network(value, cols)
ipaddr, netmask, broadcast, scope = parse_network(value, cols)
if type_ == 'inet':
if 'inet' not in data:
data['inet'] = list()
@ -457,11 +459,12 @@ def _interfaces_ip(out):
addr_obj = dict()
addr_obj['address'] = ipaddr
addr_obj['prefixlen'] = netmask
addr_obj['scope'] = scope
data['inet6'].append(addr_obj)
else:
if 'secondary' not in data:
data['secondary'] = list()
ip_, mask, brd = parse_network(value, cols)
ip_, mask, brd, scp = parse_network(value, cols)
data['secondary'].append({
'type': type_,
'address': ip_,
@ -469,7 +472,7 @@ def _interfaces_ip(out):
'broadcast': brd,
'label': iflabel,
})
del ip_, mask, brd
del ip_, mask, brd, scp
elif type_.startswith('link'):
data['hwaddr'] = value
if iface: