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

[2018.3] Fix to modules/network.py #50147

Conversation

Projects
None yet
4 participants
@garethgreenaway
Copy link
Member

commented Oct 20, 2018

What does this PR do?

Fixing scenario where the interface for the default route has a dash in it, the regular expression used in get_route currently doesn't not account for this.. Adding some additional tests for network.get_route.

What issues does this PR fix or reference?

#50129

Tests written?

Yes

Commits signed with GPG?

Yes/No

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

Fixing scenario where the interface for the default route has a dash …
…in it, regular expression used in get_route currently doesn't not account for this.. Adding some additional tests for network.get_route.

@garethgreenaway garethgreenaway force-pushed the garethgreenaway:50129_network_get_route_fails_dash_in_name branch from 9624a4d to 3117969 Oct 20, 2018

@@ -26,6 +26,9 @@
from salt.exceptions import CommandExecutionError
from salt._compat import ipaddress

import logging

This comment has been minimized.

Copy link
@s0undt3ch

s0undt3ch Oct 20, 2018

Member

Move logging import to the top where the other python imports are(if any).

Just because I'm nitpicking :)

@cachedout cachedout merged commit 593c7ff into saltstack:2018.3 Oct 22, 2018

7 of 10 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has failed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has failed
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/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.