From: Yu Watanabe Date: Mon, 30 Dec 2024 02:18:59 +0000 (+0900) Subject: test-network: add test cases for global [DHCPv4] ClientIdentifier= setting X-Git-Tag: v258-rc1~1749^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5e5fe05896babe72346b387acdedbd67a4f0578d;p=thirdparty%2Fsystemd.git test-network: add test cases for global [DHCPv4] ClientIdentifier= setting --- diff --git a/test/test-network/conf/10-dhcp-client-id-duid.conf b/test/test-network/conf/10-dhcp-client-id-duid.conf new file mode 100644 index 00000000000..8d87fb0c7c4 --- /dev/null +++ b/test/test-network/conf/10-dhcp-client-id-duid.conf @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[DHCPv4] +ClientIdentifier=duid diff --git a/test/test-network/conf/10-dhcp-client-id-mac.conf b/test/test-network/conf/10-dhcp-client-id-mac.conf new file mode 100644 index 00000000000..130e9162f16 --- /dev/null +++ b/test/test-network/conf/10-dhcp-client-id-mac.conf @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[DHCPv4] +ClientIdentifier=mac diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 136a6ed7448..9203948d6ca 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -6742,8 +6742,9 @@ class NetworkdDHCPServerTests(unittest.TestCase, Utilities): self.assertIn('Gateway: 192.168.5.1', output) self.assertIn('Time Zone: Europe/Berlin', output) - def test_dhcp_server_static_lease(self): + def test_dhcp_server_static_lease_mac_by_network(self): copy_network_unit('25-veth.netdev', '25-dhcp-client-static-lease.network', '25-dhcp-server-static-lease.network') + copy_networkd_conf_dropin('10-dhcp-client-id-duid.conf') start_networkd() self.wait_online('veth99:routable', 'veth-peer:routable') @@ -6752,7 +6753,18 @@ class NetworkdDHCPServerTests(unittest.TestCase, Utilities): self.assertIn('Address: 10.1.1.200 (DHCPv4 via 10.1.1.1)', output) self.assertIn('DHCPv4 Client ID: 12:34:56:78:9a:bc', output) - def test_dhcp_server_static_lease_default_client_id(self): + def test_dhcp_server_static_lease_mac_by_global(self): + copy_network_unit('25-veth.netdev', '25-dhcp-client.network', '25-dhcp-server-static-lease.network') + copy_networkd_conf_dropin('10-dhcp-client-id-mac.conf') + start_networkd() + self.wait_online('veth99:routable', 'veth-peer:routable') + + output = networkctl_status('veth99') + print(output) + self.assertIn('Address: 10.1.1.200 (DHCPv4 via 10.1.1.1)', output) + self.assertIn('DHCPv4 Client ID: 12:34:56:78:9a:bc', output) + + def test_dhcp_server_static_lease_duid(self): copy_network_unit('25-veth.netdev', '25-dhcp-client.network', '25-dhcp-server-static-lease.network') start_networkd() self.wait_online('veth99:routable', 'veth-peer:routable')