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

diff --git a/test/test-network/conf/dhcp-client-anonymize.network b/test/test-network/conf/dhcp-client-anonymize.network
index a910cba0f72dc989c9fda896a165df8f7dcdee9b..b92bdc90a9e4fbb6553304ee9d2607499cfe5ca2 100644 (file)
--- 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 ebe3b7c0dd1b29212473f870f2de92b910f3eb50..41d6ea40faefc0be07de928efbfa531b96b357e6 100644 (file)
--- 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 52fa58729e765e295633e413e008de2ab6170592..72dfbf13895da1ee9ca3737a511a83088e2bf443 100644 (file)
--- 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 73ac364630ce948753fdc605a6d1943a1806d0c8..b7d779dc43bf8c4c4bade81e8b9cbeccd6925dd4 100644 (file)
--- 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 0c97ef5d8a7d52b2b97080271c0dd076e150fecc..829b4804f80676909fa1ceb6dfdc9d4efdf09e32 100644 (file)
--- 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 aa04aaef333058bc95bd9ea6d6afd212f758cdfe..39496d9a279a377cd1ff39e75314ce9d8215b6be 100644 (file)
--- 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 75f16aa22d632e7dfcab8d5a82fe675c2237e8aa..d3a442e486979bc4f210d45601d382d3937575b0 100644 (file)
--- 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 23e04649dee8edce1aa425a52dc8b8b48c0330b1..9662c00a23d355d598c0d92624aa27d4436dfe3d 100644 (file)
--- 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 ed5989555c32e1602ff6fa30f8fac1b9f8d82623..dfb9f752be30ffa715df242be62caa36da4c9a18 100644 (file)
--- 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 891efdbe1218cee9cff4a0b505e153f8e933c862..b928759c7797aeb7233966d75d298caa3a8510f9 100644 (file)
--- 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 f38ffe36e3f8c3c65e6246c5421f6f7f696058e3..4655b69f1aae418f929c475c1a1e3a32f72836e3 100644 (file)
--- 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 7faff5f9e57d30b331ae21dca6072f5cdf2a6097..5489c62a54e60d9a0c23c37aaef05c6914f3a3b2 100644 (file)
--- 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 aa8a7a9afeaf886332c238d4a131b7ffd0f4dcfa..49a04f313a827c5e33657639e5bb34e108a53e2c 100755 (executable)
--- 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')