From 72e04ea31cac3ea2541205bffec44d24cefd346c Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 25 Jul 2019 12:38:57 +0900 Subject: [PATCH] test-network: use [DHCPv4] and [DHCPv6] sections instead of deprecated [DHCP] section --- test/test-network/conf/dhcp-client-anonymize.network | 2 +- test/test-network/conf/dhcp-client-ipv4-dhcp-settings.network | 2 +- test/test-network/conf/dhcp-client-ipv6-rapid-commit.network | 2 +- test/test-network/conf/dhcp-client-listen-port.network | 5 +++-- .../conf/dhcp-client-reassign-static-routes-ipv4.network | 2 +- test/test-network/conf/dhcp-client-route-metric.network | 2 +- test/test-network/conf/dhcp-client-route-table.network | 2 +- test/test-network/conf/dhcp-client-timezone-router.network | 2 +- test/test-network/conf/dhcp-client-use-dns-ipv4-and-ra.network | 2 +- test/test-network/conf/dhcp-client-use-dns-no.network | 5 ++++- test/test-network/conf/dhcp-client-use-dns-yes.network | 5 ++++- .../dhcp-client-with-ipv4ll-fallback-without-dhcp-server.network | 2 +- test/test-network/systemd-networkd-tests.py | 4 ---- 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 a910cba..b92bdc9 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 ebe3b7c..41d6ea4 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 52fa587..72dfbf1 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 73ac364..b7d779d 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 0c97ef5..829b480 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 aa04aae..39496d9 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 75f16aa..d3a442e 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 23e0464..9662c00 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 ed59895..dfb9f75 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 891efdb..b928759 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 f38ffe3..4655b69 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 7faff5f..5489c62 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 aa8a7a9..49a04f3 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') -- 2.7.4