Fixes #18180: Make rtf handle network hostonly uniqueness #254
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
peckpeck
reviewed
Sep 9, 2020
lib/platform.py
Outdated
| # update promises on the whole chain | ||
| relays.append(server) | ||
| relays.reverse() | ||
| for h in relays: | ||
| h.run("rudder agent run -u", quiet=False, live_output=True, fail_exit=fail_exit) | ||
| host.run("rudder agent run -ui", quiet=False, live_output=True, fail_exit=fail_exit) | ||
|
|
||
| def pf_id_to_network(self, pf_id): | ||
| # Since the mask is always 255.255.255.0 this is reasonable | ||
| return ("192.168.%s.0"%(pf_id), "255.255.255.0") |
There was a problem hiding this comment.
the base network can be defines in the Vagrantfile, so you shouldn't hardcode 192.168. here an the mask is also in the Vagrantfile (see $NETWORK)
|
PR updated with a new commit |
peckpeck
reviewed
Sep 9, 2020
lib/platform.py
Outdated
| base_subnet = "192.168.0.0/24" | ||
| with open("Vagrantfile", "r+") as fd: | ||
| for line in fd: | ||
| m = re.match("^\$NETWORK=[\'\"](.*)[\'\"]", line) |
peckpeck
reviewed
Sep 9, 2020
lib/platform.py
Outdated
| print("Taking base network %s"%m.group(1)) | ||
| base_subnet = m.group(1) | ||
| subnet = ipaddress.ip_network(base_subnet) | ||
| return (str(subnet.network_address + 256*pf_id), str(subnet.netmask)) |
There was a problem hiding this comment.
256 should be replaces by 2**(32-subnet.prefixlen)
|
PR updated with a new commit |
1 similar comment
|
PR updated with a new commit |
peckpeck
approved these changes
Sep 9, 2020
peckpeck
approved these changes
Sep 10, 2020
|
OK, squash merging this PR |
Normation-Quality-Assistant
force-pushed
the
bug_18180/make_rtf_handle_network_hostonly_uniqueness
branch
from
d806b7a
to
4ff36c9
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://issues.rudder.io/issues/18180