SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #21210 from yuwata/network-dhcp-server-introduce-router-setting

Browse Source 
network: dhcp-server: introduce Router= setting to specify router address
This commit is contained in:
Yu Watanabe
2021-11-03 12:41:34 +09:00
committed by GitHub
parent 2f2cdd7250 32d97330df
commit ab7b261663
10 changed files with 40 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/fuzz/fuzz-network-parser/directives.network
+1
View File
@@ -379,6 +379,7 @@ SMTP=
EmitLPR=
LPR=
EmitRouter=
Router=
MaxLeaseTimeSec=
DefaultLeaseTimeSec=
EmitTimezone=
test/test-network/conf/dhcp-server.network
+1
View File
@@ -11,3 +11,4 @@ ServerAddress=192.168.5.1/24
PoolOffset=10
PoolSize=50
UplinkInterface=dummy98
Router=192.168.5.3
test/test-network/systemd-networkd-tests.py
+8 -8
View File
@@ -3989,10 +3989,10 @@ class NetworkdDHCPServerTests(unittest.TestCase, Utilities):
output = check_output(*networkctl_cmd, '-n', '0', 'status', 'veth99', env=env)
print(output)
self.assertRegex(output, '192.168.5.*')
self.assertRegex(output, 'Gateway: 192.168.5.1')
self.assertRegex(output, 'DNS: 192.168.5.1')
self.assertRegex(output, 'NTP: 192.168.5.1')
self.assertRegex(output, 'Address: 192.168.5.[0-9]* \(DHCP4 via 192.168.5.1\)')
self.assertIn('Gateway: 192.168.5.3', output)
self.assertIn('DNS: 192.168.5.1', output)
self.assertIn('NTP: 192.168.5.1', output)
def test_emit_router_timezone(self):
copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-client-timezone-router.network', 'dhcp-server-timezone-router.network')
@@ -4001,9 +4001,9 @@ class NetworkdDHCPServerTests(unittest.TestCase, Utilities):
output = check_output(*networkctl_cmd, '-n', '0', 'status', 'veth99', env=env)
print(output)
self.assertRegex(output, 'Gateway: 192.168.5.*')
self.assertRegex(output, '192.168.5.*')
self.assertRegex(output, 'Europe/Berlin')
self.assertRegex(output, 'Address: 192.168.5.[0-9]* \(DHCP4 via 192.168.5.1\)')
self.assertIn('Gateway: 192.168.5.1', output)
self.assertIn('Time Zone: Europe/Berlin', output)
def test_dhcp_server_static_lease(self):
copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-client-static-lease.network', 'dhcp-server-static-lease.network')
@@ -4012,7 +4012,7 @@ class NetworkdDHCPServerTests(unittest.TestCase, Utilities):
output = check_output(*networkctl_cmd, '-n', '0', 'status', 'veth99', env=env)
print(output)
self.assertIn('10.1.1.200 (DHCP4 via 10.1.1.1)', output)
self.assertIn('Address: 10.1.1.200 (DHCP4 via 10.1.1.1)', output)
class NetworkdDHCPServerRelayAgentTests(unittest.TestCase, Utilities):
links = [