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

Handle ifconfig output differently for NetBSD >= 8.0 #48926

Merged
merged 2 commits into from Aug 9, 2018

Conversation

Projects
None yet
5 participants
@travispaul
Contributor

travispaul commented Aug 3, 2018

What does this PR do?

Calls a new function: netbsd_interfaces() to get networking info on NetBSD.

If the NetBSD version is >= 8.0 _netbsd_interfaces_ifconfig() is used to parse the output of ifconfig.

What issues does this PR fix or reference?

#48856

Previous Behavior

Salt fails to start on NetBSD 8.0 due to changes in ifconfig output.

New Behavior

Salt no longer fails to start and the new ifconfig output is parsed.

Tests written?

Yes

Commits signed with GPG?

Yes

@rallytime rallytime requested a review from saltstack/team-core Aug 3, 2018

@gtmanfred

This looks good, can we get some unittests for this, just so that we can make sure it doesn't break because we do not ever run integration tests on netbsd.

@travispaul

This comment has been minimized.

Contributor

travispaul commented Aug 4, 2018

@gtmanfred sure, I can do that. Just a heads-up it might take a week or so given my current workload.

Handle ifconfig output differently for NetBSD >= 8.0
The netmask is now returned as part of the IP address
in the ifconfig output.

fixes #48856

@travispaul travispaul force-pushed the travispaul:fix-netbsd-8-new-ifconfig branch from 58fc806 to 1db1e06 Aug 8, 2018

@travispaul

This comment has been minimized.

Contributor

travispaul commented Aug 9, 2018

Please let me know if any other tests or changes are needed. Thanks.

@rallytime

This comment has been minimized.

Contributor

rallytime commented Aug 9, 2018

Add unit test for NetBSD 8 ifconfig changes
lint changes in salt/utils/network.py

@travispaul travispaul force-pushed the travispaul:fix-netbsd-8-new-ifconfig branch from 1db1e06 to d59b6d8 Aug 9, 2018

@rallytime rallytime requested a review from gtmanfred Aug 9, 2018

@gtmanfred

This comment has been minimized.

Contributor

gtmanfred commented Aug 9, 2018

Thanks for adding the test!

@garethgreenaway

Nice!

@rallytime rallytime merged commit b24c96a into saltstack:2018.3 Aug 9, 2018

4 of 8 checks passed

jenkins/pr/py2-centos-7 The py2-centos-7 job has failed
Details
continuous-integration/jenkins/pr-merge This commit is being built
Details
jenkins/pr/py2-ubuntu-1604 running py2-ubuntu-1604...
Details
jenkins/pr/py3-ubuntu-1604 running py3-ubuntu-1604...
Details
WIP ready for review
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment