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

Go dispatcher support for supervisord topo gen #2303

Merged
merged 2 commits into from
Jan 8, 2019
Merged

Go dispatcher support for supervisord topo gen #2303

merged 2 commits into from
Jan 8, 2019

Conversation

scrye
Copy link
Contributor

@scrye scrye commented Jan 8, 2019

This change is Reviewable

@scrye scrye added the c/dispatcher SCION dispatcher label Jan 8, 2019
@scrye scrye self-assigned this Jan 8, 2019
@scrye scrye requested a review from oncilla January 8, 2019 09:34
Copy link
Collaborator

@lukedirtwalker lukedirtwalker left a comment

Choose a reason for hiding this comment

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

Reviewed 4 of 4 files at r1.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @scrye and @oncilla)


python/topology/go.py, line 153 at r1 (raw file):

                    write_file(os.path.join(base, k, CS_CONFIG_NAME), toml.dumps(cs_conf))

Why the extra line?


python/topology/supervisor.py, line 174 at r1 (raw file):

            config_file_path = os.path.join(elem_dir, "dispconfig.toml")
            self._write_elem_conf(elem, ["bin/godispatcher", "-config", config_file_path], elem_dir)
            conf = {

As discussed offline: Currently we can leave it here, but once we want a more complex setup one dispatcher per AS or also implement the docker code it will make sense to move this to the GoGenerator in go.py.

Copy link
Contributor

@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: all files reviewed, 1 unresolved discussion (waiting on @scrye and @oncilla)

Copy link
Contributor Author

@scrye scrye 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: all files reviewed, 1 unresolved discussion (waiting on @lukedirtwalker)


python/topology/go.py, line 153 at r1 (raw file):

Previously, lukedirtwalker (Lukas Vogel) wrote…

Why the extra line?

It also made the linter cry :(

Fixed.

Copy link
Collaborator

@lukedirtwalker lukedirtwalker 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

Copy link
Contributor

@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.

:lgtm:

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

Copy link
Contributor

@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: :shipit: complete! all files reviewed, all discussions resolved

@scrye scrye merged commit f830bf7 into scionproto:master Jan 8, 2019
@scrye scrye deleted the pubpr-disp-topo branch January 8, 2019 16:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
c/dispatcher SCION dispatcher
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants