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

feat(linux.net): Add a Dhcp Server lease file for interface #4905

Merged
merged 24 commits into from
Nov 2, 2023
Merged
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
f1cc436
Added lease file for dhcpd
pierantoniomerlino Oct 19, 2023
614bf76
Added lease file for udhcpd
pierantoniomerlino Oct 19, 2023
d19dd97
Fixed leases filename
pierantoniomerlino Oct 20, 2023
47865ae
Implemented converter to get dhcp server configuration
pierantoniomerlino Oct 20, 2023
7c64fc4
Added dnsmasq config converter
pierantoniomerlino Oct 20, 2023
08e1679
Added missing end of lines
pierantoniomerlino Oct 20, 2023
7bafafd
Updated DhcpServerWriter for NM
pierantoniomerlino Oct 20, 2023
5004815
Removed empty line
pierantoniomerlino Oct 24, 2023
82d906d
Fixed dhcpd config file generation
pierantoniomerlino Oct 25, 2023
71fbf84
Removed foreground option to udhcpd command
pierantoniomerlino Oct 25, 2023
90d205f
Set auto_time to 30s for udhcpd
pierantoniomerlino Oct 25, 2023
a908dc5
Added lease file in dnsmasq config; small refactor
pierantoniomerlino Oct 25, 2023
e869555
Added dnsmasq lease file as global parameter
pierantoniomerlino Oct 26, 2023
d2c500b
Fixed dnsmasq lease file creation
pierantoniomerlino Oct 26, 2023
0e2194c
Updated dhcp leases read feature; refactor
pierantoniomerlino Oct 27, 2023
0f61d9c
Updated test for dhcp server leases parse
pierantoniomerlino Oct 30, 2023
2b1c917
Added tests for dhcp server config converters
pierantoniomerlino Oct 30, 2023
59ee7a2
Fixed net.admin tests
pierantoniomerlino Oct 30, 2023
945b4c0
Fixed nm tests
pierantoniomerlino Oct 30, 2023
ffb8250
Revert configuration tests
pierantoniomerlino Oct 30, 2023
794f35d
Fixed sonar complains
pierantoniomerlino Oct 31, 2023
7497ea1
Updated copyright; changed exception management
pierantoniomerlino Oct 31, 2023
356e55d
Removed useless directive from manifest
pierantoniomerlino Oct 31, 2023
48c7f80
Removed regex for dhcpd lease parsing
pierantoniomerlino Nov 2, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixed net.admin tests
Signed-off-by: pierantoniomerlino <[email protected]>
pierantoniomerlino committed Oct 30, 2023
commit 59ee7a2c814d23b4df33b23d31b43acc1ab23c1f
Original file line number Diff line number Diff line change
@@ -16,7 +16,6 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doAnswer;
@@ -452,7 +451,7 @@ protected List<NetworkConfigurationVisitor> getVisitors() {

List<AD> ads = ocd.getAD();
assertNotNull(ads);
assertEquals(130, ads.size());
assertEquals(124, ads.size());

int adsConfigured = 0;
for (AD ad : ads) {
Original file line number Diff line number Diff line change
@@ -187,7 +187,7 @@ private void verifyUdhcpdFile(String configFilename) throws IOException {
assertTrue(s.contains("interface testinterface"));
assertTrue(s.contains("pidfile /var/run/udhcpd-testinterface.pid"));
assertTrue(s.contains("max_leases 5"));
assertTrue(s.contains("auto_time 0"));
assertTrue(s.contains("auto_time 30"));
assertTrue(s.contains("decline_time 900"));
assertTrue(s.contains("conflict_time 900"));
assertTrue(s.contains("offer_time 900"));