test-network: use [DHCPv4] and [DHCPv6] sections instead of deprecated [DHCP] section

13 files changed, 20 insertions, 17 deletions

diff --git a/test/test-network/conf/dhcp-client-anonymize.network b/test/test-network/conf/dhcp-client-anonymize.network
index a910cba0f7..b92bdc90a9 100644
--- a/test/test-network/conf/dhcp-client-anonymize.network
+++ b/test/test-network/conf/dhcp-client-anonymize.network
@@ -5,7 +5,7 @@ Name=veth99
 DHCP=ipv4
 IPv6AcceptRA=false
 
-[DHCP]
+[DHCPv4]
 Anonymize=true
 UseMTU=true
 UseRoutes=true
diff --git a/test/test-network/conf/dhcp-client-ipv4-dhcp-settings.network b/test/test-network/conf/dhcp-client-ipv4-dhcp-settings.network
index ebe3b7c0dd..41d6ea40fa 100644
--- a/test/test-network/conf/dhcp-client-ipv4-dhcp-settings.network
+++ b/test/test-network/conf/dhcp-client-ipv4-dhcp-settings.network
@@ -5,7 +5,7 @@ Name=veth99
 DHCP=ipv4
 IPv6AcceptRA=false
 
-[DHCP]
+[DHCPv4]
 UseMTU=true
 UseRoutes=true
 SendHostname=true
diff --git a/test/test-network/conf/dhcp-client-ipv6-rapid-commit.network b/test/test-network/conf/dhcp-client-ipv6-rapid-commit.network
index 52fa58729e..72dfbf1389 100644
--- a/test/test-network/conf/dhcp-client-ipv6-rapid-commit.network
+++ b/test/test-network/conf/dhcp-client-ipv6-rapid-commit.network
@@ -4,5 +4,5 @@ Name=veth99
 [Network]
 DHCP=ipv6
 
-[DHCP]
+[DHCPv6]
 RapidCommit=false
diff --git a/test/test-network/conf/dhcp-client-listen-port.network b/test/test-network/conf/dhcp-client-listen-port.network
index 73ac364630..b7d779dc43 100644
--- a/test/test-network/conf/dhcp-client-listen-port.network
+++ b/test/test-network/conf/dhcp-client-listen-port.network
@@ -2,7 +2,8 @@
 Name=veth99
 
 [Network]
-DHCP=yes
+DHCP=ipv4
+IPv6AcceptRA=no
 
-[DHCP]
+[DHCPv4]
 ListenPort=5555
diff --git a/test/test-network/conf/dhcp-client-reassign-static-routes-ipv4.network b/test/test-network/conf/dhcp-client-reassign-static-routes-ipv4.network
index 0c97ef5d8a..829b4804f8 100644
--- a/test/test-network/conf/dhcp-client-reassign-static-routes-ipv4.network
+++ b/test/test-network/conf/dhcp-client-reassign-static-routes-ipv4.network
@@ -14,5 +14,5 @@ Destination=192.168.6.0/24
 [Route]
 Destination=192.168.7.0/24
 
-[DHCP]
+[DHCPv4]
 UseRoutes=no
diff --git a/test/test-network/conf/dhcp-client-route-metric.network b/test/test-network/conf/dhcp-client-route-metric.network
index aa04aaef33..39496d9a27 100644
--- a/test/test-network/conf/dhcp-client-route-metric.network
+++ b/test/test-network/conf/dhcp-client-route-metric.network
@@ -5,6 +5,6 @@ Name=veth99
 DHCP=ipv4
 IPv6AcceptRA=false
 
-[DHCP]
+[DHCPv4]
 UseRoutes=true
 RouteMetric=24
diff --git a/test/test-network/conf/dhcp-client-route-table.network b/test/test-network/conf/dhcp-client-route-table.network
index 75f16aa22d..d3a442e486 100644
--- a/test/test-network/conf/dhcp-client-route-table.network
+++ b/test/test-network/conf/dhcp-client-route-table.network
@@ -5,6 +5,6 @@ Name=veth99
 DHCP=ipv4
 IPv6AcceptRA=false
 
-[DHCP]
+[DHCPv4]
 UseRoutes=true
 RouteTable=12
diff --git a/test/test-network/conf/dhcp-client-timezone-router.network b/test/test-network/conf/dhcp-client-timezone-router.network
index 23e04649de..9662c00a23 100644
--- a/test/test-network/conf/dhcp-client-timezone-router.network
+++ b/test/test-network/conf/dhcp-client-timezone-router.network
@@ -5,6 +5,6 @@ Name=veth99
 IPv6AcceptRA=false
 DHCP=ipv4
 
-[DHCP]
+[DHCPv4]
 UseRoutes=true
 UseTimezone=true
diff --git a/test/test-network/conf/dhcp-client-use-dns-ipv4-and-ra.network b/test/test-network/conf/dhcp-client-use-dns-ipv4-and-ra.network
index ed5989555c..dfb9f752be 100644
--- a/test/test-network/conf/dhcp-client-use-dns-ipv4-and-ra.network
+++ b/test/test-network/conf/dhcp-client-use-dns-ipv4-and-ra.network
@@ -4,7 +4,7 @@ Name=veth99
 [Network]
 DHCP=ipv4
 
-[DHCP]
+[DHCPv4]
 UseDNS=yes
 
 [IPv6AcceptRA]
diff --git a/test/test-network/conf/dhcp-client-use-dns-no.network b/test/test-network/conf/dhcp-client-use-dns-no.network
index 891efdbe12..b928759c77 100644
--- a/test/test-network/conf/dhcp-client-use-dns-no.network
+++ b/test/test-network/conf/dhcp-client-use-dns-no.network
@@ -4,7 +4,10 @@ Name=veth99
 [Network]
 DHCP=yes
 
-[DHCP]
+[DHCPv4]
+UseDNS=no
+
+[DHCPv6]
 UseDNS=no
 
 [IPv6AcceptRA]
diff --git a/test/test-network/conf/dhcp-client-use-dns-yes.network b/test/test-network/conf/dhcp-client-use-dns-yes.network
index f38ffe36e3..4655b69f1a 100644
--- a/test/test-network/conf/dhcp-client-use-dns-yes.network
+++ b/test/test-network/conf/dhcp-client-use-dns-yes.network
@@ -4,7 +4,10 @@ Name=veth99
 [Network]
 DHCP=yes
 
-[DHCP]
+[DHCPv4]
+UseDNS=yes
+
+[DHCPv6]
 UseDNS=yes
 
 [IPv6AcceptRA]
diff --git a/test/test-network/conf/dhcp-client-with-ipv4ll-fallback-without-dhcp-server.network b/test/test-network/conf/dhcp-client-with-ipv4ll-fallback-without-dhcp-server.network
index 7faff5f9e5..5489c62a54 100644
--- a/test/test-network/conf/dhcp-client-with-ipv4ll-fallback-without-dhcp-server.network
+++ b/test/test-network/conf/dhcp-client-with-ipv4ll-fallback-without-dhcp-server.network
@@ -6,5 +6,5 @@ DHCP=ipv4
 LinkLocalAddressing=fallback
 IPv6AcceptRA=no
 
-[DHCP]
+[DHCPv4]
 MaxAttempts=1
diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py
index aa8a7a9afe..49a04f313a 100755
--- a/test/test-network/systemd-networkd-tests.py
+++ b/test/test-network/systemd-networkd-tests.py
@@ -2538,10 +2538,6 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities):
         start_dnsmasq('--dhcp-alternate-port=67,5555')
         self.wait_online(['veth99:routable', 'veth-peer:routable'])
 
-        # link become 'routable' when at least one protocol provide an valid address.
-        self.wait_address('veth99', r'inet 192.168.5.[0-9]*/24 brd 192.168.5.255 scope global dynamic', ipv='-4')
-        self.wait_address('veth99', r'inet6 2600::[0-9a-f]*/128 scope global (?:dynamic noprefixroute|noprefixroute dynamic)', ipv='-6')
-
         output = check_output('ip -4 address show dev veth99')
         print(output)
         self.assertRegex(output, '192.168.5.* dynamic')