morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

test-network: update KeepConfiguration=dhcp -> dynamic

Browse Source
This commit is contained in:
Yu Watanabe
2024-11-05 12:17:51 +09:00
parent c8a7c81427
commit bbef21e4e5
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/test-network/conf/25-dhcp-client-keep-configuration-dhcp-on-stop.network → test/test-network/conf/25-dhcp-client-keep-configuration-dynamic-on-stop.network
View File

@@ -5,4 +5,4 @@ Name=veth99
[Network]
DHCP=ipv4
IPv6AcceptRA=false
KeepConfiguration=dhcp-on-stop
KeepConfiguration=dynamic-on-stop

2
test/test-network/conf/25-dhcp-client-keep-configuration-dhcp.network → test/test-network/conf/25-dhcp-client-keep-configuration-dynamic.network
View File

@@ -5,4 +5,4 @@ Name=veth99
[Network]
DHCP=ipv4
IPv6AcceptRA=false
KeepConfiguration=dhcp
KeepConfiguration=dynamic

10
test/test-network/systemd-networkd-tests.py
View File

@@ -7277,10 +7277,10 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities):
self.assertNotIn('test-hostname', output)
self.assertNotIn('26:mtu', output)
def test_dhcp_keep_configuration_dhcp(self):
def test_dhcp_keep_configuration_dynamic(self):
copy_network_unit('25-veth.netdev',
'25-dhcp-server-veth-peer.network',
'25-dhcp-client-keep-configuration-dhcp.network')
'25-dhcp-client-keep-configuration-dynamic.network')
start_networkd()
self.wait_online('veth-peer:carrier')
start_dnsmasq()
@@ -7312,7 +7312,7 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities):
self.assertRegex(output, r'inet 192.168.5.[0-9]*/24 metric 1024 brd 192.168.5.255 scope global veth99\n *'
'valid_lft forever preferred_lft forever')
with open(os.path.join(network_unit_dir, '25-dhcp-client-keep-configuration-dhcp.network'), mode='a', encoding='utf-8') as f:
with open(os.path.join(network_unit_dir, '25-dhcp-client-keep-configuration-dynamic.network'), mode='a', encoding='utf-8') as f:
f.write('[Network]\nDHCP=no\n')
start_networkd()
@@ -7324,10 +7324,10 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities):
self.assertRegex(output, r'inet 192.168.5.[0-9]*/24 metric 1024 brd 192.168.5.255 scope global veth99\n *'
'valid_lft forever preferred_lft forever')
def test_dhcp_keep_configuration_dhcp_on_stop(self):
def test_dhcp_keep_configuration_dynamic_on_stop(self):
copy_network_unit('25-veth.netdev',
'25-dhcp-server-veth-peer.network',
'25-dhcp-client-keep-configuration-dhcp-on-stop.network')
'25-dhcp-client-keep-configuration-dynamic-on-stop.network')
start_networkd()
self.wait_online('veth-peer:carrier')
start_dnsmasq()