diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-07-08 16:32:38 +0900 |
|---|---|---|
| committer | Frantisek Sumsal <frantisek@sumsal.cz> | 2022-07-08 13:04:02 +0000 |
| commit | 18f2638f481288c70777771fc6a60608b8c58c68 (patch) | |
| tree | 5b63d82cd76a24147db63131941a45830567a5ef /test/test-network/conf | |
| parent | 4707ffa8a3155ed7f35cceaf0773623cd345fe05 (diff) | |
| download | systemd-18f2638f481288c70777771fc6a60608b8c58c68.tar.gz | |
test-network: merge DHCP client tests to improve performance
Diffstat (limited to 'test/test-network/conf')
10 files changed, 40 insertions, 101 deletions
diff --git a/test/test-network/conf/25-dhcp-client-gateway-ipv4.network b/test/test-network/conf/25-dhcp-client-gateway-ipv4.network deleted file mode 100644 index e1c7d6c062..0000000000 --- a/test/test-network/conf/25-dhcp-client-gateway-ipv4.network +++ /dev/null @@ -1,11 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -DHCP=ipv4 -IPv6AcceptRA=no - -[Route] -Gateway=_dhcp4 -Destination=10.0.0.0/8 diff --git a/test/test-network/conf/25-dhcp-client-ipv4-dhcp-settings.network b/test/test-network/conf/25-dhcp-client-ipv4-dhcp-settings.network deleted file mode 100644 index f144013e9c..0000000000 --- a/test/test-network/conf/25-dhcp-client-ipv4-dhcp-settings.network +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -DHCP=ipv4 -IPv6AcceptRA=false - -[DHCPv4] -UseMTU=true -UseRoutes=true -SendHostname=true -UseHostname=true -Hostname=test-hostname -ClientIdentifier=mac -VendorClassIdentifier=SusantVendorTest -RouteTable=211 -Label=test-label diff --git a/test/test-network/conf/25-dhcp-client-ipv4-ipv6.network b/test/test-network/conf/25-dhcp-client-ipv4-ipv6.network new file mode 100644 index 0000000000..fe5a7ab058 --- /dev/null +++ b/test/test-network/conf/25-dhcp-client-ipv4-ipv6.network @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth99 + +[Network] +DHCP=ipv4 +# Even if the DHCPv6 client is disabled in config, IPv6AcceptRA=yes +# (which is enabled by default) implies the DHCPv6 client. diff --git a/test/test-network/conf/25-dhcp-client-ipv4-only-ipv6-disabled.network b/test/test-network/conf/25-dhcp-client-ipv4-only-ipv6-disabled.network deleted file mode 100644 index 228cdf3d52..0000000000 --- a/test/test-network/conf/25-dhcp-client-ipv4-only-ipv6-disabled.network +++ /dev/null @@ -1,11 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -DHCP=ipv4 -IPv6AcceptRA=false - -[DHCPv4] -RoutesToDNS=yes -SendOption=12:string:test diff --git a/test/test-network/conf/25-dhcp-client-ipv4-only.network b/test/test-network/conf/25-dhcp-client-ipv4-only.network index 797d56a263..a71c5c9af1 100644 --- a/test/test-network/conf/25-dhcp-client-ipv4-only.network +++ b/test/test-network/conf/25-dhcp-client-ipv4-only.network @@ -4,3 +4,35 @@ Name=veth99 [Network] DHCP=ipv4 +IPv6AcceptRA=no +Address=192.168.5.250 + +[DHCPv4] +UseDomains=yes +UseMTU=yes +UseRoutes=yes +RoutesToDNS=yes +RouteTable=211 +RouteMetric=24 +UseHostname=yes +Hostname=test-hostname +SendOption=12:string:test +SendHostname=yes +ClientIdentifier=mac +VendorClassIdentifier=FooBarVendorTest +Label=test-label +ListenPort=5555 + +[Route] +Destination=192.168.5.0/24 + +[Route] +Destination=192.168.6.0/24 + +[Route] +Destination=192.168.7.0/24 + +[Route] +Gateway=_dhcp4 +Destination=10.0.0.0/8 +Table=211 diff --git a/test/test-network/conf/25-dhcp-client-listen-port.network b/test/test-network/conf/25-dhcp-client-listen-port.network deleted file mode 100644 index f51444a20d..0000000000 --- a/test/test-network/conf/25-dhcp-client-listen-port.network +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -DHCP=ipv4 -IPv6AcceptRA=no - -[DHCPv4] -ListenPort=5555 diff --git a/test/test-network/conf/25-dhcp-client-reassign-static-routes-ipv4.network b/test/test-network/conf/25-dhcp-client-reassign-static-routes-ipv4.network deleted file mode 100644 index 4bf69eb2c0..0000000000 --- a/test/test-network/conf/25-dhcp-client-reassign-static-routes-ipv4.network +++ /dev/null @@ -1,19 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -DHCP=ipv4 -IPv6AcceptRA=no - -[Route] -Destination=192.168.5.0/24 - -[Route] -Destination=192.168.6.0/24 - -[Route] -Destination=192.168.7.0/24 - -[DHCPv4] -UseRoutes=no diff --git a/test/test-network/conf/25-dhcp-client-route-metric.network b/test/test-network/conf/25-dhcp-client-route-metric.network deleted file mode 100644 index 74613cb839..0000000000 --- a/test/test-network/conf/25-dhcp-client-route-metric.network +++ /dev/null @@ -1,11 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -DHCP=ipv4 -IPv6AcceptRA=false - -[DHCPv4] -UseRoutes=true -RouteMetric=24 diff --git a/test/test-network/conf/25-dhcp-client-route-table.network b/test/test-network/conf/25-dhcp-client-route-table.network deleted file mode 100644 index 94aa1fd12c..0000000000 --- a/test/test-network/conf/25-dhcp-client-route-table.network +++ /dev/null @@ -1,11 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -DHCP=ipv4 -IPv6AcceptRA=false - -[DHCPv4] -UseRoutes=true -RouteTable=12 diff --git a/test/test-network/conf/25-dhcp-client-use-domains.network b/test/test-network/conf/25-dhcp-client-use-domains.network deleted file mode 100644 index af321d87c2..0000000000 --- a/test/test-network/conf/25-dhcp-client-use-domains.network +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -DHCP=ipv4 -IPv6AcceptRA=no - -[DHCPv4] -UseDomains=yes |