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

DS: Docker network allocations #2220

Merged
merged 2 commits into from
Dec 11, 2018
Merged

Conversation

oncilla
Copy link
Contributor

@oncilla oncilla commented Dec 11, 2018

Make sure that DS is reachable in docker topology


This change is Reviewable

Make sure that DS is reachable in docker topology
@oncilla oncilla requested a review from worxli December 11, 2018 09:14
Copy link
Contributor

@worxli worxli left a comment

Choose a reason for hiding this comment

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

Reviewable status: 0 of 1 files reviewed, 1 unresolved discussion (waiting on @oncilla and @worxli)


python/topology/topo.py, line 198 at r1 (raw file):

    def _gen_srv_entries(self, topo_id, as_conf):
        def reg_disp(elem_id): return "disp" + topo_id.file_fmt() if self.args.docker else elem_id

I'd prefer if this func wasn't inlined.

Copy link
Contributor Author

@oncilla oncilla left a comment

Choose a reason for hiding this comment

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

Reviewable status: 0 of 1 files reviewed, 1 unresolved discussion (waiting on @worxli)


python/topology/topo.py, line 198 at r1 (raw file):

Previously, worxli (Lukas Bischofberger) wrote…

I'd prefer if this func wasn't inlined.

Done.

Copy link
Contributor

@worxli worxli left a comment

Choose a reason for hiding this comment

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

Reviewed 1 of 1 files at r2.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

Copy link
Contributor

@worxli worxli left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@oncilla oncilla merged commit aa6b385 into scionproto:master Dec 11, 2018
@oncilla oncilla deleted the disc-port-docker branch December 11, 2018 15:04
@oncilla oncilla added this to the Sprint #12 milestone Dec 13, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants