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-dynamic-on-stop.network
similarity index 75%
rename from test/test-network/conf/25-dhcp-client-keep-configuration-dhcp-on-stop.network
rename to test/test-network/conf/25-dhcp-client-keep-configuration-dynamic-on-stop.network
index 9a737f32c1d7d182ef19e6aae6c83bafaaf845a1..8badfe34b830ee96af1314658c19e2bb48b20819 100644 (file)
--- a/test/test-network/conf/25-dhcp-client-keep-configuration-dhcp-on-stop.network
+++ b/test/test-network/conf/25-dhcp-client-keep-configuration-dynamic-on-stop.network
@@ -5,4 +5,4 @@ Name=veth99
 [Network]
 DHCP=ipv4
 IPv6AcceptRA=false
-KeepConfiguration=dhcp-on-stop
+KeepConfiguration=dynamic-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-dynamic.network
similarity index 80%
rename from test/test-network/conf/25-dhcp-client-keep-configuration-dhcp.network
rename to test/test-network/conf/25-dhcp-client-keep-configuration-dynamic.network
index c72af5628d429c6d598dfe20d6c32bbbe2a336ff..f599fb8b1ec833cb54e6913d909ab04fc7b7f67d 100644 (file)
--- a/test/test-network/conf/25-dhcp-client-keep-configuration-dhcp.network
+++ b/test/test-network/conf/25-dhcp-client-keep-configuration-dynamic.network
@@ -5,4 +5,4 @@ Name=veth99
 [Network]
 DHCP=ipv4
 IPv6AcceptRA=false
-KeepConfiguration=dhcp
+KeepConfiguration=dynamic

diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py
index 5ae57dd951d7cbc3758d7b1ce35feaef156e519c..e603e6087a8934eae3bb493ce392d99aaa2f05c4 100755 (executable)
--- 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()