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.

Sign up for GitHub

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

Jump to bottom

[docker_network] Adding scope and attachable flags #49562

Merged
merged 1 commit into from
Dec 6, 2018
Merged

[docker_network] Adding scope and attachable flags #49562

merged 1 commit into from
Dec 6, 2018

Conversation

DBendit
Copy link
Contributor

@DBendit DBendit commented Dec 5, 2018

SUMMARY

Incorporating the abandoned work from PRs #35288 and #45552. Also adding in
the version checking from docker_container.py, which should be abstracted
out to docker_common.py.

Part of the work for ansible/community#408

ISSUE TYPE
  • Feature Pull Request
COMPONENT NAME

docker_network

ADDITIONAL INFORMATION

Integration tests passing with ansible-test integration -v docker_network --docker ubuntu1604

@ansibot
Copy link
Contributor

ansibot commented Dec 5, 2018

cc @akshay196 @chouseknecht @danihodovic @dariko @felixfontein @jwitko @kassiansun @keitwb @olsaki @tbouvet
click here for bot help

@ansibot ansibot added affects_2.8 This issue/PR affects Ansible v2.8 cloud community_review In order to be merged, this PR must follow the community review workflow. docker feature This issue/PR relates to a feature request. module This issue/PR relates to a module. needs_triage Needs a first human triage before being processed. support:community This issue/PR relates to code supported by the Ansible community. test This PR relates to tests. labels Dec 5, 2018
This was referenced Dec 5, 2018
Closed
Closed
@ansibot ansibot added needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. and removed community_review In order to be merged, this PR must follow the community review workflow. labels Dec 5, 2018
DBendit
DBendit commented Dec 5, 2018
View reviewed changes
lib/ansible/modules/cloud/docker/docker_network.py
@@ -294,6 +316,7 @@ def get_ip_version(cidr):


def get_driver_options(driver_options):
# TODO: Move this and the same from docker_prune.py to docker_common.py
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Created #49563 to track

DBendit
DBendit commented Dec 5, 2018
View reviewed changes
lib/ansible/modules/cloud/docker/docker_network.py
@@ -310,6 +333,59 @@ def get_driver_options(driver_options):

class DockerNetworkManager(object):

def _get_minimal_versions(self):
# TODO: Move this and the same from docker_container.py to docker_common.py
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Created #49564 to track

@ansibot ansibot added community_review In order to be merged, this PR must follow the community review workflow. and removed needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. needs_triage Needs a first human triage before being processed. labels Dec 5, 2018
@DBendit
Copy link
Contributor Author

DBendit commented Dec 5, 2018

Added comment to the test to indicate why it doesn't strictly do what it says it does (sigh).

ready_for_review

@ansibot ansibot added needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. and removed community_review In order to be merged, this PR must follow the community review workflow. labels Dec 5, 2018
@felixfontein
Copy link
Contributor

The current CI failure is unrelated (pip fails installing requirements).

@felixfontein
Copy link
Contributor

felixfontein commented Dec 5, 2018 •
edited

BTW, instead of making trivial changes, you can also close and reopen the PR to trigger a new CI run.

@ansibot
Copy link
Contributor

ansibot commented Dec 5, 2018

The test ansible-test sanity --test pylint [explain] failed with 1 error:

lib/ansible/modules/cloud/docker/docker_network.py:686:0: trailing-newlines Trailing newlines

The test ansible-test sanity --test pep8 [explain] failed with 1 error:

lib/ansible/modules/cloud/docker/docker_network.py:686:1: W391 blank line at end of file

The test ansible-test sanity --test validate-modules [explain] failed with 1 error:

lib/ansible/modules/cloud/docker/docker_network.py:685:0: E109 Next to last line should be: if __name__ == "__main__":

click here for bot help

@ansibot ansibot added ci_verified Changes made in this PR are causing tests to fail. and removed ci_verified Changes made in this PR are causing tests to fail. needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. labels Dec 5, 2018
@ansibot ansibot added the community_review In order to be merged, this PR must follow the community review workflow. label Dec 5, 2018
@DBendit
Copy link
Contributor Author

DBendit commented Dec 5, 2018

Good to know on the closing/opening trick to get the tests to re-run, especially since trailing whitespace causes the above issues.

I've updated the minimum versions and added the support for old version testing.

ready_for_review

@DBendit
[docker_network] Adding scope and attachable flags
0c33191 
Incorporating the abandoned work from PRs #35288 and #45552. Also adding in
the version checking from `docker_container.py`, which should be abstracted
out to `docker_common.py`.
felixfontein
felixfontein approved these changes Dec 5, 2018
View reviewed changes
Copy link
Contributor

@felixfontein felixfontein left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shipit

I've ran the integration tests with various docker-py versions (1.10.6, 2.0.0, 2.5.0 and 3.6.0), everything looks good!

@ansibot ansibot added shipit This PR is ready to be merged by Core and removed community_review In order to be merged, this PR must follow the community review workflow. labels Dec 5, 2018
@felixfontein felixfontein mentioned this pull request Dec 6, 2018
Closed
@gundalow gundalow merged commit 73640a4 into ansible:devel Dec 6, 2018
@DBendit
Copy link
Contributor Author

DBendit commented Dec 6, 2018

@felixfontein Thanks for the reviews!
@gundalow Thanks for the merge!

@DBendit DBendit deleted the docker_network-scope-and-attachable branch December 6, 2018 18:52
This was referenced Dec 6, 2018
Closed
Closed
@felixfontein
Copy link
Contributor

@DBendit thanks for the PR!
@gundalow thanks for merging!

@lightster
Copy link

Thank you @felixfontein!

kbreit pushed a commit to kbreit/ansible that referenced this pull request Jan 11, 2019
@DBendit @kbreit
[docker_network] Adding scope and attachable flags (ansible#49562)
45949ff 
Incorporating the abandoned work from PRs ansible#35288 and ansible#45552. Also adding in
the version checking from `docker_container.py`, which should be abstracted
out to `docker_common.py`.
@ansible ansible locked and limited conversation to collaborators Jul 22, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@felixfontein felixfontein felixfontein approved these changes

Assignees
No one assigned
Labels
affects_2.8 This issue/PR affects Ansible v2.8 cloud docker feature This issue/PR relates to a feature request. module This issue/PR relates to a module. shipit This PR is ready to be merged by Core support:community This issue/PR relates to code supported by the Ansible community. test This PR relates to tests.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@DBendit @ansibot @felixfontein @lightster @gundalow