valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Properly parse Windows ipv4 and ipv6 IP addresses

Browse Source 
Fixes #5391

Fixes #5377
This commit is contained in:
David Boucha 2013-06-14 15:05:37 -06:00
parent 402b54929e
commit 6df94ddeb5
1 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
salt/utils/network.py
View File

@ -370,23 +370,40 @@ def win_interfaces():
ifaces[iface.Description]['hwaddr'] = iface.MACAddress
if iface.IPEnabled:
ifaces[iface.Description]['up'] = True
ifaces[iface.Description]['inet'] = []
for ip in iface.IPAddress:
item = {}
item['broadcast'] = ''
try:
item['broadcast'] = iface.DefaultIPGateway[0]
except Exception:
pass
item['netmask'] = iface.IPSubnet[0]
item['label'] = iface.Description
item['address'] = ip
ifaces[iface.Description]['inet'].append(item)
if '.' in ip:
if 'inet' not in ifaces[iface.Description]:
ifaces[iface.Description]['inet'] = []
item = {'address': ip,
'label': iface.Description}
if iface.DefaultIPGateway:
broadcast = next(( i for i in iface.DefaultIPGateway if '.' in i ), '')
if broadcast:
item['broadcast'] = broadcast
if iface.IPSubnet:
netmask = next(( i for i in iface.IPSubnet if '.' in i ), '')
if netmask:
item['netmask'] = netmask
ifaces[iface.Description]['inet'].append(item)
if ':' in ip:
if 'inet6' not in ifaces[iface.Description]:
ifaces[iface.Description]['inet6'] = []
item = {'address': ip}
if iface.DefaultIPGateway:
broadcast = next(( i for i in iface.DefaultIPGateway if ':' in i ), '')
if broadcast:
item['broadcast'] = broadcast
if iface.IPSubnet:
netmask = next(( i for i in iface.IPSubnet if ':' in i ), '')
if netmask:
item['netmask'] = netmask
ifaces[iface.Description]['inet6'].append(item)
else:
ifaces[iface.Description]['up'] = False
return ifaces
def interfaces():
'''
Return a dictionary of information about all the interfaces on the minion