From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 5 Nov 2024 03:17:51 +0000 (+0900)
Subject: test-network: update KeepConfiguration=dhcp -> dynamic
X-Git-Tag: v257-rc2~23^2
X-Git-Url: http://git-history.diyao.me/?a=commitdiff_plain;h=bbef21e4e5c449191aaff51c2c78c5272eeebc11;p=systemd%2F.git

test-network: update KeepConfiguration=dhcp -> dynamic
---

diff --git a/test/test-network/conf/25-dhcp-client-keep-configuration-dhcp-on-stop.network b/test/test-network/conf/25-dhcp-client-keep-configuration-dhcp-on-stop.network
deleted file mode 100644
index 9a737f32c1..0000000000
--- a/test/test-network/conf/25-dhcp-client-keep-configuration-dhcp-on-stop.network
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Match]
-Name=veth99
-
-[Network]
-DHCP=ipv4
-IPv6AcceptRA=false
-KeepConfiguration=dhcp-on-stop
diff --git a/test/test-network/conf/25-dhcp-client-keep-configuration-dhcp.network b/test/test-network/conf/25-dhcp-client-keep-configuration-dhcp.network
deleted file mode 100644
index c72af5628d..0000000000
--- a/test/test-network/conf/25-dhcp-client-keep-configuration-dhcp.network
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Match]
-Name=veth99
-
-[Network]
-DHCP=ipv4
-IPv6AcceptRA=false
-KeepConfiguration=dhcp
diff --git a/test/test-network/conf/25-dhcp-client-keep-configuration-dynamic-on-stop.network b/test/test-network/conf/25-dhcp-client-keep-configuration-dynamic-on-stop.network
new file mode 100644
index 0000000000..8badfe34b8
--- /dev/null
+++ b/test/test-network/conf/25-dhcp-client-keep-configuration-dynamic-on-stop.network
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+[Match]
+Name=veth99
+
+[Network]
+DHCP=ipv4
+IPv6AcceptRA=false
+KeepConfiguration=dynamic-on-stop
diff --git a/test/test-network/conf/25-dhcp-client-keep-configuration-dynamic.network b/test/test-network/conf/25-dhcp-client-keep-configuration-dynamic.network
new file mode 100644
index 0000000000..f599fb8b1e
--- /dev/null
+++ b/test/test-network/conf/25-dhcp-client-keep-configuration-dynamic.network
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+[Match]
+Name=veth99
+
+[Network]
+DHCP=ipv4
+IPv6AcceptRA=false
+KeepConfiguration=dynamic
diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py
index 5ae57dd951..e603e6087a 100755
--- a/test/test-network/systemd-networkd-tests.py
+++ b/test/test-network/systemd-networkd-tests.py
@@ -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()