Skip to content
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.

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

salt.modules.network: Add functions to get minion's networks #53100

Merged
merged 10 commits into from
Apr 22, 2020

Conversation

terminalmage
Copy link
Contributor

What does this PR do?

Two new functions added which return information about the networks to which the minion belongs. Additionally, the interface arg to both new functions supports multiple interfaces and globbing. This additional functionality has also been added to the ip_addrs and ip_addrs6 functions, and all four of these functions now use common code for filtering the interface data. DRY.

What issues does this PR fix or reference?

N/A

Tests written?

Yes

Commits signed with GPG?

No

@twangboy
Copy link
Contributor

@terminalmage Looks like have some lint

@terminalmage
Copy link
Contributor Author

terminalmage commented May 23, 2019

@twangboy That was a false positive, I've pushed an update that ignores that particular failure.

@Ch3LL Ch3LL added the ZRELEASED - Neon retired label label Jun 6, 2019
@Ch3LL
Copy link
Contributor

Ch3LL commented Jun 6, 2019

@terminalmage looks like there is a merge conflict, would you be willing to fix that?

also, i plan on creating the neon branch today, i will migrate this PR to the new branch after its created thanks :)

@terminalmage
Copy link
Contributor Author

Rebased.

@Ch3LL Ch3LL changed the base branch from develop to neon June 6, 2019 21:33
@Ch3LL
Copy link
Contributor

Ch3LL commented Jun 6, 2019

FYI I migrated this PR from develop to neon to ensure it is included in the upcoming neon release. Let me know if this caused any issues. Thanks

@terminalmage
Copy link
Contributor Author

@Ch3LL It looked fine to me. I noticed a docstring that had IPv4 instead of IPv6 in it, so I fixed that and rebased, and re-ran tests. They look good to me so I pushed. Assuming tests pass I think this is good to merge.

twangboy
twangboy previously approved these changes Jun 14, 2019
@terminalmage terminalmage changed the base branch from neon to master December 10, 2019 19:45
@terminalmage terminalmage requested a review from a team as a code owner December 10, 2019 19:46
@ghost ghost requested a review from cmcmarrow December 10, 2019 19:46
@terminalmage
Copy link
Contributor Author

I've rebased and re-pointed at master.

@terminalmage
Copy link
Contributor Author

Rebased again. Any chance we can get this merged?

@terminalmage
Copy link
Contributor Author

Can we get this re-reviewed and try to get it merged? It has been nearly 11 months.

@DmitryKuzmenko
Copy link
Contributor

@terminalmage thanks for rebasing this, I've also blackened it for you. Could you please address the lint issues?

@terminalmage
Copy link
Contributor Author

One of the lint warnings was due to black itself inserting a comma. Both warnings should now be fixed.

@Ch3LL Ch3LL removed the request for review from a team April 15, 2020 14:45
@terminalmage
Copy link
Contributor Author

Rebased again.

@dwoz dwoz merged commit abefb0b into saltstack:master Apr 22, 2020
@terminalmage terminalmage deleted the ip_networks branch February 12, 2024 23:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants