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

Use ipaddress to validate ipv4/ipv6 #33956

Merged
merged 2 commits into from
Jun 23, 2016
Merged

Conversation

silenius
Copy link
Contributor

What does this PR do?

  • Code cleanup, use the ipaddress module to validate ips

What issues does this PR fix or reference?

None

Tests written?

No

@cachedout
Copy link
Contributor

Hi @silenius

Thanks for doing this cleanup. Something might not be quite right though, since some tests are now failing: https://jenkins.saltstack.com/job/PR/job/salt-pr-rs-cent7-n/2720/testReport/junit/unit.modules.dig_test/DigTestCase/test_spf/

Could you please take a look? Thanks!

@cachedout cachedout added the Pending-Discussion The issue or pull request needs more discussion before it can be closed or merged label Jun 13, 2016
@silenius
Copy link
Contributor Author

Sorry for delay, I have a 404 on the Jenkins job but I've restored old beahvior (+ rebased on develop)

@silenius
Copy link
Contributor Author

(BTW maybe the def check_ip(addr): from dig.py could be deprecated and moved in a more generic network module)

@rallytime
Copy link
Contributor

Thanks for doing this cleanup @silenius and for rebasing.

@rallytime rallytime merged commit 58e7ae0 into saltstack:develop Jun 23, 2016
gitebra pushed a commit to gitebra/salt that referenced this pull request Jun 23, 2016
* upstream/develop: (37 commits)
  Use ipaddress to validate ipv4/ipv6 (saltstack#33956)
  Updated winrepo_test (saltstack#34227)
  Whitespace fix for saltstack#34235 (saltstack#34250)
  message_format was not set in the correct function (saltstack#34235)
  Typo in dockerio doc (saltstack#34244)
  Fixup test failure
  Pass through update_holds to pkg.install
  fix regression from saltstack#33681 which causes pulling a list of s3 objects via s3.query to fail (saltstack#34208)
  fix regression in s3.query from saltstack#33599 that causes pulling a file list from s3 to fail (saltstack#34207)
  utils/parsers.py: disable minion multiprocessing logging if only running one process
  Fix a pair of gitfs bugs (saltstack#34218)
  rsync state: Removed source existance check saltstack#25251
  Linted saltstack#34200
  Allow specifying memory, cpu and vcpu as kwargs for OpenNebula (saltstack#34203)
  Fixes saltstack#34181 no more newlines in long yaml encodes
  Clarify pkg.list_repo_pkgs docstring for held packages (saltstack#34188)
  Update saltutil.wheel docs to specify remote vs local minion behavior
  fix regression in s3.query from saltstack#33682
  Change target for dockerng assuming default status to Nitrogen release (saltstack#34206)
  Correct the docstrings formatting in pkgbuild modules and state (saltstack#34194)
  ...
@silenius silenius deleted the network branch February 10, 2020 14:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Pending-Discussion The issue or pull request needs more discussion before it can be closed or merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants