Skip to content

Use .NET to gather NIC information on newer systems #51372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
twangboy merged 15 commits into from
Jun 4, 2019
Merged

Use .NET to gather NIC information on newer systems #51372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
89d6cd1
Use .NET to gather NIC information on newer systems
twangboy Jan 28, 2019
9600a1b
Break some things out to make it easier to test
twangboy Jan 30, 2019
d411754
Add tests
twangboy Jan 30, 2019
07f190a
Fix some lint errors
twangboy Jan 30, 2019
702d454
Add another import for lint
twangboy Jan 30, 2019
8a6cf08
Merge branch 'develop' into dotnet_interfaces
twangboy Mar 28, 2019
464f125
Merge branch 'develop' into dotnet_interfaces
dwoz Apr 29, 2019
6f65698
Merge branch 'develop' into dotnet_interfaces
twangboy May 10, 2019
ac0f62b
Merge branch 'develop' into dotnet_interfaces
twangboy May 14, 2019
0c3d051
Merge branch 'develop' into dotnet_interfaces
twangboy May 20, 2019
66a46bb
Merge branch 'develop' into dotnet_interfaces
twangboy May 23, 2019
070153d
Merge branch 'develop' into dotnet_interfaces
twangboy May 23, 2019
7ac9fc1
Merge branch 'develop' into dotnet_interfaces
twangboy May 23, 2019
d4bda88
Merge branch 'develop' into dotnet_interfaces
twangboy May 29, 2019
e0013c5
Merge branch 'develop' into dotnet_interfaces
twangboy Jun 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 3 additions & 43 deletions salt/utils/network.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@
# Import 3rd-party libs
from salt.ext import six
from salt.ext.six.moves import range # pylint: disable=import-error,redefined-builtin
# Attempt to import wmi
# Attempt to import win_network
try:
import wmi
import salt.utils.winapi
import salt.utils.win_network
except ImportError:
pass

Expand Down Expand Up @@ -1006,46 +1005,7 @@ def win_interfaces():
'''
Obtain interface information for Windows systems
'''
with salt.utils.winapi.Com():
c = wmi.WMI()
ifaces = {}
for iface in c.Win32_NetworkAdapterConfiguration(IPEnabled=1):
ifaces[iface.Description] = dict()
if iface.MACAddress:
ifaces[iface.Description]['hwaddr'] = iface.MACAddress
if iface.IPEnabled:
ifaces[iface.Description]['up'] = True
for ip in iface.IPAddress:
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
return salt.utils.win_network.get_interface_info()


def interfaces():
Expand Down
Loading