Use .NET to gather NIC information on newer systems#51372
Merged
twangboy merged 15 commits intosaltstack:developfrom Jun 4, 2019
Merged
Use .NET to gather NIC information on newer systems#51372twangboy merged 15 commits intosaltstack:developfrom
twangboy merged 15 commits intosaltstack:developfrom
Conversation
dwoz
approved these changes
Jan 30, 2019
twangboy
force-pushed
the
dotnet_interfaces
branch
from
5b8d148 to
07f190a
Compare
I don't know why the linter is asking for this import
twangboy
changed the title
Contributor
|
This actually broke develop under Linux |
Contributor
|
yep: #53381 |
Contributor
|
@s0undt3ch where is the PR where this commit is living? |
Contributor
Contributor
|
This also brings in another python dep |
Contributor
Author
|
Yes... it was added to the |
twangboy
added a commit
to twangboy/salt
that referenced
this pull request
Jan 14, 2020
Ch3LL
added a commit
to Ch3LL/salt
that referenced
this pull request
Jan 26, 2020
This reverts commit a399d7f. Conflicts: - salt/utils/network.py - salt/utils/win_network.py - tests/unit/utils/test_win_network.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Uses .NET to gather Network Interface Information. Maintains old code that uses WMI to gather that information for use on Windows 7/2008R2 which has .NET 3.5 which is incompatible with the
pythonnetlibrary. Though you can install .NET 4 on Windows 7, it's not there out of the box.What issues does this PR fix or reference?
This should fix some issues with slowness in Windows as this code is used in generating grains. Where the average run for doing so is 3.5 seconds with WMI, it is ~1 second with .NET.
Also adds the gateway in the return for Windows, which is present on other systems:
#51128
Tests written?
Not yet, hence the WIP
Commits signed with GPG?
Yes