shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +03:00
Code

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

Browse Source
This commit is contained in:
Yu Watanabe 2019-07-25 12:38:57 +09:00
parent 26ce7c3bc8
commit 72e04ea31c
13 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/test-network/conf/dhcp-client-anonymize.network
View File

@ -5,7 +5,7 @@ Name=veth99
DHCP=ipv4
IPv6AcceptRA=false
[DHCP]
[DHCPv4]
Anonymize=true
UseMTU=true
UseRoutes=true

2
test/test-network/conf/dhcp-client-ipv4-dhcp-settings.network
View File

@ -5,7 +5,7 @@ Name=veth99
DHCP=ipv4
IPv6AcceptRA=false
[DHCP]
[DHCPv4]
UseMTU=true
UseRoutes=true
SendHostname=true

2
test/test-network/conf/dhcp-client-ipv6-rapid-commit.network
View File

@ -4,5 +4,5 @@ Name=veth99
[Network]
DHCP=ipv6
[DHCP]
[DHCPv6]
RapidCommit=false

5
test/test-network/conf/dhcp-client-listen-port.network
View File

@ -2,7 +2,8 @@
Name=veth99
[Network]
DHCP=yes
DHCP=ipv4
IPv6AcceptRA=no
[DHCP]
[DHCPv4]
ListenPort=5555

2
test/test-network/conf/dhcp-client-reassign-static-routes-ipv4.network
View File

@ -14,5 +14,5 @@ Destination=192.168.6.0/24
[Route]
Destination=192.168.7.0/24
[DHCP]
[DHCPv4]
UseRoutes=no

2
test/test-network/conf/dhcp-client-route-metric.network
View File

@ -5,6 +5,6 @@ Name=veth99
DHCP=ipv4
IPv6AcceptRA=false
[DHCP]
[DHCPv4]
UseRoutes=true
RouteMetric=24

2
test/test-network/conf/dhcp-client-route-table.network
View File

@ -5,6 +5,6 @@ Name=veth99
DHCP=ipv4
IPv6AcceptRA=false
[DHCP]
[DHCPv4]
UseRoutes=true
RouteTable=12

2
test/test-network/conf/dhcp-client-timezone-router.network
View File

@ -5,6 +5,6 @@ Name=veth99
IPv6AcceptRA=false
DHCP=ipv4
[DHCP]
[DHCPv4]
UseRoutes=true
UseTimezone=true

2
test/test-network/conf/dhcp-client-use-dns-ipv4-and-ra.network
View File

@ -4,7 +4,7 @@ Name=veth99
[Network]
DHCP=ipv4
[DHCP]
[DHCPv4]
UseDNS=yes
[IPv6AcceptRA]

5
test/test-network/conf/dhcp-client-use-dns-no.network
View File

@ -4,7 +4,10 @@ Name=veth99
[Network]
DHCP=yes
[DHCP]
[DHCPv4]
UseDNS=no
[DHCPv6]
UseDNS=no
[IPv6AcceptRA]

5
test/test-network/conf/dhcp-client-use-dns-yes.network
View File

@ -4,7 +4,10 @@ Name=veth99
[Network]
DHCP=yes
[DHCP]
[DHCPv4]
UseDNS=yes
[DHCPv6]
UseDNS=yes
[IPv6AcceptRA]

2
test/test-network/conf/dhcp-client-with-ipv4ll-fallback-without-dhcp-server.network
View File

@ -6,5 +6,5 @@ DHCP=ipv4
LinkLocalAddressing=fallback
IPv6AcceptRA=no
[DHCP]
[DHCPv4]
MaxAttempts=1

4
test/test-network/systemd-networkd-tests.py
View File

@ -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')