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

Make SIG IDs in the topology canonical #2217

Merged
merged 1 commit into from
Dec 11, 2018
Merged

Make SIG IDs in the topology canonical #2217

merged 1 commit into from
Dec 11, 2018

Conversation

sustrik
Copy link
Contributor

@sustrik sustrik commented Dec 11, 2018

All other services are named something like br1-ff00_0_222.
SIG is nmaed sig_1-ff00_0_222. This patch makes the naming consistent.


This change is Reviewable

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 3 of 3 files at r1.
Reviewable status: all files reviewed, 3 unresolved discussions (waiting on @sustrik)

a discussion (no related file):
Typo in the commit message nmaed instead of named



python/topology/sig.py, line 89 at r1 (raw file):

        net = self.args.networks['sig%s' % topo_id.file_fmt()][0]
        entry['networks'][self.args.bridges[net['net']]] = {'ipv4_address': str(net['ipv4'])}
        self.dc_conf['services']['scion_disp_sig_%s' % topo_id.file_fmt()] = entry

should we change this as well ? (also the line below)


python/topology/sig.py, line 98 at r1 (raw file):

    def _sig_dc_conf(self, topo_id, base):
        self.dc_conf['services']['scion_sig_%s' % topo_id.file_fmt()] = {

this as well?

All other services are named something like br1-ff00_0_222.
SIG is named sig_1-ff00_0_222. This patch makes the naming consistent.
Copy link
Contributor Author

@sustrik sustrik 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, 3 unresolved discussions (waiting on @lukedirtwalker)

a discussion (no related file):

Previously, lukedirtwalker (Lukas Vogel) wrote…

Typo in the commit message nmaed instead of named

Done.



python/topology/sig.py, line 89 at r1 (raw file):

Previously, lukedirtwalker (Lukas Vogel) wrote…

should we change this as well ? (also the line below)

That implies changing more stuff (network names?) Frankly, I don't understand topology generator well enough to say what should and what should not be changed.


python/topology/sig.py, line 98 at r1 (raw file):

Previously, lukedirtwalker (Lukas Vogel) wrote…

this as well?

Same as above.

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


python/topology/sig.py, line 89 at r1 (raw file):

Previously, sustrik (Martin Sustrik) wrote…

That implies changing more stuff (network names?) Frankly, I don't understand topology generator well enough to say what should and what should not be changed.

As discussed it is fine if we just change the sig name.

@sustrik sustrik merged commit 6e999e2 into scionproto:master Dec 11, 2018
@sustrik sustrik deleted the sig-id branch December 11, 2018 08:28
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