feat(dnsmasq): support for multiple DHCP server interfaces #4529
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
...eclipse.kura.linux.net/src/main/java/org/eclipse/kura/linux/net/dhcp/server/DnsmasqTool.java
Show resolved
Hide resolved
...eclipse.kura.linux.net/src/main/java/org/eclipse/kura/linux/net/dhcp/server/DnsmasqTool.java
Show resolved
Hide resolved
marcellorinaldo
force-pushed
the
dnsmasq-support-multiple-dhcp-interfaces
branch
from
cb5d773 to
5525951
Compare
|
Tests missing, will add in different PR |
pierantoniomerlino
approved these changes
Apr 6, 2023
|
@marcellorinaldo The tests are failing. Can you please check? |
Forgot to update couple of test cases. |
|
The current tests error seem unrelated to this PR and might be solved in #4544, will rebase after that merge. |
…ions Signed-off-by: Marcello Martina <[email protected]>
…ction, manage global confs file Signed-off-by: Marcello Martina <[email protected]>
Signed-off-by: Marcello Martina <[email protected]>
Signed-off-by: Marcello Martina <[email protected]>
Signed-off-by: Marcello Martina <[email protected]>
Signed-off-by: Marcello Martina <[email protected]>
Signed-off-by: Marcello Martina <[email protected]>
Signed-off-by: Marcello Martina <[email protected]>
mattdibi
force-pushed
the
dnsmasq-support-multiple-dhcp-interfaces
branch
from
3afdeae to
d12fe49
Compare
Signed-off-by: MMaiero <[email protected]>
|
Merging due to the need to build RC2. @marcellorinaldo please add coverage as required https://sonarcloud.io/component_measures?id=org.eclipse.kura%3Akura&branch=PR-4529&metric=new_coverage&view=list |
github-actions bot
pushed a commit
that referenced
this pull request
Apr 8, 2023
* fix(dnsmasq): configs are for specific interfaces, removed global options Signed-off-by: Marcello Martina <[email protected]> * feat(linux.net.dhcp.server): addes dnsmasq more robust isRunning detection, manage global confs file Signed-off-by: Marcello Martina <[email protected]> * build(test): versions refactor Signed-off-by: Marcello Martina <[email protected]> * style: added constants Signed-off-by: Marcello Martina <[email protected]> * fix: applied review suggestions Signed-off-by: Marcello Martina <[email protected]> * fix: the router is always passed, since by default it is the localhost Signed-off-by: Marcello Martina <[email protected]> * fix: disabled option 6 when passDns=false Signed-off-by: Marcello Martina <[email protected]> * test: updated dnsmasq test case Signed-off-by: Marcello Martina <[email protected]> * fix: dhcp option key duplication Signed-off-by: MMaiero <[email protected]> --------- Signed-off-by: Marcello Martina <[email protected]> Signed-off-by: MMaiero <[email protected]> Co-authored-by: MMaiero <[email protected]> (cherry picked from commit 51bd7c2)
MMaiero
pushed a commit
that referenced
this pull request
Apr 8, 2023
…release-5.3.0] (#4561) feat(dnsmasq): support for multiple DHCP server interfaces (#4529) * fix(dnsmasq): configs are for specific interfaces, removed global options Signed-off-by: Marcello Martina <[email protected]> * feat(linux.net.dhcp.server): addes dnsmasq more robust isRunning detection, manage global confs file Signed-off-by: Marcello Martina <[email protected]> * build(test): versions refactor Signed-off-by: Marcello Martina <[email protected]> * style: added constants Signed-off-by: Marcello Martina <[email protected]> * fix: applied review suggestions Signed-off-by: Marcello Martina <[email protected]> * fix: the router is always passed, since by default it is the localhost Signed-off-by: Marcello Martina <[email protected]> * fix: disabled option 6 when passDns=false Signed-off-by: Marcello Martina <[email protected]> * test: updated dnsmasq test case Signed-off-by: Marcello Martina <[email protected]> * fix: dhcp option key duplication Signed-off-by: MMaiero <[email protected]> --------- Signed-off-by: Marcello Martina <[email protected]> Signed-off-by: MMaiero <[email protected]> Co-authored-by: MMaiero <[email protected]> (cherry picked from commit 51bd7c2) Co-authored-by: Marcello Rinaldo Martina <[email protected]>
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.
This PR writes the
dnsmasqconfiguration so that each property has associated a connection label, allowing for multiple interfaces to be set as DHCP server at the same time.Related Issue: N/A.
Description of the solution adopted: The
dhcp-rangeproperty creates a label for each activated interface. Each DHCP interface configuration is put on a file that follows the pattern:It is not allowed in dnsmasq to have global settings specified more than once across all files. Hence, a global configuration is written and maintained by the DHCP server manager. The created global configuration file is:
Screenshots: N/A.
Any side note on the changes made: Created more robust way to detect change in configuration in the method
isRunning. It wouldn't trigger on NM configuration update.