From a7143aa453d9396c5b21b8d237bd096e0e39c9cf Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Feb 18 2022 12:22:30 +0000 Subject: [PATCH 1/6] network: xfrm: refuse zero interface ID Since kernel 5.17-rc1, 5.16.3, and 5.15.17 (more specifically, https://github.com/torvalds/linux/commit/8dce43919566f06e865f7e8949f5c10d8c2493f5) the kernel refuses to create an xfrm interface with zero ID. --- diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml index f49f3e8..04c00be 100644 --- a/man/systemd.netdev.xml +++ b/man/systemd.netdev.xml @@ -1985,7 +1985,7 @@ InterfaceId= Sets the ID/key of the xfrm interface which needs to be associated with a SA/policy. - Can be decimal or hexadecimal, valid range is 0-0xffffffff, defaults to 0. + Can be decimal or hexadecimal, valid range is 1-0xffffffff. This is mandatory. diff --git a/src/network/netdev/xfrm.c b/src/network/netdev/xfrm.c index 4b7e73b..ef5e735 100644 --- a/src/network/netdev/xfrm.c +++ b/src/network/netdev/xfrm.c @@ -14,6 +14,7 @@ static int xfrm_fill_message_create(NetDev *netdev, Link *link, sd_netlink_messa x = XFRM(netdev); + assert(x); assert(link || x->independent); r = sd_netlink_message_append_u32(message, IFLA_XFRM_LINK, link ? link->ifindex : LOOPBACK_IFINDEX); @@ -27,10 +28,28 @@ static int xfrm_fill_message_create(NetDev *netdev, Link *link, sd_netlink_messa return 0; } +static int xfrm_verify(NetDev *netdev, const char *filename) { + Xfrm *x; + + assert(netdev); + assert(filename); + + x = XFRM(netdev); + + assert(x); + + if (x->if_id == 0) + return log_netdev_warning_errno(netdev, SYNTHETIC_ERRNO(EINVAL), + "%s: Xfrm interface ID cannot be zero.", filename); + + return 0; +} + const NetDevVTable xfrm_vtable = { .object_size = sizeof(Xfrm), .sections = NETDEV_COMMON_SECTIONS "Xfrm\0", .fill_message_create = xfrm_fill_message_create, + .config_verify = xfrm_verify, .create_type = NETDEV_CREATE_STACKED, .iftype = ARPHRD_NONE, }; From b77ec1121291d8f56b98e3b7ebc773999852b067 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Feb 18 2022 12:22:35 +0000 Subject: [PATCH 2/6] test-network: set xfrm interface ID This also unifies two tests for xfrm, and checks the output of 'ip link' command. Fixes #22329. --- diff --git a/test/test-network/conf/25-xfrm-independent.netdev b/test/test-network/conf/25-xfrm-independent.netdev index b237884..b54c659 100644 --- a/test/test-network/conf/25-xfrm-independent.netdev +++ b/test/test-network/conf/25-xfrm-independent.netdev @@ -4,4 +4,5 @@ Kind=xfrm Name=xfrm99 [Xfrm] +InterfaceId=0x99 Independent=yes diff --git a/test/test-network/conf/25-xfrm.netdev b/test/test-network/conf/25-xfrm.netdev index 353bfb7..8e1d5c8 100644 --- a/test/test-network/conf/25-xfrm.netdev +++ b/test/test-network/conf/25-xfrm.netdev @@ -1,4 +1,7 @@ # SPDX-License-Identifier: LGPL-2.1-or-later [NetDev] Kind=xfrm -Name=xfrm99 +Name=xfrm98 + +[Xfrm] +InterfaceId=0x98 diff --git a/test/test-network/conf/netdev-link-local-addressing-yes.network b/test/test-network/conf/netdev-link-local-addressing-yes.network index 0cc9cfa..ea1811b 100644 --- a/test/test-network/conf/netdev-link-local-addressing-yes.network +++ b/test/test-network/conf/netdev-link-local-addressing-yes.network @@ -18,7 +18,7 @@ Name=geneve99 Name=ifb99 Name=ipiptun99 Name=nlmon99 -Name=xfrm99 +Name=xfrm98 xfrm99 Name=vxlan98 Name=hogehogehogehogehogehoge diff --git a/test/test-network/conf/xfrm.network b/test/test-network/conf/xfrm.network index c852601..19f2214 100644 --- a/test/test-network/conf/xfrm.network +++ b/test/test-network/conf/xfrm.network @@ -4,4 +4,4 @@ Name=dummy98 [Network] IPv6AcceptRA=no -Xfrm=xfrm99 +Xfrm=xfrm98 diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index cc450ae..af9a49b 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -871,6 +871,7 @@ class NetworkctlTests(unittest.TestCase, Utilities): class NetworkdNetDevTests(unittest.TestCase, Utilities): links_remove_earlier = [ + 'xfrm98', 'xfrm99', ] @@ -1759,20 +1760,21 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): @expectedFailureIfModuleIsNotAvailable('xfrm_interface') def test_xfrm(self): copy_unit_to_networkd_unit_path('12-dummy.netdev', 'xfrm.network', - '25-xfrm.netdev', 'netdev-link-local-addressing-yes.network') + '25-xfrm.netdev', '25-xfrm-independent.netdev', + 'netdev-link-local-addressing-yes.network') start_networkd() - self.wait_online(['xfrm99:degraded', 'dummy98:degraded']) + self.wait_online(['dummy98:degraded', 'xfrm98:degraded', 'xfrm99:degraded']) - output = check_output('ip link show dev xfrm99') + output = check_output('ip -d link show dev xfrm98') print(output) + self.assertIn('xfrm98@dummy98:', output) + self.assertIn('xfrm if_id 0x98 ', output) - @expectedFailureIfModuleIsNotAvailable('xfrm_interface') - def test_xfrm_independent(self): - copy_unit_to_networkd_unit_path('25-xfrm-independent.netdev', 'netdev-link-local-addressing-yes.network') - start_networkd() - - self.wait_online(['xfrm99:degraded']) + output = check_output('ip -d link show dev xfrm99') + print(output) + self.assertIn('xfrm99@lo:', output) + self.assertIn('xfrm if_id 0x99 ', output) @expectedFailureIfModuleIsNotAvailable('fou') def test_fou(self): From 01b37db45438419921e6e51ec1423a07896b5436 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Feb 18 2022 12:22:41 +0000 Subject: [PATCH 3/6] mkosi: Support running systemd-networkd-tests.py in QEMU This commit adds the necessary packages for Fedora and Arch. --- diff --git a/mkosi.default.d/arch/10-mkosi.arch b/mkosi.default.d/arch/10-mkosi.arch index 19bc45a..0458889 100644 --- a/mkosi.default.d/arch/10-mkosi.arch +++ b/mkosi.default.d/arch/10-mkosi.arch @@ -63,3 +63,8 @@ Packages= # For testing systemd's zsh completion scripts # Run `autoload -Uz compinit; compinit` from a zsh shell in the booted image to enable completions. zsh + # Required to run systemd-networkd-tests.py + iproute + dnsmasq + wireguard-tools + dhcp diff --git a/mkosi.default.d/fedora/10-mkosi.fedora b/mkosi.default.d/fedora/10-mkosi.fedora index d68405e..4886431 100644 --- a/mkosi.default.d/fedora/10-mkosi.fedora +++ b/mkosi.default.d/fedora/10-mkosi.fedora @@ -75,3 +75,10 @@ Packages= netcat e2fsprogs compsize + # Required to run systemd-networkd-tests.py + iproute + iproute-tc + dnsmasq + wireguard-tools + dhcp-server + kernel-modules-extra diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index af9a49b..a4460d4 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -2,6 +2,9 @@ # SPDX-License-Identifier: LGPL-2.1-or-later # systemd-networkd tests +# These tests can be executed in the systemd mkosi image when booted in QEMU. After booting the QEMU VM, +# simply run this file which can be found in the VM at /root/src/test/test-network/systemd-networkd-tests.py. + import argparse import errno import itertools From c85ac2c07f4669baafcc53190d82e222855dab32 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Feb 18 2022 12:22:41 +0000 Subject: [PATCH 4/6] test: Skip test_macsec() until kernel panic is fixed --- diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index a4460d4..f5f887c 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -1850,6 +1850,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.assertIn('00:00:00:00:00:00 dst fe80::27c:16ff:fec0:6c74 via test1 self permanent', output) self.assertIn('00:00:00:00:00:00 dst fe80::2a2:e4ff:fef9:2269 via test1 self permanent', output) + @unittest.skip(reason="Causes kernel panic on recent kernels: https://bugzilla.kernel.org/show_bug.cgi?id=208315") def test_macsec(self): copy_unit_to_networkd_unit_path('25-macsec.netdev', '25-macsec.network', '25-macsec.key', 'macsec.network', '12-dummy.netdev') From dd10225aed0f7067b032d0c0dc6e811577a34ca4 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Feb 18 2022 12:23:33 +0000 Subject: [PATCH 5/6] test: Prefix all network/netdev config files used by systemd-networkd-tests.py Let's make sure these take preference over any generic network config files shipped by the OS (in this case specifically, mkosi). --- diff --git a/test/test-network/conf/25-6rd.network b/test/test-network/conf/25-6rd.network new file mode 100644 index 0000000..0caa396 --- /dev/null +++ b/test/test-network/conf/25-6rd.network @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=dummy98 + +[Network] +IPv6AcceptRA=no +Tunnel=sittun99 diff --git a/test/test-network/conf/25-agent-client-peer.network b/test/test-network/conf/25-agent-client-peer.network new file mode 100644 index 0000000..e31108b --- /dev/null +++ b/test/test-network/conf/25-agent-client-peer.network @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=client-peer + +[Network] +Address=192.168.6.2/24 +DHCPServer=yes +IPForward=ipv4 +IPv6AcceptRA=no + +[DHCPServer] +RelayTarget=192.168.5.1 +BindToInterface=no +RelayAgentCircuitId=string:sample_circuit_id +RelayAgentRemoteId=string:sample_remote_id diff --git a/test/test-network/conf/25-agent-client.network b/test/test-network/conf/25-agent-client.network new file mode 100644 index 0000000..cfa7e5a --- /dev/null +++ b/test/test-network/conf/25-agent-client.network @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=client + +[Network] +DHCP=yes +IPForward=ipv4 +IPv6AcceptRA=no diff --git a/test/test-network/conf/25-agent-server-peer.network b/test/test-network/conf/25-agent-server-peer.network new file mode 100644 index 0000000..1f6fa4b --- /dev/null +++ b/test/test-network/conf/25-agent-server-peer.network @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=server-peer + +[Network] +Address=192.168.5.2/24 +IPForward=ipv4 +IPv6AcceptRA=no diff --git a/test/test-network/conf/25-agent-server.network b/test/test-network/conf/25-agent-server.network new file mode 100644 index 0000000..905508f --- /dev/null +++ b/test/test-network/conf/25-agent-server.network @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=server + +[Network] +Address=192.168.5.1/24 +IPForward=ipv4 +DHCPServer=yes +IPv6AcceptRA=no + +[DHCPServer] +BindToInterface=no +PoolOffset=150 +PoolSize=1 +DNS=192.168.5.1 +NTP=192.168.5.1 diff --git a/test/test-network/conf/25-agent-veth-client.netdev b/test/test-network/conf/25-agent-veth-client.netdev new file mode 100644 index 0000000..e52e43a --- /dev/null +++ b/test/test-network/conf/25-agent-veth-client.netdev @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[NetDev] +Name=client +Kind=veth +MACAddress=12:34:56:78:9a:bc + +[Peer] +Name=client-peer +MACAddress=12:34:56:78:9a:bd diff --git a/test/test-network/conf/25-agent-veth-server.netdev b/test/test-network/conf/25-agent-veth-server.netdev new file mode 100644 index 0000000..1427024 --- /dev/null +++ b/test/test-network/conf/25-agent-veth-server.netdev @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[NetDev] +Name=server +Kind=veth +MACAddress=12:34:56:78:9b:bc + +[Peer] +Name=server-peer +MACAddress=12:34:56:78:9b:bd diff --git a/test/test-network/conf/25-bond-slave.network b/test/test-network/conf/25-bond-slave.network new file mode 100644 index 0000000..12228a3 --- /dev/null +++ b/test/test-network/conf/25-bond-slave.network @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=dummy98 test1 + +[Network] +Bond=bond99 + +# Settings below should be ignored +IPv6AcceptRA=yes +LinkLocalAddressing=yes +DHCP=yes +Address=192.168.25.3/24 +Gateway=192.168.25.1 diff --git a/test/test-network/conf/25-bond99.network b/test/test-network/conf/25-bond99.network new file mode 100644 index 0000000..09da6a0 --- /dev/null +++ b/test/test-network/conf/25-bond99.network @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=bond99 + +[Network] +IPv6AcceptRA=no +Address=192.168.123.45/24 diff --git a/test/test-network/conf/25-bridge99-ignore-carrier-loss.network b/test/test-network/conf/25-bridge99-ignore-carrier-loss.network new file mode 100644 index 0000000..1c1b342 --- /dev/null +++ b/test/test-network/conf/25-bridge99-ignore-carrier-loss.network @@ -0,0 +1,14 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=bridge99 + +[Network] +Address=192.168.0.15/24 +Gateway=192.168.0.1 +IPv6AcceptRA=no +IgnoreCarrierLoss=true +ConfigureWithoutCarrier=true + +[RoutingPolicyRule] +To=8.8.8.8 +Table=100 diff --git a/test/test-network/conf/25-bridge99.network b/test/test-network/conf/25-bridge99.network new file mode 100644 index 0000000..07ef254 --- /dev/null +++ b/test/test-network/conf/25-bridge99.network @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=bridge99 + +[Network] +Address=192.168.0.15/24 +Gateway=192.168.0.1 +IPv6AcceptRA=no diff --git a/test/test-network/conf/25-dhcp-client-allow-list.network b/test/test-network/conf/25-dhcp-client-allow-list.network new file mode 100644 index 0000000..b8a49a0 --- /dev/null +++ b/test/test-network/conf/25-dhcp-client-allow-list.network @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth99 + +[Network] +DHCP=ipv4 +IPv6AcceptRA=false + +[DHCPv4] +# DenyList= will be ignored +AllowList=192.168.5.0/24 192.168.6.0/24 +DenyList=192.168.5.0/24 diff --git a/test/test-network/conf/25-dhcp-client-anonymize.network b/test/test-network/conf/25-dhcp-client-anonymize.network new file mode 100644 index 0000000..fb356ce --- /dev/null +++ b/test/test-network/conf/25-dhcp-client-anonymize.network @@ -0,0 +1,17 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth99 + +[Network] +DHCP=ipv4 +IPv6AcceptRA=false + +[DHCPv4] +Anonymize=true +UseMTU=true +UseRoutes=true +SendHostname=true +UseHostname=true +Hostname=test-hostname +ClientIdentifier=mac +VendorClassIdentifier=SusantVendorTest diff --git a/test/test-network/conf/25-dhcp-client-decline.network b/test/test-network/conf/25-dhcp-client-decline.network new file mode 100644 index 0000000..ea1a2d0 --- /dev/null +++ b/test/test-network/conf/25-dhcp-client-decline.network @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth99 + +[Network] +DHCP=ipv4 +IPv6AcceptRA=false + +[DHCPv4] +SendDecline=yes diff --git a/test/test-network/conf/25-dhcp-client-gateway-ipv4.network b/test/test-network/conf/25-dhcp-client-gateway-ipv4.network new file mode 100644 index 0000000..e1c7d6c --- /dev/null +++ b/test/test-network/conf/25-dhcp-client-gateway-ipv4.network @@ -0,0 +1,11 @@ +# 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-gateway-ipv6.network b/test/test-network/conf/25-dhcp-client-gateway-ipv6.network new file mode 100644 index 0000000..11a2fee --- /dev/null +++ b/test/test-network/conf/25-dhcp-client-gateway-ipv6.network @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth99 + +[Network] +DHCP=ipv6 + +[Route] +Gateway=_ipv6ra +Destination=2001:1234:5:9fff:ff:ff:ff:ff/128 diff --git a/test/test-network/conf/25-dhcp-client-gateway-onlink-implicit.network b/test/test-network/conf/25-dhcp-client-gateway-onlink-implicit.network new file mode 100644 index 0000000..e133051 --- /dev/null +++ b/test/test-network/conf/25-dhcp-client-gateway-onlink-implicit.network @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth99 + +[Network] +DHCP=ipv4 +IPv6AcceptRA=no + +[Route] +Gateway=192.168.0.1 +Destination=10.0.0.0/8 + +[Route] +Gateway=192.168.0.1 +Destination=192.168.100.0/24 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 new file mode 100644 index 0000000..f144013 --- /dev/null +++ b/test/test-network/conf/25-dhcp-client-ipv4-dhcp-settings.network @@ -0,0 +1,18 @@ +# 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-ipv6ra-prefix-client-with-delay.network b/test/test-network/conf/25-dhcp-client-ipv4-ipv6ra-prefix-client-with-delay.network new file mode 100644 index 0000000..ff5b98a --- /dev/null +++ b/test/test-network/conf/25-dhcp-client-ipv4-ipv6ra-prefix-client-with-delay.network @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth99 + +[NetworkEmulator] +DelaySec=9 + +[Network] +DHCP=ipv4 +IPv6AcceptRA=true 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 new file mode 100644 index 0000000..228cdf3 --- /dev/null +++ b/test/test-network/conf/25-dhcp-client-ipv4-only-ipv6-disabled.network @@ -0,0 +1,11 @@ +# 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 new file mode 100644 index 0000000..797d56a --- /dev/null +++ b/test/test-network/conf/25-dhcp-client-ipv4-only.network @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth99 + +[Network] +DHCP=ipv4 diff --git a/test/test-network/conf/25-dhcp-client-ipv4-use-routes-use-gateway.network b/test/test-network/conf/25-dhcp-client-ipv4-use-routes-use-gateway.network new file mode 100644 index 0000000..43702d5 --- /dev/null +++ b/test/test-network/conf/25-dhcp-client-ipv4-use-routes-use-gateway.network @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth99 + +[Network] +DHCP=ipv4 +IPv6AcceptRA=false diff --git a/test/test-network/conf/25-dhcp-client-ipv4-use-routes-use-gateway.network.d/use-dns-and-ntp-routes-False.conf b/test/test-network/conf/25-dhcp-client-ipv4-use-routes-use-gateway.network.d/use-dns-and-ntp-routes-False.conf new file mode 100644 index 0000000..76383ab --- /dev/null +++ b/test/test-network/conf/25-dhcp-client-ipv4-use-routes-use-gateway.network.d/use-dns-and-ntp-routes-False.conf @@ -0,0 +1,3 @@ +[DHCPv4] +RoutesToDNS=no +RoutesToNTP=no diff --git a/test/test-network/conf/25-dhcp-client-ipv4-use-routes-use-gateway.network.d/use-dns-and-ntp-routes-True.conf b/test/test-network/conf/25-dhcp-client-ipv4-use-routes-use-gateway.network.d/use-dns-and-ntp-routes-True.conf new file mode 100644 index 0000000..6d6b1ed --- /dev/null +++ b/test/test-network/conf/25-dhcp-client-ipv4-use-routes-use-gateway.network.d/use-dns-and-ntp-routes-True.conf @@ -0,0 +1,3 @@ +[DHCPv4] +RoutesToDNS=yes +RoutesToNTP=yes diff --git a/test/test-network/conf/25-dhcp-client-ipv4-use-routes-use-gateway.network.d/use-gateway-False.conf b/test/test-network/conf/25-dhcp-client-ipv4-use-routes-use-gateway.network.d/use-gateway-False.conf new file mode 100644 index 0000000..78d0493 --- /dev/null +++ b/test/test-network/conf/25-dhcp-client-ipv4-use-routes-use-gateway.network.d/use-gateway-False.conf @@ -0,0 +1,2 @@ +[DHCPv4] +UseGateway=no diff --git a/test/test-network/conf/25-dhcp-client-ipv4-use-routes-use-gateway.network.d/use-gateway-True.conf b/test/test-network/conf/25-dhcp-client-ipv4-use-routes-use-gateway.network.d/use-gateway-True.conf new file mode 100644 index 0000000..f6f597b --- /dev/null +++ b/test/test-network/conf/25-dhcp-client-ipv4-use-routes-use-gateway.network.d/use-gateway-True.conf @@ -0,0 +1,2 @@ +[DHCPv4] +UseGateway=yes diff --git a/test/test-network/conf/25-dhcp-client-ipv4-use-routes-use-gateway.network.d/use-routes-False.conf b/test/test-network/conf/25-dhcp-client-ipv4-use-routes-use-gateway.network.d/use-routes-False.conf new file mode 100644 index 0000000..38fa983 --- /dev/null +++ b/test/test-network/conf/25-dhcp-client-ipv4-use-routes-use-gateway.network.d/use-routes-False.conf @@ -0,0 +1,2 @@ +[DHCPv4] +UseRoutes=no diff --git a/test/test-network/conf/25-dhcp-client-ipv4-use-routes-use-gateway.network.d/use-routes-True.conf b/test/test-network/conf/25-dhcp-client-ipv4-use-routes-use-gateway.network.d/use-routes-True.conf new file mode 100644 index 0000000..3b2d0ab --- /dev/null +++ b/test/test-network/conf/25-dhcp-client-ipv4-use-routes-use-gateway.network.d/use-routes-True.conf @@ -0,0 +1,2 @@ +[DHCPv4] +UseRoutes=yes diff --git a/test/test-network/conf/25-dhcp-client-ipv6-only.network b/test/test-network/conf/25-dhcp-client-ipv6-only.network new file mode 100644 index 0000000..f287428 --- /dev/null +++ b/test/test-network/conf/25-dhcp-client-ipv6-only.network @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth99 + +[Network] +DHCP=ipv6 +IPv6Token=::1a:2b:3c:4d diff --git a/test/test-network/conf/25-dhcp-client-keep-configuration-dhcp-on-stop.network b/test/test-network/conf/25-dhcp-client-keep-configuration-dhcp-on-stop.network new file mode 100644 index 0000000..9a737f3 --- /dev/null +++ b/test/test-network/conf/25-dhcp-client-keep-configuration-dhcp-on-stop.network @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth99 + +[Network] +DHCP=ipv4 +IPv6AcceptRA=false +KeepConfiguration=dhcp-on-stop diff --git a/test/test-network/conf/25-dhcp-client-keep-configuration-dhcp.network b/test/test-network/conf/25-dhcp-client-keep-configuration-dhcp.network new file mode 100644 index 0000000..c72af56 --- /dev/null +++ b/test/test-network/conf/25-dhcp-client-keep-configuration-dhcp.network @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth99 + +[Network] +DHCP=ipv4 +IPv6AcceptRA=false +KeepConfiguration=dhcp diff --git a/test/test-network/conf/25-dhcp-client-listen-port.network b/test/test-network/conf/25-dhcp-client-listen-port.network new file mode 100644 index 0000000..f51444a --- /dev/null +++ b/test/test-network/conf/25-dhcp-client-listen-port.network @@ -0,0 +1,10 @@ +# 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 new file mode 100644 index 0000000..4bf69eb --- /dev/null +++ b/test/test-network/conf/25-dhcp-client-reassign-static-routes-ipv4.network @@ -0,0 +1,19 @@ +# 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-reassign-static-routes-ipv6.network b/test/test-network/conf/25-dhcp-client-reassign-static-routes-ipv6.network new file mode 100644 index 0000000..8a8b087 --- /dev/null +++ b/test/test-network/conf/25-dhcp-client-reassign-static-routes-ipv6.network @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth99 + +[Network] +IPv6AcceptRA=yes + +[Route] +Destination=2600:0:0:1::/64 diff --git a/test/test-network/conf/25-dhcp-client-route-metric.network b/test/test-network/conf/25-dhcp-client-route-metric.network new file mode 100644 index 0000000..74613cb --- /dev/null +++ b/test/test-network/conf/25-dhcp-client-route-metric.network @@ -0,0 +1,11 @@ +# 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 new file mode 100644 index 0000000..94aa1fd --- /dev/null +++ b/test/test-network/conf/25-dhcp-client-route-table.network @@ -0,0 +1,11 @@ +# 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-static-lease.network b/test/test-network/conf/25-dhcp-client-static-lease.network new file mode 100644 index 0000000..f9405f8 --- /dev/null +++ b/test/test-network/conf/25-dhcp-client-static-lease.network @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth99 + +[Network] +IPv6AcceptRA=no +DHCP=ipv4 + +[DHCPv4] +ClientIdentifier=mac diff --git a/test/test-network/conf/25-dhcp-client-timezone-router.network b/test/test-network/conf/25-dhcp-client-timezone-router.network new file mode 100644 index 0000000..ae04827 --- /dev/null +++ b/test/test-network/conf/25-dhcp-client-timezone-router.network @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth99 + +[Network] +IPv6AcceptRA=false +DHCP=ipv4 + +[DHCPv4] +UseRoutes=true +UseTimezone=true diff --git a/test/test-network/conf/25-dhcp-client-use-dns-ipv4-and-ra.network b/test/test-network/conf/25-dhcp-client-use-dns-ipv4-and-ra.network new file mode 100644 index 0000000..b11a578 --- /dev/null +++ b/test/test-network/conf/25-dhcp-client-use-dns-ipv4-and-ra.network @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth99 + +[Network] +DHCP=ipv4 + +[DHCPv4] +UseDNS=yes + +[IPv6AcceptRA] +UseDNS=yes diff --git a/test/test-network/conf/25-dhcp-client-use-dns-ipv4.network b/test/test-network/conf/25-dhcp-client-use-dns-ipv4.network new file mode 100644 index 0000000..5fbda20 --- /dev/null +++ b/test/test-network/conf/25-dhcp-client-use-dns-ipv4.network @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth99 + +[Network] +DHCP=ipv4 + +[DHCPv4] +UseDNS=yes + +[DHCPv6] +UseDNS=no + +[IPv6AcceptRA] +UseDNS=no diff --git a/test/test-network/conf/25-dhcp-client-use-dns-no.network b/test/test-network/conf/25-dhcp-client-use-dns-no.network new file mode 100644 index 0000000..9b651c1 --- /dev/null +++ b/test/test-network/conf/25-dhcp-client-use-dns-no.network @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth99 + +[Network] +DHCP=yes + +[DHCPv4] +UseDNS=no + +[DHCPv6] +UseDNS=no + +[IPv6AcceptRA] +UseDNS=no diff --git a/test/test-network/conf/25-dhcp-client-use-dns-yes.network b/test/test-network/conf/25-dhcp-client-use-dns-yes.network new file mode 100644 index 0000000..787a84d --- /dev/null +++ b/test/test-network/conf/25-dhcp-client-use-dns-yes.network @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth99 + +[Network] +DHCP=yes + +[DHCPv4] +UseDNS=yes + +[DHCPv6] +UseDNS=yes + +[IPv6AcceptRA] +UseDNS=no diff --git a/test/test-network/conf/25-dhcp-client-use-domains.network b/test/test-network/conf/25-dhcp-client-use-domains.network new file mode 100644 index 0000000..af321d8 --- /dev/null +++ b/test/test-network/conf/25-dhcp-client-use-domains.network @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth99 + +[Network] +DHCP=ipv4 +IPv6AcceptRA=no + +[DHCPv4] +UseDomains=yes diff --git a/test/test-network/conf/25-dhcp-client-vrf.network b/test/test-network/conf/25-dhcp-client-vrf.network new file mode 100644 index 0000000..98388eb --- /dev/null +++ b/test/test-network/conf/25-dhcp-client-vrf.network @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth99 + +[Network] +DHCP=yes +IPv6AcceptRA=yes +VRF=vrf99 diff --git a/test/test-network/conf/25-dhcp-client-with-ipv4ll.network b/test/test-network/conf/25-dhcp-client-with-ipv4ll.network new file mode 100644 index 0000000..5a81026 --- /dev/null +++ b/test/test-network/conf/25-dhcp-client-with-ipv4ll.network @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth99 + +[Network] +DHCP=ipv4 +LinkLocalAddressing=yes +IPv6AcceptRA=no diff --git a/test/test-network/conf/25-dhcp-client-with-static-address.network b/test/test-network/conf/25-dhcp-client-with-static-address.network new file mode 100644 index 0000000..7c9d949 --- /dev/null +++ b/test/test-network/conf/25-dhcp-client-with-static-address.network @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth99 + +[Network] +DHCP=ipv4 +IPv6AcceptRA=no +Address=192.168.5.250 diff --git a/test/test-network/conf/25-dhcp-client.network b/test/test-network/conf/25-dhcp-client.network new file mode 100644 index 0000000..c633839 --- /dev/null +++ b/test/test-network/conf/25-dhcp-client.network @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth99 + +[Network] +DHCP=yes diff --git a/test/test-network/conf/25-dhcp-pd-downstream-dummy97.network b/test/test-network/conf/25-dhcp-pd-downstream-dummy97.network new file mode 100644 index 0000000..e3e41a0 --- /dev/null +++ b/test/test-network/conf/25-dhcp-pd-downstream-dummy97.network @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=dummy97 + +[Network] +IPv6PrivacyExtensions=yes +IPv6AcceptRA=no +DHCP=no +DHCPPrefixDelegation=yes + +[DHCPPrefixDelegation] +UplinkInterface=veth99 +SubnetId=1 +Announce=no +Token=eui64 +Token=::1a:2b:3c:4d diff --git a/test/test-network/conf/25-dhcp-pd-downstream-dummy98.network b/test/test-network/conf/25-dhcp-pd-downstream-dummy98.network new file mode 100644 index 0000000..3109068 --- /dev/null +++ b/test/test-network/conf/25-dhcp-pd-downstream-dummy98.network @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=dummy98 + +[Network] +IPv6PrivacyExtensions=yes +IPv6AcceptRA=no +DHCP=no +DHCPPrefixDelegation=yes + +[DHCPPrefixDelegation] +UplinkInterface=veth99 +SubnetId=2 +Announce=no +Token=eui64 +Token=::1a:2b:3c:4d diff --git a/test/test-network/conf/25-dhcp-pd-downstream-dummy99.network b/test/test-network/conf/25-dhcp-pd-downstream-dummy99.network new file mode 100644 index 0000000..01c1d55 --- /dev/null +++ b/test/test-network/conf/25-dhcp-pd-downstream-dummy99.network @@ -0,0 +1,14 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=dummy99 + +[Network] +IPv6PrivacyExtensions=yes +IPv6AcceptRA=no +DHCP=no +DHCPPrefixDelegation=yes + +[DHCPPrefixDelegation] +UplinkInterface=veth99 +Assign=no +Announce=no diff --git a/test/test-network/conf/25-dhcp-pd-downstream-test1.network b/test/test-network/conf/25-dhcp-pd-downstream-test1.network new file mode 100644 index 0000000..a8720c3 --- /dev/null +++ b/test/test-network/conf/25-dhcp-pd-downstream-test1.network @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=test1 + +[Network] +IPv6PrivacyExtensions=yes +IPv6AcceptRA=no +DHCP=no +DHCPPrefixDelegation=yes + +[DHCPPrefixDelegation] +UplinkInterface=veth99 +SubnetId=0 +Announce=no +Token=eui64 +Token=::1a:2b:3c:4d diff --git a/test/test-network/conf/25-dhcp-pd-downstream-veth97-peer.network b/test/test-network/conf/25-dhcp-pd-downstream-veth97-peer.network new file mode 100644 index 0000000..555fefa --- /dev/null +++ b/test/test-network/conf/25-dhcp-pd-downstream-veth97-peer.network @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth97-peer + +[Network] +IPv6PrivacyExtensions=yes +IPv6AcceptRA=yes + +[IPv6AcceptRA] +Token=eui64 +Token=::1a:2b:3c:4e diff --git a/test/test-network/conf/25-dhcp-pd-downstream-veth97.network b/test/test-network/conf/25-dhcp-pd-downstream-veth97.network new file mode 100644 index 0000000..daf1e9d --- /dev/null +++ b/test/test-network/conf/25-dhcp-pd-downstream-veth97.network @@ -0,0 +1,20 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth97 + +[Network] +IPv6PrivacyExtensions=yes +IPv6AcceptRA=no +DHCP=no +DHCPPrefixDelegation=yes +IPv6SendRA=yes + +[DHCPPrefixDelegation] +SubnetId=8 +Announce=yes +Token=eui64 +Token=::1a:2b:3c:4d + +[IPv6SendRA] +EmitDNS=no +EmitDomains=no diff --git a/test/test-network/conf/25-dhcp-pd-downstream-veth98-peer.network b/test/test-network/conf/25-dhcp-pd-downstream-veth98-peer.network new file mode 100644 index 0000000..db0aec1 --- /dev/null +++ b/test/test-network/conf/25-dhcp-pd-downstream-veth98-peer.network @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth98-peer + +[Network] +IPv6PrivacyExtensions=yes +IPv6AcceptRA=yes + +[IPv6AcceptRA] +Token=eui64 +Token=::1a:2b:3c:4e diff --git a/test/test-network/conf/25-dhcp-pd-downstream-veth98.network b/test/test-network/conf/25-dhcp-pd-downstream-veth98.network new file mode 100644 index 0000000..ef37700 --- /dev/null +++ b/test/test-network/conf/25-dhcp-pd-downstream-veth98.network @@ -0,0 +1,21 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth98 + +[Network] +IPv6PrivacyExtensions=yes +IPv6AcceptRA=no +DHCP=no +DHCPPrefixDelegation=yes +IPv6SendRA=yes + +[DHCPPrefixDelegation] +UplinkInterface=veth99 +SubnetId=9 +Announce=yes +Token=eui64 +Token=::1a:2b:3c:4d + +[IPv6SendRA] +EmitDNS=no +EmitDomains=no diff --git a/test/test-network/conf/25-dhcp-server-decline.network b/test/test-network/conf/25-dhcp-server-decline.network new file mode 100644 index 0000000..cb8e04a --- /dev/null +++ b/test/test-network/conf/25-dhcp-server-decline.network @@ -0,0 +1,14 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth-peer + +[Network] +Address=192.168.5.1/24 +IPv6AcceptRA=false +DHCPServer=yes + +[DHCPServer] +PoolOffset=10 +PoolSize=100 +DNS=192.168.5.1 +NTP=192.168.5.1 diff --git a/test/test-network/conf/25-dhcp-server-static-lease.network b/test/test-network/conf/25-dhcp-server-static-lease.network new file mode 100644 index 0000000..1f2783d --- /dev/null +++ b/test/test-network/conf/25-dhcp-server-static-lease.network @@ -0,0 +1,18 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth-peer + +[Network] +IPv6AcceptRA=no +Address=10.1.1.1/24 +DHCPServer=yes + +[DHCPServer] +PoolOffset=0 +PoolSize=20 +EmitDNS=yes +DNS=9.9.9.9 + +[DHCPServerStaticLease] +MACAddress=12:34:56:78:9a:bc +Address=10.1.1.200 diff --git a/test/test-network/conf/25-dhcp-server-timezone-router.network b/test/test-network/conf/25-dhcp-server-timezone-router.network new file mode 100644 index 0000000..89a8db1 --- /dev/null +++ b/test/test-network/conf/25-dhcp-server-timezone-router.network @@ -0,0 +1,18 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth-peer + +[Network] +IPv6AcceptRA=false +Address=192.168.5.1/24 +Address=192.168.5.2/24 +DHCPServer=yes + +[DHCPServer] +ServerAddress=192.168.5.1/24 +PoolOffset=10 +PoolSize=50 +EmitRouter=yes +Timezone=Europe/Berlin +DNS=192.168.5.1 +NTP=192.168.5.1 diff --git a/test/test-network/conf/25-dhcp-server-uplink.network b/test/test-network/conf/25-dhcp-server-uplink.network new file mode 100644 index 0000000..59e0b6a --- /dev/null +++ b/test/test-network/conf/25-dhcp-server-uplink.network @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=dummy98 + +[Network] +IPv6AcceptRA=no +Address=192.168.5.2/24 +DNS=192.168.5.1 +NTP=192.168.5.1 diff --git a/test/test-network/conf/25-dhcp-server-veth-peer.network b/test/test-network/conf/25-dhcp-server-veth-peer.network new file mode 100644 index 0000000..d5cc6d3 --- /dev/null +++ b/test/test-network/conf/25-dhcp-server-veth-peer.network @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth-peer + +[Network] +IPv6AcceptRA=no +Address=2600::1/0 +Address=192.168.5.1/24 diff --git a/test/test-network/conf/25-dhcp-server-with-ipv6-prefix.network b/test/test-network/conf/25-dhcp-server-with-ipv6-prefix.network new file mode 100644 index 0000000..13ee90d --- /dev/null +++ b/test/test-network/conf/25-dhcp-server-with-ipv6-prefix.network @@ -0,0 +1,20 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth-peer + +[Network] +Address=192.168.5.1/24 +IPv6AcceptRA=no +DHCPServer=yes +IPv6SendRA=yes + +[IPv6Prefix] +Prefix=2002:da8:1:0::/64 + +[DHCPServer] +DNS=192.168.5.1 +NTP=192.168.5.1 + +[IPv6SendRA] +EmitDNS=no +EmitDomains=no diff --git a/test/test-network/conf/25-dhcp-server.network b/test/test-network/conf/25-dhcp-server.network new file mode 100644 index 0000000..3eb931f --- /dev/null +++ b/test/test-network/conf/25-dhcp-server.network @@ -0,0 +1,14 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth-peer + +[Network] +IPv6AcceptRA=false +DHCPServer=yes + +[DHCPServer] +ServerAddress=192.168.5.1/24 +PoolOffset=10 +PoolSize=50 +UplinkInterface=dummy98 +Router=192.168.5.3 diff --git a/test/test-network/conf/25-dhcp-v4-server-veth-peer.network b/test/test-network/conf/25-dhcp-v4-server-veth-peer.network new file mode 100644 index 0000000..7e1f560 --- /dev/null +++ b/test/test-network/conf/25-dhcp-v4-server-veth-peer.network @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth-peer + +[Network] +IPv6AcceptRA=no +Address=192.168.0.1/24 +Address=192.168.5.1/24 diff --git a/test/test-network/conf/25-dhcp4-6rd-server.network b/test/test-network/conf/25-dhcp4-6rd-server.network new file mode 100644 index 0000000..91dc71a --- /dev/null +++ b/test/test-network/conf/25-dhcp4-6rd-server.network @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth-peer + +[Network] +IPv6AcceptRA=no +Address=10.0.0.1/8 diff --git a/test/test-network/conf/25-dhcp4-6rd-upstream.network b/test/test-network/conf/25-dhcp4-6rd-upstream.network new file mode 100644 index 0000000..e146337 --- /dev/null +++ b/test/test-network/conf/25-dhcp4-6rd-upstream.network @@ -0,0 +1,19 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth99 + +[Network] +IPv6PrivacyExtensions=yes +IPv6AcceptRA=no +DHCP=ipv4 +DHCPPrefixDelegation=yes + +[DHCPv4] +Use6RD=yes + +[DHCPPrefixDelegation] +UplinkInterface=:self +SubnetId=10 +Announce=no +Token=eui64 +Token=::1a:2b:3c:4d diff --git a/test/test-network/conf/25-dhcp6pd-server.network b/test/test-network/conf/25-dhcp6pd-server.network new file mode 100644 index 0000000..f7a8526 --- /dev/null +++ b/test/test-network/conf/25-dhcp6pd-server.network @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth-peer + +[Network] +IPv6AcceptRA=no +Address=3ffe:501:ffff:100::1/64 diff --git a/test/test-network/conf/25-dhcp6pd-upstream.network b/test/test-network/conf/25-dhcp6pd-upstream.network new file mode 100644 index 0000000..4b8cd7d --- /dev/null +++ b/test/test-network/conf/25-dhcp6pd-upstream.network @@ -0,0 +1,19 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth99 + +[Network] +IPv6PrivacyExtensions=yes +IPv6AcceptRA=no +DHCP=ipv6 +DHCPPrefixDelegation=yes + +[DHCPv6] +WithoutRA=solicit + +[DHCPPrefixDelegation] +UplinkInterface=:self +SubnetId=10 +Announce=no +Token=eui64 +Token=::1a:2b:3c:4d diff --git a/test/test-network/conf/25-erspan.network b/test/test-network/conf/25-erspan.network new file mode 100644 index 0000000..c862bae --- /dev/null +++ b/test/test-network/conf/25-erspan.network @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=dummy98 + +[Network] +IPv6AcceptRA=no +Tunnel=erspan99 +Tunnel=erspan98 diff --git a/test/test-network/conf/25-gretap.network b/test/test-network/conf/25-gretap.network new file mode 100644 index 0000000..5e940ed --- /dev/null +++ b/test/test-network/conf/25-gretap.network @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=dummy98 + +[Network] +IPv6AcceptRA=no +Tunnel=gretap99 +Tunnel=gretap98 diff --git a/test/test-network/conf/25-gretun.network b/test/test-network/conf/25-gretun.network new file mode 100644 index 0000000..3e81bed --- /dev/null +++ b/test/test-network/conf/25-gretun.network @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=dummy98 + +[Network] +IPv6AcceptRA=no +Tunnel=gretun99 +Tunnel=gretun98 +Tunnel=gretun97 +Tunnel=gretun96 diff --git a/test/test-network/conf/25-ip6gretap.network b/test/test-network/conf/25-ip6gretap.network new file mode 100644 index 0000000..472072b --- /dev/null +++ b/test/test-network/conf/25-ip6gretap.network @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=dummy98 + +[Network] +IPv6AcceptRA=no +Tunnel=ip6gretap99 +Tunnel=ip6gretap98 diff --git a/test/test-network/conf/25-ip6gretun.network b/test/test-network/conf/25-ip6gretun.network new file mode 100644 index 0000000..17ad558 --- /dev/null +++ b/test/test-network/conf/25-ip6gretun.network @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=dummy98 + +[Network] +IPv6AcceptRA=no +Tunnel=ip6gretun99 +Tunnel=ip6gretun98 +Tunnel=ip6gretun97 +Tunnel=ip6gretun96 diff --git a/test/test-network/conf/25-ip6tnl.network b/test/test-network/conf/25-ip6tnl.network new file mode 100644 index 0000000..a773210 --- /dev/null +++ b/test/test-network/conf/25-ip6tnl.network @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=dummy98 + +[Network] +IPv6AcceptRA=no +Tunnel=ip6tnl99 +Tunnel=ip6tnl98 +Tunnel=ip6tnl97 diff --git a/test/test-network/conf/25-ipip.network b/test/test-network/conf/25-ipip.network new file mode 100644 index 0000000..f359329 --- /dev/null +++ b/test/test-network/conf/25-ipip.network @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=dummy98 + +[Network] +IPv6AcceptRA=no +Tunnel=ipiptun99 +Tunnel=ipiptun98 +Tunnel=ipiptun97 +Tunnel=ipiptun96 diff --git a/test/test-network/conf/25-ipv6-prefix-veth-token-prefixstable-without-address.network b/test/test-network/conf/25-ipv6-prefix-veth-token-prefixstable-without-address.network new file mode 100644 index 0000000..eda4ce1 --- /dev/null +++ b/test/test-network/conf/25-ipv6-prefix-veth-token-prefixstable-without-address.network @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth99 + +[Network] +IPv6AcceptRA=true + +[IPv6AcceptRA] +Token=prefixstable +Token=prefixstable,86b123b969ba4b7eb8b3d8605123525a diff --git a/test/test-network/conf/25-ipv6-prefix-veth-token-prefixstable.network b/test/test-network/conf/25-ipv6-prefix-veth-token-prefixstable.network new file mode 100644 index 0000000..ac50700 --- /dev/null +++ b/test/test-network/conf/25-ipv6-prefix-veth-token-prefixstable.network @@ -0,0 +1,19 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth99 + +[Network] +IPv6AcceptRA=true + +[IPv6AcceptRA] +Token=prefixstable:2002:da8:1:: +Token=prefixstable:2002:da8:1::,86b123b969ba4b7eb8b3d8605123525a +# invalid tokens +Token=prefixstable:2002:da8:1::,00000000000000000000000000000000 +Token=prefixstable:2002:da8:1::, +Token=prefixstable,00000000000000000000000000000000 +Token=prefixstable, +Token=prefixstable@ +Token=static +Token=static: +Token=static::: diff --git a/test/test-network/conf/25-ipv6-prefix-veth-token-static.network b/test/test-network/conf/25-ipv6-prefix-veth-token-static.network new file mode 100644 index 0000000..7c3ae33 --- /dev/null +++ b/test/test-network/conf/25-ipv6-prefix-veth-token-static.network @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth99 + +[Network] +IPv6AcceptRA=true + +[IPv6AcceptRA] +Token=::1a:2b:3c:4d +Token=static:::fa:de:ca:fe +Token=::1a:2b:3c:4d +Token=static:::1a:2b:3c:4d +Token=::fa:de:ca:fe diff --git a/test/test-network/conf/25-ipv6-prefix-veth.network b/test/test-network/conf/25-ipv6-prefix-veth.network new file mode 100644 index 0000000..b6724ea --- /dev/null +++ b/test/test-network/conf/25-ipv6-prefix-veth.network @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth99 + +[Network] +IPv6AcceptRA=true + +[IPv6AcceptRA] +UseDomains=yes diff --git a/test/test-network/conf/25-ipv6-prefix-with-delay.network b/test/test-network/conf/25-ipv6-prefix-with-delay.network new file mode 100644 index 0000000..4b661fe --- /dev/null +++ b/test/test-network/conf/25-ipv6-prefix-with-delay.network @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth-peer + +[NetworkEmulator] +DelaySec=15 + +[Network] +IPv6AcceptRA=no +IPv6SendRA=yes + +[IPv6Prefix] +Prefix=2002:da8:1:0::/64 diff --git a/test/test-network/conf/25-ipv6-prefix.network b/test/test-network/conf/25-ipv6-prefix.network new file mode 100644 index 0000000..9cf8f25 --- /dev/null +++ b/test/test-network/conf/25-ipv6-prefix.network @@ -0,0 +1,22 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth-peer + +[Network] +IPv6AcceptRA=no +IPv6SendRA=yes + +[IPv6SendRA] +DNS=_link_local 2002:da8:1:0::1 +DNSLifetimeSec=1min +Domains=hogehoge.test + +[IPv6Prefix] +Prefix=2002:da8:1:0::/64 +PreferredLifetimeSec=1000s +ValidLifetimeSec=2100s + +[IPv6Prefix] +Prefix=2002:da8:2:0::/64 +PreferredLifetimeSec=1000s +ValidLifetimeSec=2100s diff --git a/test/test-network/conf/25-ipv6ra-prefix-client-deny-list.network b/test/test-network/conf/25-ipv6ra-prefix-client-deny-list.network new file mode 100644 index 0000000..a8b7b0b --- /dev/null +++ b/test/test-network/conf/25-ipv6ra-prefix-client-deny-list.network @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth-peer + +[Network] +DHCP=no +IPv6AcceptRA=yes + +[IPv6AcceptRA] +RouterDenyList=2001::1 +PrefixDenyList=2001:db8:0:2:: +RouteDenyList=2001:db1:fff:: +UseDomains=yes diff --git a/test/test-network/conf/25-ipv6ra-prefix-client-with-static-ipv4-address.network b/test/test-network/conf/25-ipv6ra-prefix-client-with-static-ipv4-address.network new file mode 100644 index 0000000..14c2396 --- /dev/null +++ b/test/test-network/conf/25-ipv6ra-prefix-client-with-static-ipv4-address.network @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth99 + +[Network] +IPv6AcceptRA=true +Address=192.168.5.1/24 diff --git a/test/test-network/conf/25-ipv6ra-prefix-client.network b/test/test-network/conf/25-ipv6ra-prefix-client.network new file mode 100644 index 0000000..a98f61e --- /dev/null +++ b/test/test-network/conf/25-ipv6ra-prefix-client.network @@ -0,0 +1,14 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth-peer + +[Network] +DHCP=no +IPv6AcceptRA=yes + +[IPv6AcceptRA] +# PrefixDenyList= will be ignored. +PrefixAllowList=2001:db8:0:1:: 2001:db8:0:1:: 2001:db8:0:1::/64 +PrefixDenyList=2001:db8:0:1::/64 2001:db8:0:1:: 2001:db8:0:3::/64 +RouteDenyList=2001:db1:fff::/64 2001:db1:fff:: 2001:db2:fff::/64 +UseDomains=yes diff --git a/test/test-network/conf/25-ipv6ra-prefix.network b/test/test-network/conf/25-ipv6ra-prefix.network new file mode 100644 index 0000000..0afdda5 --- /dev/null +++ b/test/test-network/conf/25-ipv6ra-prefix.network @@ -0,0 +1,34 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth99 + +[Network] +DHCP=no +IPv6SendRA=yes + +[IPv6SendRA] +UplinkInterface=dummy98 + +[IPv6Prefix] +Prefix=2001:db8:0:1::/64 + +[IPv6Prefix] +Prefix=2001:db8:0:2::/64 +Assign=yes +Token=::1a:2b:3c:4d +Token=static:::fa:de:ca:fe + +[IPv6Prefix] +Prefix=2001:db8:0:3::/64 + +[IPv6RoutePrefix] +Route=2001:db0:fff::/64 +LifetimeSec=1000 + +[IPv6RoutePrefix] +Route=2001:db1:fff::/64 +LifetimeSec=1000 + +[IPv6RoutePrefix] +Route=2001:db2:fff::/64 +LifetimeSec=1000 diff --git a/test/test-network/conf/25-ipv6ra-uplink.network b/test/test-network/conf/25-ipv6ra-uplink.network new file mode 100644 index 0000000..78de566 --- /dev/null +++ b/test/test-network/conf/25-ipv6ra-uplink.network @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=dummy98 + +[Network] +IPv6AcceptRA=no +Address=2001:db8:1:1::1/64 +DNS=2001:db8:1:1::2 +Domains=example.com diff --git a/test/test-network/conf/25-ipvlan.network b/test/test-network/conf/25-ipvlan.network new file mode 100644 index 0000000..c0c919b --- /dev/null +++ b/test/test-network/conf/25-ipvlan.network @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=test1 + +[Network] +IPv6AcceptRA=no +IPVLAN=ipvlan99 diff --git a/test/test-network/conf/25-ipvtap.network b/test/test-network/conf/25-ipvtap.network new file mode 100644 index 0000000..d66d98a --- /dev/null +++ b/test/test-network/conf/25-ipvtap.network @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=test1 + +[Network] +IPv6AcceptRA=no +IPVTAP=ipvtap99 diff --git a/test/test-network/conf/25-isatap.network b/test/test-network/conf/25-isatap.network new file mode 100644 index 0000000..0f80426 --- /dev/null +++ b/test/test-network/conf/25-isatap.network @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=dummy98 + +[Network] +IPv6AcceptRA=no +Tunnel=isataptun99 diff --git a/test/test-network/conf/25-macvlan.network b/test/test-network/conf/25-macvlan.network new file mode 100644 index 0000000..d34d7bd --- /dev/null +++ b/test/test-network/conf/25-macvlan.network @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=test1 + +[Network] +IPv6AcceptRA=no +MACVLAN=macvlan99 diff --git a/test/test-network/conf/25-macvtap.network b/test/test-network/conf/25-macvtap.network new file mode 100644 index 0000000..163c0de --- /dev/null +++ b/test/test-network/conf/25-macvtap.network @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=test1 + +[Network] +IPv6AcceptRA=no +MACVTAP=macvtap99 diff --git a/test/test-network/conf/25-routing-policy-rule-dummy98.network b/test/test-network/conf/25-routing-policy-rule-dummy98.network new file mode 100644 index 0000000..d4c579f --- /dev/null +++ b/test/test-network/conf/25-routing-policy-rule-dummy98.network @@ -0,0 +1,14 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=dummy98 + +[Network] +IPv6AcceptRA=no + +[RoutingPolicyRule] +TypeOfService=0x08 +Table=8 +From= 192.168.101.18 +Priority=112 +IncomingInterface=dummy98 +OutgoingInterface=dummy98 diff --git a/test/test-network/conf/25-routing-policy-rule-reconfigure1.network b/test/test-network/conf/25-routing-policy-rule-reconfigure1.network new file mode 100644 index 0000000..d0c05c5 --- /dev/null +++ b/test/test-network/conf/25-routing-policy-rule-reconfigure1.network @@ -0,0 +1,34 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=test1 + +[Network] +IPv6AcceptRA=no + +# fwmark +[RoutingPolicyRule] +Table=1011 +Family=ipv4 +Priority=10111 +FirewallMark=1011 + +# oif +[RoutingPolicyRule] +Table=1011 +Family=ipv4 +Priority=10112 +OutgoingInterface=test1 + +# iif +[RoutingPolicyRule] +Table=1011 +Family=both +Priority=10113 +IncomingInterface=test1 + +# source +[RoutingPolicyRule] +Table=1011 +Family=ipv4 +Priority=10114 +From=192.168.8.254 diff --git a/test/test-network/conf/25-routing-policy-rule-reconfigure2.network b/test/test-network/conf/25-routing-policy-rule-reconfigure2.network new file mode 100644 index 0000000..47bf4bb --- /dev/null +++ b/test/test-network/conf/25-routing-policy-rule-reconfigure2.network @@ -0,0 +1,34 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=test1 + +[Network] +IPv6AcceptRA=no + +# fwmark +[RoutingPolicyRule] +Table=1011 +Family=ipv4 +Priority=10111 +FirewallMark=1011 + +# oif +[RoutingPolicyRule] +Table=1011 +Family=both +Priority=10112 +OutgoingInterface=test1 + +# iif +[RoutingPolicyRule] +Table=1011 +Family=ipv4 +Priority=10113 +IncomingInterface=test1 + +# source +[RoutingPolicyRule] +Table=1011 +Family=ipv4 +Priority=10114 +From=192.168.8.254 diff --git a/test/test-network/conf/25-routing-policy-rule-test1.network b/test/test-network/conf/25-routing-policy-rule-test1.network new file mode 100644 index 0000000..7d6e17c --- /dev/null +++ b/test/test-network/conf/25-routing-policy-rule-test1.network @@ -0,0 +1,33 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=test1 + +[Network] +IPv6AcceptRA=no + +[RoutingPolicyRule] +TypeOfService=0x08 +Table=7 +From= 192.168.100.18 +Priority=111 +IncomingInterface=test1 +OutgoingInterface=test1 + +[RoutingPolicyRule] +IncomingInterface=test1 +From=::/0 +Table=8 +Priority=100 +Family=ipv6 + +[RoutingPolicyRule] +IncomingInterface=test1 +Table=9 +Priority=101 +Family=both + +[RoutingPolicyRule] +IncomingInterface=test1 +From=0.0.0.0/8 +Table=10 +Priority=102 diff --git a/test/test-network/conf/25-sit.network b/test/test-network/conf/25-sit.network new file mode 100644 index 0000000..e05bf82 --- /dev/null +++ b/test/test-network/conf/25-sit.network @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=dummy98 + +[Network] +IPv6AcceptRA=no +Tunnel=sittun99 +Tunnel=sittun98 +Tunnel=sittun97 +Tunnel=sittun96 diff --git a/test/test-network/conf/25-state-file-tests.network b/test/test-network/conf/25-state-file-tests.network new file mode 100644 index 0000000..d321d60 --- /dev/null +++ b/test/test-network/conf/25-state-file-tests.network @@ -0,0 +1,19 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=dummy98 + +[Link] +RequiredForOnline=routable +RequiredFamilyForOnline=both + +[Network] +IPv6AcceptRA=no +DNS=10.10.10.10#aaa.com 10.10.10.11:1111#bbb.com [1111:2222::3333]:1234#ccc.com +NTP=0.fedora.pool.ntp.org 1.fedora.pool.ntp.org +Domains=hogehoge ~foofoo +LLMNR=no +MulticastDNS=yes +DNSSEC=no +Address=192.168.10.10/24 +Address=192.168.12.12/24 +Address=2002:da8:1:0:1034:56ff:fe78:9abc/64 diff --git a/test/test-network/conf/25-vlan6.netdev b/test/test-network/conf/25-vlan6.netdev new file mode 100644 index 0000000..b2e5a18 --- /dev/null +++ b/test/test-network/conf/25-vlan6.netdev @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[NetDev] +Name=vlan6 +Kind=vlan +MTUBytes=1500 + +[VLAN] +Id=6 diff --git a/test/test-network/conf/25-vlan6.network b/test/test-network/conf/25-vlan6.network new file mode 100644 index 0000000..4174972 --- /dev/null +++ b/test/test-network/conf/25-vlan6.network @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=vlan6 + +[Network] +IPv6AcceptRA=false +Address=100.100.100.2/24 diff --git a/test/test-network/conf/25-vti.network b/test/test-network/conf/25-vti.network new file mode 100644 index 0000000..af80aad --- /dev/null +++ b/test/test-network/conf/25-vti.network @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=dummy98 + +[Network] +IPv6AcceptRA=no +Tunnel=vtitun99 +Tunnel=vtitun98 +Tunnel=vtitun97 +Tunnel=vtitun96 diff --git a/test/test-network/conf/25-vti6.network b/test/test-network/conf/25-vti6.network new file mode 100644 index 0000000..2f73a99 --- /dev/null +++ b/test/test-network/conf/25-vti6.network @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=dummy98 + +[Network] +IPv6AcceptRA=no +Tunnel=vti6tun99 +Tunnel=vti6tun98 +Tunnel=vti6tun97 diff --git a/test/test-network/conf/25-vxlan-ipv6.network b/test/test-network/conf/25-vxlan-ipv6.network new file mode 100644 index 0000000..fd22387 --- /dev/null +++ b/test/test-network/conf/25-vxlan-ipv6.network @@ -0,0 +1,25 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=vxlan97 + +[Network] +IPv6AcceptRA=no +LinkLocalAddressing=yes + +[BridgeFDB] +MACAddress=00:00:00:00:00:00 +Destination=fe80::27c:16ff:fec0:6c74 +OutgoingInterface=test1 +VNI=4831583 + +[BridgeFDB] +MACAddress=00:00:00:00:00:00 +Destination=fe80::2a2:e4ff:fef9:2269 +OutgoingInterface=test1 +VNI=4831583 + +[BridgeFDB] +MACAddress=00:00:00:00:00:00 +Destination=fe80::23b:d2ff:fe95:967f +OutgoingInterface=test1 +VNI=4831583 diff --git a/test/test-network/conf/25-vxlan-test1.network b/test/test-network/conf/25-vxlan-test1.network new file mode 100644 index 0000000..4e9501c --- /dev/null +++ b/test/test-network/conf/25-vxlan-test1.network @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=test1 + +[Network] +IPv6AcceptRA=false +LinkLocalAddressing=yes +VXLAN=vxlan99 +VXLAN=vxlan97 diff --git a/test/test-network/conf/25-vxlan.network b/test/test-network/conf/25-vxlan.network new file mode 100644 index 0000000..683291f --- /dev/null +++ b/test/test-network/conf/25-vxlan.network @@ -0,0 +1,20 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=vxlan99 + +[Network] +IPv6AcceptRA=no +LinkLocalAddressing=yes + +[BridgeFDB] +MACAddress=00:11:22:33:44:55 +Destination=10.0.0.5 + +[BridgeFDB] +MACAddress=00:11:22:33:44:66 +Destination=10.0.0.6 + +[BridgeFDB] +MACAddress=00:11:22:33:44:77 +Destination=10.0.0.7 +OutgoingInterface=test1 diff --git a/test/test-network/conf/25-xfrm.network b/test/test-network/conf/25-xfrm.network new file mode 100644 index 0000000..19f2214 --- /dev/null +++ b/test/test-network/conf/25-xfrm.network @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=dummy98 + +[Network] +IPv6AcceptRA=no +Xfrm=xfrm98 diff --git a/test/test-network/conf/26-macsec.network b/test/test-network/conf/26-macsec.network new file mode 100644 index 0000000..0066474 --- /dev/null +++ b/test/test-network/conf/26-macsec.network @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=dummy98 + +[Link] +MACAddress=00:50:56:c0:00:19 + +[Network] +IPv6AcceptRA=no +LinkLocalAddressing=yes +MACsec=macsec99 diff --git a/test/test-network/conf/26-netdev-link-local-addressing-yes.network b/test/test-network/conf/26-netdev-link-local-addressing-yes.network new file mode 100644 index 0000000..ea1811b --- /dev/null +++ b/test/test-network/conf/26-netdev-link-local-addressing-yes.network @@ -0,0 +1,27 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=bareudp99 +Name=batadv99 +Name=ipvlan99 +Name=ipvtap99 +Name=macvlan99 +Name=macvtap99 +Name=veth99 +Name=veth-peer +Name=veth-mtu +Name=veth-mtu-peer +Name=vcan99 +Name=vxcan99 +Name=vxcan-peer +Name=vrf99 +Name=geneve99 +Name=ifb99 +Name=ipiptun99 +Name=nlmon99 +Name=xfrm98 xfrm99 +Name=vxlan98 +Name=hogehogehogehogehogehoge + +[Network] +LinkLocalAddressing=yes +IPv6AcceptRA=no diff --git a/test/test-network/conf/6rd.network b/test/test-network/conf/6rd.network deleted file mode 100644 index 0caa396..0000000 --- a/test/test-network/conf/6rd.network +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=dummy98 - -[Network] -IPv6AcceptRA=no -Tunnel=sittun99 diff --git a/test/test-network/conf/agent-client-peer.network b/test/test-network/conf/agent-client-peer.network deleted file mode 100644 index e31108b..0000000 --- a/test/test-network/conf/agent-client-peer.network +++ /dev/null @@ -1,15 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=client-peer - -[Network] -Address=192.168.6.2/24 -DHCPServer=yes -IPForward=ipv4 -IPv6AcceptRA=no - -[DHCPServer] -RelayTarget=192.168.5.1 -BindToInterface=no -RelayAgentCircuitId=string:sample_circuit_id -RelayAgentRemoteId=string:sample_remote_id diff --git a/test/test-network/conf/agent-client.network b/test/test-network/conf/agent-client.network deleted file mode 100644 index cfa7e5a..0000000 --- a/test/test-network/conf/agent-client.network +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=client - -[Network] -DHCP=yes -IPForward=ipv4 -IPv6AcceptRA=no diff --git a/test/test-network/conf/agent-server-peer.network b/test/test-network/conf/agent-server-peer.network deleted file mode 100644 index 1f6fa4b..0000000 --- a/test/test-network/conf/agent-server-peer.network +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=server-peer - -[Network] -Address=192.168.5.2/24 -IPForward=ipv4 -IPv6AcceptRA=no diff --git a/test/test-network/conf/agent-server.network b/test/test-network/conf/agent-server.network deleted file mode 100644 index 905508f..0000000 --- a/test/test-network/conf/agent-server.network +++ /dev/null @@ -1,16 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=server - -[Network] -Address=192.168.5.1/24 -IPForward=ipv4 -DHCPServer=yes -IPv6AcceptRA=no - -[DHCPServer] -BindToInterface=no -PoolOffset=150 -PoolSize=1 -DNS=192.168.5.1 -NTP=192.168.5.1 diff --git a/test/test-network/conf/agent-veth-client.netdev b/test/test-network/conf/agent-veth-client.netdev deleted file mode 100644 index e52e43a..0000000 --- a/test/test-network/conf/agent-veth-client.netdev +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[NetDev] -Name=client -Kind=veth -MACAddress=12:34:56:78:9a:bc - -[Peer] -Name=client-peer -MACAddress=12:34:56:78:9a:bd diff --git a/test/test-network/conf/agent-veth-server.netdev b/test/test-network/conf/agent-veth-server.netdev deleted file mode 100644 index 1427024..0000000 --- a/test/test-network/conf/agent-veth-server.netdev +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[NetDev] -Name=server -Kind=veth -MACAddress=12:34:56:78:9b:bc - -[Peer] -Name=server-peer -MACAddress=12:34:56:78:9b:bd diff --git a/test/test-network/conf/bond-slave.network b/test/test-network/conf/bond-slave.network deleted file mode 100644 index 12228a3..0000000 --- a/test/test-network/conf/bond-slave.network +++ /dev/null @@ -1,13 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=dummy98 test1 - -[Network] -Bond=bond99 - -# Settings below should be ignored -IPv6AcceptRA=yes -LinkLocalAddressing=yes -DHCP=yes -Address=192.168.25.3/24 -Gateway=192.168.25.1 diff --git a/test/test-network/conf/bond99.network b/test/test-network/conf/bond99.network deleted file mode 100644 index 09da6a0..0000000 --- a/test/test-network/conf/bond99.network +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=bond99 - -[Network] -IPv6AcceptRA=no -Address=192.168.123.45/24 diff --git a/test/test-network/conf/bridge99-ignore-carrier-loss.network b/test/test-network/conf/bridge99-ignore-carrier-loss.network deleted file mode 100644 index 1c1b342..0000000 --- a/test/test-network/conf/bridge99-ignore-carrier-loss.network +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=bridge99 - -[Network] -Address=192.168.0.15/24 -Gateway=192.168.0.1 -IPv6AcceptRA=no -IgnoreCarrierLoss=true -ConfigureWithoutCarrier=true - -[RoutingPolicyRule] -To=8.8.8.8 -Table=100 diff --git a/test/test-network/conf/bridge99.network b/test/test-network/conf/bridge99.network deleted file mode 100644 index 07ef254..0000000 --- a/test/test-network/conf/bridge99.network +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=bridge99 - -[Network] -Address=192.168.0.15/24 -Gateway=192.168.0.1 -IPv6AcceptRA=no diff --git a/test/test-network/conf/dhcp-client-allow-list.network b/test/test-network/conf/dhcp-client-allow-list.network deleted file mode 100644 index b8a49a0..0000000 --- a/test/test-network/conf/dhcp-client-allow-list.network +++ /dev/null @@ -1,12 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -DHCP=ipv4 -IPv6AcceptRA=false - -[DHCPv4] -# DenyList= will be ignored -AllowList=192.168.5.0/24 192.168.6.0/24 -DenyList=192.168.5.0/24 diff --git a/test/test-network/conf/dhcp-client-anonymize.network b/test/test-network/conf/dhcp-client-anonymize.network deleted file mode 100644 index fb356ce..0000000 --- a/test/test-network/conf/dhcp-client-anonymize.network +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -DHCP=ipv4 -IPv6AcceptRA=false - -[DHCPv4] -Anonymize=true -UseMTU=true -UseRoutes=true -SendHostname=true -UseHostname=true -Hostname=test-hostname -ClientIdentifier=mac -VendorClassIdentifier=SusantVendorTest diff --git a/test/test-network/conf/dhcp-client-decline.network b/test/test-network/conf/dhcp-client-decline.network deleted file mode 100644 index ea1a2d0..0000000 --- a/test/test-network/conf/dhcp-client-decline.network +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -DHCP=ipv4 -IPv6AcceptRA=false - -[DHCPv4] -SendDecline=yes diff --git a/test/test-network/conf/dhcp-client-gateway-ipv4.network b/test/test-network/conf/dhcp-client-gateway-ipv4.network deleted file mode 100644 index e1c7d6c..0000000 --- a/test/test-network/conf/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/dhcp-client-gateway-ipv6.network b/test/test-network/conf/dhcp-client-gateway-ipv6.network deleted file mode 100644 index 11a2fee..0000000 --- a/test/test-network/conf/dhcp-client-gateway-ipv6.network +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -DHCP=ipv6 - -[Route] -Gateway=_ipv6ra -Destination=2001:1234:5:9fff:ff:ff:ff:ff/128 diff --git a/test/test-network/conf/dhcp-client-gateway-onlink-implicit.network b/test/test-network/conf/dhcp-client-gateway-onlink-implicit.network deleted file mode 100644 index e133051..0000000 --- a/test/test-network/conf/dhcp-client-gateway-onlink-implicit.network +++ /dev/null @@ -1,15 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -DHCP=ipv4 -IPv6AcceptRA=no - -[Route] -Gateway=192.168.0.1 -Destination=10.0.0.0/8 - -[Route] -Gateway=192.168.0.1 -Destination=192.168.100.0/24 diff --git a/test/test-network/conf/dhcp-client-ipv4-dhcp-settings.network b/test/test-network/conf/dhcp-client-ipv4-dhcp-settings.network deleted file mode 100644 index f144013..0000000 --- a/test/test-network/conf/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/dhcp-client-ipv4-ipv6ra-prefix-client-with-delay.network b/test/test-network/conf/dhcp-client-ipv4-ipv6ra-prefix-client-with-delay.network deleted file mode 100644 index ff5b98a..0000000 --- a/test/test-network/conf/dhcp-client-ipv4-ipv6ra-prefix-client-with-delay.network +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[NetworkEmulator] -DelaySec=9 - -[Network] -DHCP=ipv4 -IPv6AcceptRA=true diff --git a/test/test-network/conf/dhcp-client-ipv4-only-ipv6-disabled.network b/test/test-network/conf/dhcp-client-ipv4-only-ipv6-disabled.network deleted file mode 100644 index 228cdf3..0000000 --- a/test/test-network/conf/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/dhcp-client-ipv4-only.network b/test/test-network/conf/dhcp-client-ipv4-only.network deleted file mode 100644 index 797d56a..0000000 --- a/test/test-network/conf/dhcp-client-ipv4-only.network +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -DHCP=ipv4 diff --git a/test/test-network/conf/dhcp-client-ipv4-use-routes-use-gateway.network b/test/test-network/conf/dhcp-client-ipv4-use-routes-use-gateway.network deleted file mode 100644 index 43702d5..0000000 --- a/test/test-network/conf/dhcp-client-ipv4-use-routes-use-gateway.network +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -DHCP=ipv4 -IPv6AcceptRA=false diff --git a/test/test-network/conf/dhcp-client-ipv4-use-routes-use-gateway.network.d/use-dns-and-ntp-routes-False.conf b/test/test-network/conf/dhcp-client-ipv4-use-routes-use-gateway.network.d/use-dns-and-ntp-routes-False.conf deleted file mode 100644 index 76383ab..0000000 --- a/test/test-network/conf/dhcp-client-ipv4-use-routes-use-gateway.network.d/use-dns-and-ntp-routes-False.conf +++ /dev/null @@ -1,3 +0,0 @@ -[DHCPv4] -RoutesToDNS=no -RoutesToNTP=no diff --git a/test/test-network/conf/dhcp-client-ipv4-use-routes-use-gateway.network.d/use-dns-and-ntp-routes-True.conf b/test/test-network/conf/dhcp-client-ipv4-use-routes-use-gateway.network.d/use-dns-and-ntp-routes-True.conf deleted file mode 100644 index 6d6b1ed..0000000 --- a/test/test-network/conf/dhcp-client-ipv4-use-routes-use-gateway.network.d/use-dns-and-ntp-routes-True.conf +++ /dev/null @@ -1,3 +0,0 @@ -[DHCPv4] -RoutesToDNS=yes -RoutesToNTP=yes diff --git a/test/test-network/conf/dhcp-client-ipv4-use-routes-use-gateway.network.d/use-gateway-False.conf b/test/test-network/conf/dhcp-client-ipv4-use-routes-use-gateway.network.d/use-gateway-False.conf deleted file mode 100644 index 78d0493..0000000 --- a/test/test-network/conf/dhcp-client-ipv4-use-routes-use-gateway.network.d/use-gateway-False.conf +++ /dev/null @@ -1,2 +0,0 @@ -[DHCPv4] -UseGateway=no diff --git a/test/test-network/conf/dhcp-client-ipv4-use-routes-use-gateway.network.d/use-gateway-True.conf b/test/test-network/conf/dhcp-client-ipv4-use-routes-use-gateway.network.d/use-gateway-True.conf deleted file mode 100644 index f6f597b..0000000 --- a/test/test-network/conf/dhcp-client-ipv4-use-routes-use-gateway.network.d/use-gateway-True.conf +++ /dev/null @@ -1,2 +0,0 @@ -[DHCPv4] -UseGateway=yes diff --git a/test/test-network/conf/dhcp-client-ipv4-use-routes-use-gateway.network.d/use-routes-False.conf b/test/test-network/conf/dhcp-client-ipv4-use-routes-use-gateway.network.d/use-routes-False.conf deleted file mode 100644 index 38fa983..0000000 --- a/test/test-network/conf/dhcp-client-ipv4-use-routes-use-gateway.network.d/use-routes-False.conf +++ /dev/null @@ -1,2 +0,0 @@ -[DHCPv4] -UseRoutes=no diff --git a/test/test-network/conf/dhcp-client-ipv4-use-routes-use-gateway.network.d/use-routes-True.conf b/test/test-network/conf/dhcp-client-ipv4-use-routes-use-gateway.network.d/use-routes-True.conf deleted file mode 100644 index 3b2d0ab..0000000 --- a/test/test-network/conf/dhcp-client-ipv4-use-routes-use-gateway.network.d/use-routes-True.conf +++ /dev/null @@ -1,2 +0,0 @@ -[DHCPv4] -UseRoutes=yes diff --git a/test/test-network/conf/dhcp-client-ipv6-only.network b/test/test-network/conf/dhcp-client-ipv6-only.network deleted file mode 100644 index f287428..0000000 --- a/test/test-network/conf/dhcp-client-ipv6-only.network +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -DHCP=ipv6 -IPv6Token=::1a:2b:3c:4d diff --git a/test/test-network/conf/dhcp-client-keep-configuration-dhcp-on-stop.network b/test/test-network/conf/dhcp-client-keep-configuration-dhcp-on-stop.network deleted file mode 100644 index 9a737f3..0000000 --- a/test/test-network/conf/dhcp-client-keep-configuration-dhcp-on-stop.network +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -DHCP=ipv4 -IPv6AcceptRA=false -KeepConfiguration=dhcp-on-stop diff --git a/test/test-network/conf/dhcp-client-keep-configuration-dhcp.network b/test/test-network/conf/dhcp-client-keep-configuration-dhcp.network deleted file mode 100644 index c72af56..0000000 --- a/test/test-network/conf/dhcp-client-keep-configuration-dhcp.network +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -DHCP=ipv4 -IPv6AcceptRA=false -KeepConfiguration=dhcp diff --git a/test/test-network/conf/dhcp-client-listen-port.network b/test/test-network/conf/dhcp-client-listen-port.network deleted file mode 100644 index f51444a..0000000 --- a/test/test-network/conf/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/dhcp-client-reassign-static-routes-ipv4.network b/test/test-network/conf/dhcp-client-reassign-static-routes-ipv4.network deleted file mode 100644 index 4bf69eb..0000000 --- a/test/test-network/conf/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/dhcp-client-reassign-static-routes-ipv6.network b/test/test-network/conf/dhcp-client-reassign-static-routes-ipv6.network deleted file mode 100644 index 8a8b087..0000000 --- a/test/test-network/conf/dhcp-client-reassign-static-routes-ipv6.network +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -IPv6AcceptRA=yes - -[Route] -Destination=2600:0:0:1::/64 diff --git a/test/test-network/conf/dhcp-client-route-metric.network b/test/test-network/conf/dhcp-client-route-metric.network deleted file mode 100644 index 74613cb..0000000 --- a/test/test-network/conf/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/dhcp-client-route-table.network b/test/test-network/conf/dhcp-client-route-table.network deleted file mode 100644 index 94aa1fd..0000000 --- a/test/test-network/conf/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/dhcp-client-static-lease.network b/test/test-network/conf/dhcp-client-static-lease.network deleted file mode 100644 index f9405f8..0000000 --- a/test/test-network/conf/dhcp-client-static-lease.network +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -IPv6AcceptRA=no -DHCP=ipv4 - -[DHCPv4] -ClientIdentifier=mac diff --git a/test/test-network/conf/dhcp-client-timezone-router.network b/test/test-network/conf/dhcp-client-timezone-router.network deleted file mode 100644 index ae04827..0000000 --- a/test/test-network/conf/dhcp-client-timezone-router.network +++ /dev/null @@ -1,11 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -IPv6AcceptRA=false -DHCP=ipv4 - -[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 deleted file mode 100644 index b11a578..0000000 --- a/test/test-network/conf/dhcp-client-use-dns-ipv4-and-ra.network +++ /dev/null @@ -1,12 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -DHCP=ipv4 - -[DHCPv4] -UseDNS=yes - -[IPv6AcceptRA] -UseDNS=yes diff --git a/test/test-network/conf/dhcp-client-use-dns-ipv4.network b/test/test-network/conf/dhcp-client-use-dns-ipv4.network deleted file mode 100644 index 5fbda20..0000000 --- a/test/test-network/conf/dhcp-client-use-dns-ipv4.network +++ /dev/null @@ -1,15 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -DHCP=ipv4 - -[DHCPv4] -UseDNS=yes - -[DHCPv6] -UseDNS=no - -[IPv6AcceptRA] -UseDNS=no diff --git a/test/test-network/conf/dhcp-client-use-dns-no.network b/test/test-network/conf/dhcp-client-use-dns-no.network deleted file mode 100644 index 9b651c1..0000000 --- a/test/test-network/conf/dhcp-client-use-dns-no.network +++ /dev/null @@ -1,15 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -DHCP=yes - -[DHCPv4] -UseDNS=no - -[DHCPv6] -UseDNS=no - -[IPv6AcceptRA] -UseDNS=no diff --git a/test/test-network/conf/dhcp-client-use-dns-yes.network b/test/test-network/conf/dhcp-client-use-dns-yes.network deleted file mode 100644 index 787a84d..0000000 --- a/test/test-network/conf/dhcp-client-use-dns-yes.network +++ /dev/null @@ -1,15 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -DHCP=yes - -[DHCPv4] -UseDNS=yes - -[DHCPv6] -UseDNS=yes - -[IPv6AcceptRA] -UseDNS=no diff --git a/test/test-network/conf/dhcp-client-use-domains.network b/test/test-network/conf/dhcp-client-use-domains.network deleted file mode 100644 index af321d8..0000000 --- a/test/test-network/conf/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 diff --git a/test/test-network/conf/dhcp-client-vrf.network b/test/test-network/conf/dhcp-client-vrf.network deleted file mode 100644 index 98388eb..0000000 --- a/test/test-network/conf/dhcp-client-vrf.network +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -DHCP=yes -IPv6AcceptRA=yes -VRF=vrf99 diff --git a/test/test-network/conf/dhcp-client-with-ipv4ll.network b/test/test-network/conf/dhcp-client-with-ipv4ll.network deleted file mode 100644 index 5a81026..0000000 --- a/test/test-network/conf/dhcp-client-with-ipv4ll.network +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -DHCP=ipv4 -LinkLocalAddressing=yes -IPv6AcceptRA=no diff --git a/test/test-network/conf/dhcp-client-with-static-address.network b/test/test-network/conf/dhcp-client-with-static-address.network deleted file mode 100644 index 7c9d949..0000000 --- a/test/test-network/conf/dhcp-client-with-static-address.network +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -DHCP=ipv4 -IPv6AcceptRA=no -Address=192.168.5.250 diff --git a/test/test-network/conf/dhcp-client.network b/test/test-network/conf/dhcp-client.network deleted file mode 100644 index c633839..0000000 --- a/test/test-network/conf/dhcp-client.network +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -DHCP=yes diff --git a/test/test-network/conf/dhcp-pd-downstream-dummy97.network b/test/test-network/conf/dhcp-pd-downstream-dummy97.network deleted file mode 100644 index e3e41a0..0000000 --- a/test/test-network/conf/dhcp-pd-downstream-dummy97.network +++ /dev/null @@ -1,16 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=dummy97 - -[Network] -IPv6PrivacyExtensions=yes -IPv6AcceptRA=no -DHCP=no -DHCPPrefixDelegation=yes - -[DHCPPrefixDelegation] -UplinkInterface=veth99 -SubnetId=1 -Announce=no -Token=eui64 -Token=::1a:2b:3c:4d diff --git a/test/test-network/conf/dhcp-pd-downstream-dummy98.network b/test/test-network/conf/dhcp-pd-downstream-dummy98.network deleted file mode 100644 index 3109068..0000000 --- a/test/test-network/conf/dhcp-pd-downstream-dummy98.network +++ /dev/null @@ -1,16 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=dummy98 - -[Network] -IPv6PrivacyExtensions=yes -IPv6AcceptRA=no -DHCP=no -DHCPPrefixDelegation=yes - -[DHCPPrefixDelegation] -UplinkInterface=veth99 -SubnetId=2 -Announce=no -Token=eui64 -Token=::1a:2b:3c:4d diff --git a/test/test-network/conf/dhcp-pd-downstream-dummy99.network b/test/test-network/conf/dhcp-pd-downstream-dummy99.network deleted file mode 100644 index 01c1d55..0000000 --- a/test/test-network/conf/dhcp-pd-downstream-dummy99.network +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=dummy99 - -[Network] -IPv6PrivacyExtensions=yes -IPv6AcceptRA=no -DHCP=no -DHCPPrefixDelegation=yes - -[DHCPPrefixDelegation] -UplinkInterface=veth99 -Assign=no -Announce=no diff --git a/test/test-network/conf/dhcp-pd-downstream-test1.network b/test/test-network/conf/dhcp-pd-downstream-test1.network deleted file mode 100644 index a8720c3..0000000 --- a/test/test-network/conf/dhcp-pd-downstream-test1.network +++ /dev/null @@ -1,16 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=test1 - -[Network] -IPv6PrivacyExtensions=yes -IPv6AcceptRA=no -DHCP=no -DHCPPrefixDelegation=yes - -[DHCPPrefixDelegation] -UplinkInterface=veth99 -SubnetId=0 -Announce=no -Token=eui64 -Token=::1a:2b:3c:4d diff --git a/test/test-network/conf/dhcp-pd-downstream-veth97-peer.network b/test/test-network/conf/dhcp-pd-downstream-veth97-peer.network deleted file mode 100644 index 555fefa..0000000 --- a/test/test-network/conf/dhcp-pd-downstream-veth97-peer.network +++ /dev/null @@ -1,11 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth97-peer - -[Network] -IPv6PrivacyExtensions=yes -IPv6AcceptRA=yes - -[IPv6AcceptRA] -Token=eui64 -Token=::1a:2b:3c:4e diff --git a/test/test-network/conf/dhcp-pd-downstream-veth97.network b/test/test-network/conf/dhcp-pd-downstream-veth97.network deleted file mode 100644 index daf1e9d..0000000 --- a/test/test-network/conf/dhcp-pd-downstream-veth97.network +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth97 - -[Network] -IPv6PrivacyExtensions=yes -IPv6AcceptRA=no -DHCP=no -DHCPPrefixDelegation=yes -IPv6SendRA=yes - -[DHCPPrefixDelegation] -SubnetId=8 -Announce=yes -Token=eui64 -Token=::1a:2b:3c:4d - -[IPv6SendRA] -EmitDNS=no -EmitDomains=no diff --git a/test/test-network/conf/dhcp-pd-downstream-veth98-peer.network b/test/test-network/conf/dhcp-pd-downstream-veth98-peer.network deleted file mode 100644 index db0aec1..0000000 --- a/test/test-network/conf/dhcp-pd-downstream-veth98-peer.network +++ /dev/null @@ -1,11 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth98-peer - -[Network] -IPv6PrivacyExtensions=yes -IPv6AcceptRA=yes - -[IPv6AcceptRA] -Token=eui64 -Token=::1a:2b:3c:4e diff --git a/test/test-network/conf/dhcp-pd-downstream-veth98.network b/test/test-network/conf/dhcp-pd-downstream-veth98.network deleted file mode 100644 index ef37700..0000000 --- a/test/test-network/conf/dhcp-pd-downstream-veth98.network +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth98 - -[Network] -IPv6PrivacyExtensions=yes -IPv6AcceptRA=no -DHCP=no -DHCPPrefixDelegation=yes -IPv6SendRA=yes - -[DHCPPrefixDelegation] -UplinkInterface=veth99 -SubnetId=9 -Announce=yes -Token=eui64 -Token=::1a:2b:3c:4d - -[IPv6SendRA] -EmitDNS=no -EmitDomains=no diff --git a/test/test-network/conf/dhcp-server-decline.network b/test/test-network/conf/dhcp-server-decline.network deleted file mode 100644 index cb8e04a..0000000 --- a/test/test-network/conf/dhcp-server-decline.network +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth-peer - -[Network] -Address=192.168.5.1/24 -IPv6AcceptRA=false -DHCPServer=yes - -[DHCPServer] -PoolOffset=10 -PoolSize=100 -DNS=192.168.5.1 -NTP=192.168.5.1 diff --git a/test/test-network/conf/dhcp-server-static-lease.network b/test/test-network/conf/dhcp-server-static-lease.network deleted file mode 100644 index 1f2783d..0000000 --- a/test/test-network/conf/dhcp-server-static-lease.network +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth-peer - -[Network] -IPv6AcceptRA=no -Address=10.1.1.1/24 -DHCPServer=yes - -[DHCPServer] -PoolOffset=0 -PoolSize=20 -EmitDNS=yes -DNS=9.9.9.9 - -[DHCPServerStaticLease] -MACAddress=12:34:56:78:9a:bc -Address=10.1.1.200 diff --git a/test/test-network/conf/dhcp-server-timezone-router.network b/test/test-network/conf/dhcp-server-timezone-router.network deleted file mode 100644 index 89a8db1..0000000 --- a/test/test-network/conf/dhcp-server-timezone-router.network +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth-peer - -[Network] -IPv6AcceptRA=false -Address=192.168.5.1/24 -Address=192.168.5.2/24 -DHCPServer=yes - -[DHCPServer] -ServerAddress=192.168.5.1/24 -PoolOffset=10 -PoolSize=50 -EmitRouter=yes -Timezone=Europe/Berlin -DNS=192.168.5.1 -NTP=192.168.5.1 diff --git a/test/test-network/conf/dhcp-server-uplink.network b/test/test-network/conf/dhcp-server-uplink.network deleted file mode 100644 index 59e0b6a..0000000 --- a/test/test-network/conf/dhcp-server-uplink.network +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=dummy98 - -[Network] -IPv6AcceptRA=no -Address=192.168.5.2/24 -DNS=192.168.5.1 -NTP=192.168.5.1 diff --git a/test/test-network/conf/dhcp-server-veth-peer.network b/test/test-network/conf/dhcp-server-veth-peer.network deleted file mode 100644 index d5cc6d3..0000000 --- a/test/test-network/conf/dhcp-server-veth-peer.network +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth-peer - -[Network] -IPv6AcceptRA=no -Address=2600::1/0 -Address=192.168.5.1/24 diff --git a/test/test-network/conf/dhcp-server-with-ipv6-prefix.network b/test/test-network/conf/dhcp-server-with-ipv6-prefix.network deleted file mode 100644 index 13ee90d..0000000 --- a/test/test-network/conf/dhcp-server-with-ipv6-prefix.network +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth-peer - -[Network] -Address=192.168.5.1/24 -IPv6AcceptRA=no -DHCPServer=yes -IPv6SendRA=yes - -[IPv6Prefix] -Prefix=2002:da8:1:0::/64 - -[DHCPServer] -DNS=192.168.5.1 -NTP=192.168.5.1 - -[IPv6SendRA] -EmitDNS=no -EmitDomains=no diff --git a/test/test-network/conf/dhcp-server.network b/test/test-network/conf/dhcp-server.network deleted file mode 100644 index 3eb931f..0000000 --- a/test/test-network/conf/dhcp-server.network +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth-peer - -[Network] -IPv6AcceptRA=false -DHCPServer=yes - -[DHCPServer] -ServerAddress=192.168.5.1/24 -PoolOffset=10 -PoolSize=50 -UplinkInterface=dummy98 -Router=192.168.5.3 diff --git a/test/test-network/conf/dhcp-v4-server-veth-peer.network b/test/test-network/conf/dhcp-v4-server-veth-peer.network deleted file mode 100644 index 7e1f560..0000000 --- a/test/test-network/conf/dhcp-v4-server-veth-peer.network +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth-peer - -[Network] -IPv6AcceptRA=no -Address=192.168.0.1/24 -Address=192.168.5.1/24 diff --git a/test/test-network/conf/dhcp4-6rd-server.network b/test/test-network/conf/dhcp4-6rd-server.network deleted file mode 100644 index 91dc71a..0000000 --- a/test/test-network/conf/dhcp4-6rd-server.network +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth-peer - -[Network] -IPv6AcceptRA=no -Address=10.0.0.1/8 diff --git a/test/test-network/conf/dhcp4-6rd-upstream.network b/test/test-network/conf/dhcp4-6rd-upstream.network deleted file mode 100644 index e146337..0000000 --- a/test/test-network/conf/dhcp4-6rd-upstream.network +++ /dev/null @@ -1,19 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -IPv6PrivacyExtensions=yes -IPv6AcceptRA=no -DHCP=ipv4 -DHCPPrefixDelegation=yes - -[DHCPv4] -Use6RD=yes - -[DHCPPrefixDelegation] -UplinkInterface=:self -SubnetId=10 -Announce=no -Token=eui64 -Token=::1a:2b:3c:4d diff --git a/test/test-network/conf/dhcp6pd-server.network b/test/test-network/conf/dhcp6pd-server.network deleted file mode 100644 index f7a8526..0000000 --- a/test/test-network/conf/dhcp6pd-server.network +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth-peer - -[Network] -IPv6AcceptRA=no -Address=3ffe:501:ffff:100::1/64 diff --git a/test/test-network/conf/dhcp6pd-upstream.network b/test/test-network/conf/dhcp6pd-upstream.network deleted file mode 100644 index 4b8cd7d..0000000 --- a/test/test-network/conf/dhcp6pd-upstream.network +++ /dev/null @@ -1,19 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -IPv6PrivacyExtensions=yes -IPv6AcceptRA=no -DHCP=ipv6 -DHCPPrefixDelegation=yes - -[DHCPv6] -WithoutRA=solicit - -[DHCPPrefixDelegation] -UplinkInterface=:self -SubnetId=10 -Announce=no -Token=eui64 -Token=::1a:2b:3c:4d diff --git a/test/test-network/conf/erspan.network b/test/test-network/conf/erspan.network deleted file mode 100644 index c862bae..0000000 --- a/test/test-network/conf/erspan.network +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=dummy98 - -[Network] -IPv6AcceptRA=no -Tunnel=erspan99 -Tunnel=erspan98 diff --git a/test/test-network/conf/gretap.network b/test/test-network/conf/gretap.network deleted file mode 100644 index 5e940ed..0000000 --- a/test/test-network/conf/gretap.network +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=dummy98 - -[Network] -IPv6AcceptRA=no -Tunnel=gretap99 -Tunnel=gretap98 diff --git a/test/test-network/conf/gretun.network b/test/test-network/conf/gretun.network deleted file mode 100644 index 3e81bed..0000000 --- a/test/test-network/conf/gretun.network +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=dummy98 - -[Network] -IPv6AcceptRA=no -Tunnel=gretun99 -Tunnel=gretun98 -Tunnel=gretun97 -Tunnel=gretun96 diff --git a/test/test-network/conf/ip6gretap.network b/test/test-network/conf/ip6gretap.network deleted file mode 100644 index 472072b..0000000 --- a/test/test-network/conf/ip6gretap.network +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=dummy98 - -[Network] -IPv6AcceptRA=no -Tunnel=ip6gretap99 -Tunnel=ip6gretap98 diff --git a/test/test-network/conf/ip6gretun.network b/test/test-network/conf/ip6gretun.network deleted file mode 100644 index 17ad558..0000000 --- a/test/test-network/conf/ip6gretun.network +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=dummy98 - -[Network] -IPv6AcceptRA=no -Tunnel=ip6gretun99 -Tunnel=ip6gretun98 -Tunnel=ip6gretun97 -Tunnel=ip6gretun96 diff --git a/test/test-network/conf/ip6tnl.network b/test/test-network/conf/ip6tnl.network deleted file mode 100644 index a773210..0000000 --- a/test/test-network/conf/ip6tnl.network +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=dummy98 - -[Network] -IPv6AcceptRA=no -Tunnel=ip6tnl99 -Tunnel=ip6tnl98 -Tunnel=ip6tnl97 diff --git a/test/test-network/conf/ipip.network b/test/test-network/conf/ipip.network deleted file mode 100644 index f359329..0000000 --- a/test/test-network/conf/ipip.network +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=dummy98 - -[Network] -IPv6AcceptRA=no -Tunnel=ipiptun99 -Tunnel=ipiptun98 -Tunnel=ipiptun97 -Tunnel=ipiptun96 diff --git a/test/test-network/conf/ipv6-prefix-veth-token-prefixstable-without-address.network b/test/test-network/conf/ipv6-prefix-veth-token-prefixstable-without-address.network deleted file mode 100644 index eda4ce1..0000000 --- a/test/test-network/conf/ipv6-prefix-veth-token-prefixstable-without-address.network +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -IPv6AcceptRA=true - -[IPv6AcceptRA] -Token=prefixstable -Token=prefixstable,86b123b969ba4b7eb8b3d8605123525a diff --git a/test/test-network/conf/ipv6-prefix-veth-token-prefixstable.network b/test/test-network/conf/ipv6-prefix-veth-token-prefixstable.network deleted file mode 100644 index ac50700..0000000 --- a/test/test-network/conf/ipv6-prefix-veth-token-prefixstable.network +++ /dev/null @@ -1,19 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -IPv6AcceptRA=true - -[IPv6AcceptRA] -Token=prefixstable:2002:da8:1:: -Token=prefixstable:2002:da8:1::,86b123b969ba4b7eb8b3d8605123525a -# invalid tokens -Token=prefixstable:2002:da8:1::,00000000000000000000000000000000 -Token=prefixstable:2002:da8:1::, -Token=prefixstable,00000000000000000000000000000000 -Token=prefixstable, -Token=prefixstable@ -Token=static -Token=static: -Token=static::: diff --git a/test/test-network/conf/ipv6-prefix-veth-token-static.network b/test/test-network/conf/ipv6-prefix-veth-token-static.network deleted file mode 100644 index 7c3ae33..0000000 --- a/test/test-network/conf/ipv6-prefix-veth-token-static.network +++ /dev/null @@ -1,13 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -IPv6AcceptRA=true - -[IPv6AcceptRA] -Token=::1a:2b:3c:4d -Token=static:::fa:de:ca:fe -Token=::1a:2b:3c:4d -Token=static:::1a:2b:3c:4d -Token=::fa:de:ca:fe diff --git a/test/test-network/conf/ipv6-prefix-veth.network b/test/test-network/conf/ipv6-prefix-veth.network deleted file mode 100644 index b6724ea..0000000 --- a/test/test-network/conf/ipv6-prefix-veth.network +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -IPv6AcceptRA=true - -[IPv6AcceptRA] -UseDomains=yes diff --git a/test/test-network/conf/ipv6-prefix-with-delay.network b/test/test-network/conf/ipv6-prefix-with-delay.network deleted file mode 100644 index 4b661fe..0000000 --- a/test/test-network/conf/ipv6-prefix-with-delay.network +++ /dev/null @@ -1,13 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth-peer - -[NetworkEmulator] -DelaySec=15 - -[Network] -IPv6AcceptRA=no -IPv6SendRA=yes - -[IPv6Prefix] -Prefix=2002:da8:1:0::/64 diff --git a/test/test-network/conf/ipv6-prefix.network b/test/test-network/conf/ipv6-prefix.network deleted file mode 100644 index 9cf8f25..0000000 --- a/test/test-network/conf/ipv6-prefix.network +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth-peer - -[Network] -IPv6AcceptRA=no -IPv6SendRA=yes - -[IPv6SendRA] -DNS=_link_local 2002:da8:1:0::1 -DNSLifetimeSec=1min -Domains=hogehoge.test - -[IPv6Prefix] -Prefix=2002:da8:1:0::/64 -PreferredLifetimeSec=1000s -ValidLifetimeSec=2100s - -[IPv6Prefix] -Prefix=2002:da8:2:0::/64 -PreferredLifetimeSec=1000s -ValidLifetimeSec=2100s diff --git a/test/test-network/conf/ipv6ra-prefix-client-deny-list.network b/test/test-network/conf/ipv6ra-prefix-client-deny-list.network deleted file mode 100644 index a8b7b0b..0000000 --- a/test/test-network/conf/ipv6ra-prefix-client-deny-list.network +++ /dev/null @@ -1,13 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth-peer - -[Network] -DHCP=no -IPv6AcceptRA=yes - -[IPv6AcceptRA] -RouterDenyList=2001::1 -PrefixDenyList=2001:db8:0:2:: -RouteDenyList=2001:db1:fff:: -UseDomains=yes diff --git a/test/test-network/conf/ipv6ra-prefix-client-with-static-ipv4-address.network b/test/test-network/conf/ipv6ra-prefix-client-with-static-ipv4-address.network deleted file mode 100644 index 14c2396..0000000 --- a/test/test-network/conf/ipv6ra-prefix-client-with-static-ipv4-address.network +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -IPv6AcceptRA=true -Address=192.168.5.1/24 diff --git a/test/test-network/conf/ipv6ra-prefix-client.network b/test/test-network/conf/ipv6ra-prefix-client.network deleted file mode 100644 index a98f61e..0000000 --- a/test/test-network/conf/ipv6ra-prefix-client.network +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth-peer - -[Network] -DHCP=no -IPv6AcceptRA=yes - -[IPv6AcceptRA] -# PrefixDenyList= will be ignored. -PrefixAllowList=2001:db8:0:1:: 2001:db8:0:1:: 2001:db8:0:1::/64 -PrefixDenyList=2001:db8:0:1::/64 2001:db8:0:1:: 2001:db8:0:3::/64 -RouteDenyList=2001:db1:fff::/64 2001:db1:fff:: 2001:db2:fff::/64 -UseDomains=yes diff --git a/test/test-network/conf/ipv6ra-prefix.network b/test/test-network/conf/ipv6ra-prefix.network deleted file mode 100644 index 0afdda5..0000000 --- a/test/test-network/conf/ipv6ra-prefix.network +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -DHCP=no -IPv6SendRA=yes - -[IPv6SendRA] -UplinkInterface=dummy98 - -[IPv6Prefix] -Prefix=2001:db8:0:1::/64 - -[IPv6Prefix] -Prefix=2001:db8:0:2::/64 -Assign=yes -Token=::1a:2b:3c:4d -Token=static:::fa:de:ca:fe - -[IPv6Prefix] -Prefix=2001:db8:0:3::/64 - -[IPv6RoutePrefix] -Route=2001:db0:fff::/64 -LifetimeSec=1000 - -[IPv6RoutePrefix] -Route=2001:db1:fff::/64 -LifetimeSec=1000 - -[IPv6RoutePrefix] -Route=2001:db2:fff::/64 -LifetimeSec=1000 diff --git a/test/test-network/conf/ipv6ra-uplink.network b/test/test-network/conf/ipv6ra-uplink.network deleted file mode 100644 index 78de566..0000000 --- a/test/test-network/conf/ipv6ra-uplink.network +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=dummy98 - -[Network] -IPv6AcceptRA=no -Address=2001:db8:1:1::1/64 -DNS=2001:db8:1:1::2 -Domains=example.com diff --git a/test/test-network/conf/ipvlan.network b/test/test-network/conf/ipvlan.network deleted file mode 100644 index c0c919b..0000000 --- a/test/test-network/conf/ipvlan.network +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=test1 - -[Network] -IPv6AcceptRA=no -IPVLAN=ipvlan99 diff --git a/test/test-network/conf/ipvtap.network b/test/test-network/conf/ipvtap.network deleted file mode 100644 index d66d98a..0000000 --- a/test/test-network/conf/ipvtap.network +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=test1 - -[Network] -IPv6AcceptRA=no -IPVTAP=ipvtap99 diff --git a/test/test-network/conf/isatap.network b/test/test-network/conf/isatap.network deleted file mode 100644 index 0f80426..0000000 --- a/test/test-network/conf/isatap.network +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=dummy98 - -[Network] -IPv6AcceptRA=no -Tunnel=isataptun99 diff --git a/test/test-network/conf/macsec.network b/test/test-network/conf/macsec.network deleted file mode 100644 index 0066474..0000000 --- a/test/test-network/conf/macsec.network +++ /dev/null @@ -1,11 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=dummy98 - -[Link] -MACAddress=00:50:56:c0:00:19 - -[Network] -IPv6AcceptRA=no -LinkLocalAddressing=yes -MACsec=macsec99 diff --git a/test/test-network/conf/macvlan.network b/test/test-network/conf/macvlan.network deleted file mode 100644 index d34d7bd..0000000 --- a/test/test-network/conf/macvlan.network +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=test1 - -[Network] -IPv6AcceptRA=no -MACVLAN=macvlan99 diff --git a/test/test-network/conf/macvtap.network b/test/test-network/conf/macvtap.network deleted file mode 100644 index 163c0de..0000000 --- a/test/test-network/conf/macvtap.network +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=test1 - -[Network] -IPv6AcceptRA=no -MACVTAP=macvtap99 diff --git a/test/test-network/conf/netdev-link-local-addressing-yes.network b/test/test-network/conf/netdev-link-local-addressing-yes.network deleted file mode 100644 index ea1811b..0000000 --- a/test/test-network/conf/netdev-link-local-addressing-yes.network +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=bareudp99 -Name=batadv99 -Name=ipvlan99 -Name=ipvtap99 -Name=macvlan99 -Name=macvtap99 -Name=veth99 -Name=veth-peer -Name=veth-mtu -Name=veth-mtu-peer -Name=vcan99 -Name=vxcan99 -Name=vxcan-peer -Name=vrf99 -Name=geneve99 -Name=ifb99 -Name=ipiptun99 -Name=nlmon99 -Name=xfrm98 xfrm99 -Name=vxlan98 -Name=hogehogehogehogehogehoge - -[Network] -LinkLocalAddressing=yes -IPv6AcceptRA=no diff --git a/test/test-network/conf/routing-policy-rule-dummy98.network b/test/test-network/conf/routing-policy-rule-dummy98.network deleted file mode 100644 index d4c579f..0000000 --- a/test/test-network/conf/routing-policy-rule-dummy98.network +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=dummy98 - -[Network] -IPv6AcceptRA=no - -[RoutingPolicyRule] -TypeOfService=0x08 -Table=8 -From= 192.168.101.18 -Priority=112 -IncomingInterface=dummy98 -OutgoingInterface=dummy98 diff --git a/test/test-network/conf/routing-policy-rule-reconfigure1.network b/test/test-network/conf/routing-policy-rule-reconfigure1.network deleted file mode 100644 index d0c05c5..0000000 --- a/test/test-network/conf/routing-policy-rule-reconfigure1.network +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=test1 - -[Network] -IPv6AcceptRA=no - -# fwmark -[RoutingPolicyRule] -Table=1011 -Family=ipv4 -Priority=10111 -FirewallMark=1011 - -# oif -[RoutingPolicyRule] -Table=1011 -Family=ipv4 -Priority=10112 -OutgoingInterface=test1 - -# iif -[RoutingPolicyRule] -Table=1011 -Family=both -Priority=10113 -IncomingInterface=test1 - -# source -[RoutingPolicyRule] -Table=1011 -Family=ipv4 -Priority=10114 -From=192.168.8.254 diff --git a/test/test-network/conf/routing-policy-rule-reconfigure2.network b/test/test-network/conf/routing-policy-rule-reconfigure2.network deleted file mode 100644 index 47bf4bb..0000000 --- a/test/test-network/conf/routing-policy-rule-reconfigure2.network +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=test1 - -[Network] -IPv6AcceptRA=no - -# fwmark -[RoutingPolicyRule] -Table=1011 -Family=ipv4 -Priority=10111 -FirewallMark=1011 - -# oif -[RoutingPolicyRule] -Table=1011 -Family=both -Priority=10112 -OutgoingInterface=test1 - -# iif -[RoutingPolicyRule] -Table=1011 -Family=ipv4 -Priority=10113 -IncomingInterface=test1 - -# source -[RoutingPolicyRule] -Table=1011 -Family=ipv4 -Priority=10114 -From=192.168.8.254 diff --git a/test/test-network/conf/routing-policy-rule-test1.network b/test/test-network/conf/routing-policy-rule-test1.network deleted file mode 100644 index 7d6e17c..0000000 --- a/test/test-network/conf/routing-policy-rule-test1.network +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=test1 - -[Network] -IPv6AcceptRA=no - -[RoutingPolicyRule] -TypeOfService=0x08 -Table=7 -From= 192.168.100.18 -Priority=111 -IncomingInterface=test1 -OutgoingInterface=test1 - -[RoutingPolicyRule] -IncomingInterface=test1 -From=::/0 -Table=8 -Priority=100 -Family=ipv6 - -[RoutingPolicyRule] -IncomingInterface=test1 -Table=9 -Priority=101 -Family=both - -[RoutingPolicyRule] -IncomingInterface=test1 -From=0.0.0.0/8 -Table=10 -Priority=102 diff --git a/test/test-network/conf/sit.network b/test/test-network/conf/sit.network deleted file mode 100644 index e05bf82..0000000 --- a/test/test-network/conf/sit.network +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=dummy98 - -[Network] -IPv6AcceptRA=no -Tunnel=sittun99 -Tunnel=sittun98 -Tunnel=sittun97 -Tunnel=sittun96 diff --git a/test/test-network/conf/state-file-tests.network b/test/test-network/conf/state-file-tests.network deleted file mode 100644 index d321d60..0000000 --- a/test/test-network/conf/state-file-tests.network +++ /dev/null @@ -1,19 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=dummy98 - -[Link] -RequiredForOnline=routable -RequiredFamilyForOnline=both - -[Network] -IPv6AcceptRA=no -DNS=10.10.10.10#aaa.com 10.10.10.11:1111#bbb.com [1111:2222::3333]:1234#ccc.com -NTP=0.fedora.pool.ntp.org 1.fedora.pool.ntp.org -Domains=hogehoge ~foofoo -LLMNR=no -MulticastDNS=yes -DNSSEC=no -Address=192.168.10.10/24 -Address=192.168.12.12/24 -Address=2002:da8:1:0:1034:56ff:fe78:9abc/64 diff --git a/test/test-network/conf/vlan6.netdev b/test/test-network/conf/vlan6.netdev deleted file mode 100644 index b2e5a18..0000000 --- a/test/test-network/conf/vlan6.netdev +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[NetDev] -Name=vlan6 -Kind=vlan -MTUBytes=1500 - -[VLAN] -Id=6 diff --git a/test/test-network/conf/vlan6.network b/test/test-network/conf/vlan6.network deleted file mode 100644 index 4174972..0000000 --- a/test/test-network/conf/vlan6.network +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=vlan6 - -[Network] -IPv6AcceptRA=false -Address=100.100.100.2/24 diff --git a/test/test-network/conf/vti.network b/test/test-network/conf/vti.network deleted file mode 100644 index af80aad..0000000 --- a/test/test-network/conf/vti.network +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=dummy98 - -[Network] -IPv6AcceptRA=no -Tunnel=vtitun99 -Tunnel=vtitun98 -Tunnel=vtitun97 -Tunnel=vtitun96 diff --git a/test/test-network/conf/vti6.network b/test/test-network/conf/vti6.network deleted file mode 100644 index 2f73a99..0000000 --- a/test/test-network/conf/vti6.network +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=dummy98 - -[Network] -IPv6AcceptRA=no -Tunnel=vti6tun99 -Tunnel=vti6tun98 -Tunnel=vti6tun97 diff --git a/test/test-network/conf/vxlan-ipv6.network b/test/test-network/conf/vxlan-ipv6.network deleted file mode 100644 index fd22387..0000000 --- a/test/test-network/conf/vxlan-ipv6.network +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=vxlan97 - -[Network] -IPv6AcceptRA=no -LinkLocalAddressing=yes - -[BridgeFDB] -MACAddress=00:00:00:00:00:00 -Destination=fe80::27c:16ff:fec0:6c74 -OutgoingInterface=test1 -VNI=4831583 - -[BridgeFDB] -MACAddress=00:00:00:00:00:00 -Destination=fe80::2a2:e4ff:fef9:2269 -OutgoingInterface=test1 -VNI=4831583 - -[BridgeFDB] -MACAddress=00:00:00:00:00:00 -Destination=fe80::23b:d2ff:fe95:967f -OutgoingInterface=test1 -VNI=4831583 diff --git a/test/test-network/conf/vxlan-test1.network b/test/test-network/conf/vxlan-test1.network deleted file mode 100644 index 4e9501c..0000000 --- a/test/test-network/conf/vxlan-test1.network +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=test1 - -[Network] -IPv6AcceptRA=false -LinkLocalAddressing=yes -VXLAN=vxlan99 -VXLAN=vxlan97 diff --git a/test/test-network/conf/vxlan.network b/test/test-network/conf/vxlan.network deleted file mode 100644 index 683291f..0000000 --- a/test/test-network/conf/vxlan.network +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=vxlan99 - -[Network] -IPv6AcceptRA=no -LinkLocalAddressing=yes - -[BridgeFDB] -MACAddress=00:11:22:33:44:55 -Destination=10.0.0.5 - -[BridgeFDB] -MACAddress=00:11:22:33:44:66 -Destination=10.0.0.6 - -[BridgeFDB] -MACAddress=00:11:22:33:44:77 -Destination=10.0.0.7 -OutgoingInterface=test1 diff --git a/test/test-network/conf/xfrm.network b/test/test-network/conf/xfrm.network deleted file mode 100644 index 19f2214..0000000 --- a/test/test-network/conf/xfrm.network +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=dummy98 - -[Network] -IPv6AcceptRA=no -Xfrm=xfrm98 diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index f5f887c..fdd5579 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -705,7 +705,7 @@ class NetworkctlTests(unittest.TestCase, Utilities): '12-dummy.link', '25-address-static.network', '25-veth.netdev', - 'netdev-link-local-addressing-yes.network', + '26-netdev-link-local-addressing-yes.network', ] def setUp(self): @@ -719,7 +719,7 @@ class NetworkctlTests(unittest.TestCase, Utilities): @expectedFailureIfAlternativeNameIsNotAvailable() def test_altname(self): - copy_unit_to_networkd_unit_path('netdev-link-local-addressing-yes.network', '12-dummy.netdev', '12-dummy.link') + copy_unit_to_networkd_unit_path('26-netdev-link-local-addressing-yes.network', '12-dummy.netdev', '12-dummy.link') check_output('udevadm control --reload') start_networkd() self.wait_online(['dummy98:degraded']) @@ -861,7 +861,7 @@ class NetworkctlTests(unittest.TestCase, Utilities): def test_delete_links(self): copy_unit_to_networkd_unit_path('11-dummy.netdev', '11-dummy.network', - '25-veth.netdev', 'netdev-link-local-addressing-yes.network') + '25-veth.netdev', '26-netdev-link-local-addressing-yes.network') start_networkd() self.wait_online(['test1:degraded', 'veth99:degraded', 'veth-peer:degraded']) @@ -1041,29 +1041,29 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): '25-wireguard.network', '25-xfrm.netdev', '25-xfrm-independent.netdev', - '6rd.network', - 'erspan.network', - 'gre.network', - 'gretap.network', - 'gretun.network', - 'ip6gretap.network', - 'ip6gretun.network', - 'ip6tnl.network', - 'ipip.network', - 'ipvlan.network', - 'ipvtap.network', - 'isatap.network', - 'macsec.network', - 'macvlan.network', - 'macvtap.network', - 'netdev-link-local-addressing-yes.network', - 'sit.network', - 'vti6.network', - 'vti.network', - 'vxlan-ipv6.network', - 'vxlan-test1.network', - 'vxlan.network', - 'xfrm.network', + '25-6rd.network', + '25-erspan.network', + '25-gre.network', + '25-gretap.network', + '25-gretun.network', + '25-ip6gretap.network', + '25-ip6gretun.network', + '25-ip6tnl.network', + '25-ipip.network', + '25-ipvlan.network', + '25-ipvtap.network', + '25-isatap.network', + '26-macsec.network', + '25-macvlan.network', + '25-macvtap.network', + '26-netdev-link-local-addressing-yes.network', + '25-sit.network', + '25-vti6.network', + '25-vti.network', + '25-vxlan-ipv6.network', + '25-vxlan-test1.network', + '25-vxlan.network', + '25-xfrm.network', ] fou_ports = [ @@ -1113,7 +1113,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): @expectedFailureIfModuleIsNotAvailable('bareudp') def test_bareudp(self): - copy_unit_to_networkd_unit_path('25-bareudp.netdev', 'netdev-link-local-addressing-yes.network') + copy_unit_to_networkd_unit_path('25-bareudp.netdev', '26-netdev-link-local-addressing-yes.network') start_networkd() self.wait_online(['bareudp99:degraded']) @@ -1125,7 +1125,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): @expectedFailureIfModuleIsNotAvailable('batman-adv') def test_batadv(self): - copy_unit_to_networkd_unit_path('25-batadv.netdev', 'netdev-link-local-addressing-yes.network') + copy_unit_to_networkd_unit_path('25-batadv.netdev', '26-netdev-link-local-addressing-yes.network') start_networkd() self.wait_online(['batadv99:degraded']) @@ -1212,8 +1212,8 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): with self.subTest(mode=mode): if mode != 'private': self.tearDown() - copy_unit_to_networkd_unit_path('21-macvtap.netdev', 'netdev-link-local-addressing-yes.network', - '11-dummy.netdev', 'macvtap.network') + copy_unit_to_networkd_unit_path('21-macvtap.netdev', '26-netdev-link-local-addressing-yes.network', + '11-dummy.netdev', '25-macvtap.network') with open(os.path.join(network_unit_file_path, '21-macvtap.netdev'), mode='a') as f: f.write('[MACVTAP]\nMode=' + mode) start_networkd() @@ -1230,8 +1230,8 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): with self.subTest(mode=mode): if mode != 'private': self.tearDown() - copy_unit_to_networkd_unit_path('21-macvlan.netdev', 'netdev-link-local-addressing-yes.network', - '11-dummy.netdev', 'macvlan.network') + copy_unit_to_networkd_unit_path('21-macvlan.netdev', '26-netdev-link-local-addressing-yes.network', + '11-dummy.netdev', '25-macvlan.network') with open(os.path.join(network_unit_file_path, '21-macvlan.netdev'), mode='a') as f: f.write('[MACVLAN]\nMode=' + mode) start_networkd() @@ -1274,8 +1274,8 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): with self.subTest(mode=mode, flag=flag): if mode != 'L2': self.tearDown() - copy_unit_to_networkd_unit_path('25-ipvlan.netdev', 'netdev-link-local-addressing-yes.network', - '11-dummy.netdev', 'ipvlan.network') + copy_unit_to_networkd_unit_path('25-ipvlan.netdev', '26-netdev-link-local-addressing-yes.network', + '11-dummy.netdev', '25-ipvlan.network') with open(os.path.join(network_unit_file_path, '25-ipvlan.netdev'), mode='a') as f: f.write('[IPVLAN]\nMode=' + mode + '\nFlags=' + flag) @@ -1292,8 +1292,8 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): with self.subTest(mode=mode, flag=flag): if mode != 'L2': self.tearDown() - copy_unit_to_networkd_unit_path('25-ipvtap.netdev', 'netdev-link-local-addressing-yes.network', - '11-dummy.netdev', 'ipvtap.network') + copy_unit_to_networkd_unit_path('25-ipvtap.netdev', '26-netdev-link-local-addressing-yes.network', + '11-dummy.netdev', '25-ipvtap.network') with open(os.path.join(network_unit_file_path, '25-ipvtap.netdev'), mode='a') as f: f.write('[IPVTAP]\nMode=' + mode + '\nFlags=' + flag) @@ -1305,7 +1305,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.assertRegex(output, 'ipvtap *mode ' + mode.lower() + ' ' + flag) def test_veth(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'netdev-link-local-addressing-yes.network', + copy_unit_to_networkd_unit_path('25-veth.netdev', '26-netdev-link-local-addressing-yes.network', '25-veth-mtu.netdev') start_networkd() @@ -1351,21 +1351,21 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): @expectedFailureIfModuleIsNotAvailable('vrf') def test_vrf(self): - copy_unit_to_networkd_unit_path('25-vrf.netdev', 'netdev-link-local-addressing-yes.network') + copy_unit_to_networkd_unit_path('25-vrf.netdev', '26-netdev-link-local-addressing-yes.network') start_networkd() self.wait_online(['vrf99:carrier']) @expectedFailureIfModuleIsNotAvailable('vcan') def test_vcan(self): - copy_unit_to_networkd_unit_path('25-vcan.netdev', 'netdev-link-local-addressing-yes.network') + copy_unit_to_networkd_unit_path('25-vcan.netdev', '26-netdev-link-local-addressing-yes.network') start_networkd() self.wait_online(['vcan99:carrier']) @expectedFailureIfModuleIsNotAvailable('vxcan') def test_vxcan(self): - copy_unit_to_networkd_unit_path('25-vxcan.netdev', 'netdev-link-local-addressing-yes.network') + copy_unit_to_networkd_unit_path('25-vxcan.netdev', '26-netdev-link-local-addressing-yes.network') start_networkd() self.wait_online(['vxcan99:carrier', 'vxcan-peer:carrier']) @@ -1487,7 +1487,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.assertEqual(output, '0x4d3') def test_geneve(self): - copy_unit_to_networkd_unit_path('25-geneve.netdev', 'netdev-link-local-addressing-yes.network') + copy_unit_to_networkd_unit_path('25-geneve.netdev', '26-netdev-link-local-addressing-yes.network') start_networkd() self.wait_online(['geneve99:degraded']) @@ -1500,7 +1500,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.assertRegex(output, 'udp6zerocsumrx') def test_ipip_tunnel(self): - copy_unit_to_networkd_unit_path('12-dummy.netdev', 'ipip.network', + copy_unit_to_networkd_unit_path('12-dummy.netdev', '25-ipip.network', '25-ipip-tunnel.netdev', '25-tunnel.network', '25-ipip-tunnel-local-any.netdev', '25-tunnel-local-any.network', '25-ipip-tunnel-remote-any.netdev', '25-tunnel-remote-any.network', @@ -1522,7 +1522,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.assertRegex(output, 'ipip (ipip )?remote any local any dev dummy98') def test_gre_tunnel(self): - copy_unit_to_networkd_unit_path('12-dummy.netdev', 'gretun.network', + copy_unit_to_networkd_unit_path('12-dummy.netdev', '25-gretun.network', '25-gre-tunnel.netdev', '25-tunnel.network', '25-gre-tunnel-local-any.netdev', '25-tunnel-local-any.network', '25-gre-tunnel-remote-any.netdev', '25-tunnel-remote-any.network', @@ -1560,7 +1560,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.assertNotRegex(output, 'oseq') def test_ip6gre_tunnel(self): - copy_unit_to_networkd_unit_path('12-dummy.netdev', 'ip6gretun.network', + copy_unit_to_networkd_unit_path('12-dummy.netdev', '25-ip6gretun.network', '25-ip6gre-tunnel.netdev', '25-tunnel.network', '25-ip6gre-tunnel-local-any.netdev', '25-tunnel-local-any.network', '25-ip6gre-tunnel-remote-any.netdev', '25-tunnel-remote-any.network', @@ -1589,7 +1589,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.assertRegex(output, 'ip6gre remote any local any dev dummy98') def test_gretap_tunnel(self): - copy_unit_to_networkd_unit_path('12-dummy.netdev', 'gretap.network', + copy_unit_to_networkd_unit_path('12-dummy.netdev', '25-gretap.network', '25-gretap-tunnel.netdev', '25-tunnel.network', '25-gretap-tunnel-local-any.netdev', '25-tunnel-local-any.network') start_networkd() @@ -1611,7 +1611,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.assertRegex(output, 'oseq') def test_ip6gretap_tunnel(self): - copy_unit_to_networkd_unit_path('12-dummy.netdev', 'ip6gretap.network', + copy_unit_to_networkd_unit_path('12-dummy.netdev', '25-ip6gretap.network', '25-ip6gretap-tunnel.netdev', '25-tunnel.network', '25-ip6gretap-tunnel-local-any.netdev', '25-tunnel-local-any.network') start_networkd() @@ -1625,7 +1625,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.assertRegex(output, 'ip6gretap remote 2001:473:fece:cafe::5179 local any dev dummy98') def test_vti_tunnel(self): - copy_unit_to_networkd_unit_path('12-dummy.netdev', 'vti.network', + copy_unit_to_networkd_unit_path('12-dummy.netdev', '25-vti.network', '25-vti-tunnel.netdev', '25-tunnel.network', '25-vti-tunnel-local-any.netdev', '25-tunnel-local-any.network', '25-vti-tunnel-remote-any.netdev', '25-tunnel-remote-any.network', @@ -1647,7 +1647,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.assertRegex(output, 'vti remote any local any dev dummy98') def test_vti6_tunnel(self): - copy_unit_to_networkd_unit_path('12-dummy.netdev', 'vti6.network', + copy_unit_to_networkd_unit_path('12-dummy.netdev', '25-vti6.network', '25-vti6-tunnel.netdev', '25-tunnel.network', '25-vti6-tunnel-local-any.netdev', '25-tunnel-local-any.network', '25-vti6-tunnel-remote-any.netdev', '25-tunnel-remote-any.network') @@ -1665,7 +1665,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.assertRegex(output, 'vti6 remote (any|::) local 2a00:ffde:4567:edde::4987 dev dummy98') def test_ip6tnl_tunnel(self): - copy_unit_to_networkd_unit_path('12-dummy.netdev', 'ip6tnl.network', + copy_unit_to_networkd_unit_path('12-dummy.netdev', '25-ip6tnl.network', '25-ip6tnl-tunnel.netdev', '25-tunnel.network', '25-ip6tnl-tunnel-local-any.netdev', '25-tunnel-local-any.network', '25-ip6tnl-tunnel-remote-any.netdev', '25-tunnel-remote-any.network') @@ -1683,7 +1683,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.assertRegex(output, 'ip6tnl ip6ip6 remote (any|::) local 2a00:ffde:4567:edde::4987 dev dummy98') def test_sit_tunnel(self): - copy_unit_to_networkd_unit_path('12-dummy.netdev', 'sit.network', + copy_unit_to_networkd_unit_path('12-dummy.netdev', '25-sit.network', '25-sit-tunnel.netdev', '25-tunnel.network', '25-sit-tunnel-local-any.netdev', '25-tunnel-local-any.network', '25-sit-tunnel-remote-any.netdev', '25-tunnel-remote-any.network', @@ -1705,7 +1705,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.assertRegex(output, "sit (ip6ip )?remote any local any dev dummy98") def test_isatap_tunnel(self): - copy_unit_to_networkd_unit_path('12-dummy.netdev', 'isatap.network', + copy_unit_to_networkd_unit_path('12-dummy.netdev', '25-isatap.network', '25-isatap-tunnel.netdev', '25-tunnel.network') start_networkd() self.wait_online(['isataptun99:routable', 'dummy98:degraded']) @@ -1715,7 +1715,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.assertRegex(output, "isatap ") def test_6rd_tunnel(self): - copy_unit_to_networkd_unit_path('12-dummy.netdev', '6rd.network', + copy_unit_to_networkd_unit_path('12-dummy.netdev', '25-6rd.network', '25-6rd-tunnel.netdev', '25-tunnel.network') start_networkd() self.wait_online(['sittun99:routable', 'dummy98:degraded']) @@ -1726,7 +1726,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): @expectedFailureIfERSPANModuleIsNotAvailable() def test_erspan_tunnel(self): - copy_unit_to_networkd_unit_path('12-dummy.netdev', 'erspan.network', + copy_unit_to_networkd_unit_path('12-dummy.netdev', '25-erspan.network', '25-erspan-tunnel.netdev', '25-tunnel.network', '25-erspan-tunnel-local-any.netdev', '25-tunnel-local-any.network') start_networkd() @@ -1749,22 +1749,22 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.assertRegex(output, 'oseq') def test_tunnel_independent(self): - copy_unit_to_networkd_unit_path('25-ipip-tunnel-independent.netdev', 'netdev-link-local-addressing-yes.network') + copy_unit_to_networkd_unit_path('25-ipip-tunnel-independent.netdev', '26-netdev-link-local-addressing-yes.network') start_networkd() self.wait_online(['ipiptun99:carrier']) def test_tunnel_independent_loopback(self): - copy_unit_to_networkd_unit_path('25-ipip-tunnel-independent-loopback.netdev', 'netdev-link-local-addressing-yes.network') + copy_unit_to_networkd_unit_path('25-ipip-tunnel-independent-loopback.netdev', '26-netdev-link-local-addressing-yes.network') start_networkd() self.wait_online(['ipiptun99:carrier']) @expectedFailureIfModuleIsNotAvailable('xfrm_interface') def test_xfrm(self): - copy_unit_to_networkd_unit_path('12-dummy.netdev', 'xfrm.network', + copy_unit_to_networkd_unit_path('12-dummy.netdev', '25-xfrm.network', '25-xfrm.netdev', '25-xfrm-independent.netdev', - 'netdev-link-local-addressing-yes.network') + '26-netdev-link-local-addressing-yes.network') start_networkd() self.wait_online(['dummy98:degraded', 'xfrm98:degraded', 'xfrm99:degraded']) @@ -1811,10 +1811,10 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.assertRegex(output, 'encap fou encap-sport auto encap-dport 55556') def test_vxlan(self): - copy_unit_to_networkd_unit_path('25-vxlan.netdev', 'vxlan.network', - '25-vxlan-ipv6.netdev', 'vxlan-ipv6.network', - '25-vxlan-independent.netdev', 'netdev-link-local-addressing-yes.network', - '11-dummy.netdev', 'vxlan-test1.network') + copy_unit_to_networkd_unit_path('25-vxlan.netdev', '25-vxlan.network', + '25-vxlan-ipv6.netdev', '25-vxlan-ipv6.network', + '25-vxlan-independent.netdev', '26-netdev-link-local-addressing-yes.network', + '11-dummy.netdev', '25-vxlan-test1.network') start_networkd() self.wait_online(['test1:degraded', 'vxlan99:degraded', 'vxlan98:degraded', 'vxlan97:degraded']) @@ -1853,7 +1853,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): @unittest.skip(reason="Causes kernel panic on recent kernels: https://bugzilla.kernel.org/show_bug.cgi?id=208315") def test_macsec(self): copy_unit_to_networkd_unit_path('25-macsec.netdev', '25-macsec.network', '25-macsec.key', - 'macsec.network', '12-dummy.netdev') + '26-macsec.network', '12-dummy.netdev') start_networkd() self.wait_online(['dummy98:degraded', 'macsec99:routable']) @@ -1880,14 +1880,14 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.assertRegex(output, '0: PN [0-9]*, state off, key 02030400000000000000000000000000') def test_nlmon(self): - copy_unit_to_networkd_unit_path('25-nlmon.netdev', 'netdev-link-local-addressing-yes.network') + copy_unit_to_networkd_unit_path('25-nlmon.netdev', '26-netdev-link-local-addressing-yes.network') start_networkd() self.wait_online(['nlmon99:carrier']) @expectedFailureIfModuleIsNotAvailable('ifb') def test_ifb(self): - copy_unit_to_networkd_unit_path('25-ifb.netdev', 'netdev-link-local-addressing-yes.network') + copy_unit_to_networkd_unit_path('25-ifb.netdev', '26-netdev-link-local-addressing-yes.network') start_networkd() self.wait_online(['ifb99:degraded']) @@ -2046,14 +2046,14 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities): '25-vrf.netdev', '25-vrf.network', '26-link-local-addressing-ipv6.network', - 'dhcp-client-ipv4-ipv6ra-prefix-client-with-delay.network', - 'dhcp-server-with-ipv6-prefix.network', - 'ipv6ra-prefix-client-with-static-ipv4-address.network', - 'ipv6-prefix-with-delay.network', - 'routing-policy-rule-dummy98.network', - 'routing-policy-rule-test1.network', - 'routing-policy-rule-reconfigure1.network', - 'routing-policy-rule-reconfigure2.network', + '25-dhcp-client-ipv4-ipv6ra-prefix-client-with-delay.network', + '25-dhcp-server-with-ipv6-prefix.network', + '25-ipv6ra-prefix-client-with-static-ipv4-address.network', + '25-ipv6-prefix-with-delay.network', + '25-routing-policy-rule-dummy98.network', + '25-routing-policy-rule-test1.network', + '25-routing-policy-rule-reconfigure1.network', + '25-routing-policy-rule-reconfigure2.network', ] networkd_conf_dropins = [ @@ -2325,7 +2325,7 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities): self.assertRegex(output, routable_map[carrier]) def test_routing_policy_rule(self): - copy_unit_to_networkd_unit_path('routing-policy-rule-test1.network', '11-dummy.netdev') + copy_unit_to_networkd_unit_path('25-routing-policy-rule-test1.network', '11-dummy.netdev') start_networkd() self.wait_online(['test1:degraded']) @@ -2363,8 +2363,8 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities): check_output(*networkctl_cmd, '--json=short', 'status', env=env) def test_routing_policy_rule_issue_11280(self): - copy_unit_to_networkd_unit_path('routing-policy-rule-test1.network', '11-dummy.netdev', - 'routing-policy-rule-dummy98.network', '12-dummy.netdev') + copy_unit_to_networkd_unit_path('25-routing-policy-rule-test1.network', '11-dummy.netdev', + '25-routing-policy-rule-dummy98.network', '12-dummy.netdev') for trial in range(3): # Remove state files only first time @@ -2383,7 +2383,7 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities): stop_networkd(remove_state_files=False) def test_routing_policy_rule_reconfigure(self): - copy_unit_to_networkd_unit_path('routing-policy-rule-reconfigure2.network', '11-dummy.netdev') + copy_unit_to_networkd_unit_path('25-routing-policy-rule-reconfigure2.network', '11-dummy.netdev') start_networkd() self.wait_online(['test1:degraded']) @@ -2398,7 +2398,7 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities): print(output) self.assertIn('10112: from all oif test1 lookup 1011', output) - copy_unit_to_networkd_unit_path('routing-policy-rule-reconfigure1.network', '11-dummy.netdev') + copy_unit_to_networkd_unit_path('25-routing-policy-rule-reconfigure1.network', '11-dummy.netdev') run(*networkctl_cmd, 'reload', env=env) time.sleep(1) self.wait_online(['test1:degraded']) @@ -3449,7 +3449,7 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities): call('rmmod netdevsim', stderr=subprocess.DEVNULL) def test_wait_online_ipv4(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-with-ipv6-prefix.network', 'dhcp-client-ipv4-ipv6ra-prefix-client-with-delay.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp-server-with-ipv6-prefix.network', '25-dhcp-client-ipv4-ipv6ra-prefix-client-with-delay.network') start_networkd() self.wait_online(['veth99:routable'], ipv4=True) @@ -3457,7 +3457,7 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities): self.wait_address('veth99', r'192.168.5.[0-9]+', ipv='-4', timeout_sec=1) def test_wait_online_ipv6(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'ipv6-prefix-with-delay.network', 'ipv6ra-prefix-client-with-static-ipv4-address.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-ipv6-prefix-with-delay.network', '25-ipv6ra-prefix-client-with-static-ipv4-address.network') start_networkd() self.wait_online(['veth99:routable'], ipv6=True) @@ -3471,7 +3471,7 @@ class NetworkdStateFileTests(unittest.TestCase, Utilities): units = [ '12-dummy.netdev', - 'state-file-tests.network', + '25-state-file-tests.network', ] def setUp(self): @@ -3484,7 +3484,7 @@ class NetworkdStateFileTests(unittest.TestCase, Utilities): stop_networkd(show_logs=True) def test_state_file(self): - copy_unit_to_networkd_unit_path('12-dummy.netdev', 'state-file-tests.network') + copy_unit_to_networkd_unit_path('12-dummy.netdev', '25-state-file-tests.network') start_networkd() self.wait_online(['dummy98:routable']) @@ -3511,7 +3511,7 @@ class NetworkdStateFileTests(unittest.TestCase, Utilities): self.assertRegex(data, r'REQUIRED_OPER_STATE_FOR_ONLINE=routable') self.assertRegex(data, r'REQUIRED_FAMILY_FOR_ONLINE=both') self.assertRegex(data, r'ACTIVATION_POLICY=up') - self.assertRegex(data, r'NETWORK_FILE=/run/systemd/network/state-file-tests.network') + self.assertRegex(data, r'NETWORK_FILE=/run/systemd/network/25-state-file-tests.network') self.assertRegex(data, r'DNS=10.10.10.10#aaa.com 10.10.10.11:1111#bbb.com \[1111:2222::3333\]:1234#ccc.com') self.assertRegex(data, r'NTP=0.fedora.pool.ntp.org 1.fedora.pool.ntp.org') self.assertRegex(data, r'DOMAINS=hogehoge') @@ -3586,8 +3586,8 @@ class NetworkdBondTests(unittest.TestCase, Utilities): '23-primary-slave.network', '25-bond-active-backup-slave.netdev', '25-bond.netdev', - 'bond99.network', - 'bond-slave.network'] + '25-bond99.network', + '25-bond-slave.network'] def setUp(self): remove_links(self.links) @@ -3635,7 +3635,7 @@ class NetworkdBondTests(unittest.TestCase, Utilities): def test_bond_operstate(self): copy_unit_to_networkd_unit_path('25-bond.netdev', '11-dummy.netdev', '12-dummy.netdev', - 'bond99.network','bond-slave.network') + '25-bond99.network','25-bond-slave.network') start_networkd() self.wait_online(['dummy98:enslaved', 'test1:enslaved', 'bond99:routable']) @@ -3703,8 +3703,8 @@ class NetworkdBridgeTests(unittest.TestCase, Utilities): '26-bridge-vlan-master.network', '26-bridge-vlan-slave-issue-20373.network', '26-bridge-vlan-slave.network', - 'bridge99-ignore-carrier-loss.network', - 'bridge99.network' + '25-bridge99-ignore-carrier-loss.network', + '25-bridge99.network' ] routing_policy_rule_tables = ['100'] @@ -3810,7 +3810,7 @@ class NetworkdBridgeTests(unittest.TestCase, Utilities): def test_bridge_property(self): copy_unit_to_networkd_unit_path('11-dummy.netdev', '12-dummy.netdev', '26-bridge.netdev', '26-bridge-slave-interface-1.network', '26-bridge-slave-interface-2.network', - 'bridge99.network') + '25-bridge99.network') start_networkd() self.wait_online(['dummy98:enslaved', 'test1:enslaved', 'bridge99:routable']) @@ -3932,7 +3932,7 @@ class NetworkdBridgeTests(unittest.TestCase, Utilities): def test_bridge_ignore_carrier_loss(self): copy_unit_to_networkd_unit_path('11-dummy.netdev', '12-dummy.netdev', '26-bridge.netdev', '26-bridge-slave-interface-1.network', '26-bridge-slave-interface-2.network', - 'bridge99-ignore-carrier-loss.network') + '25-bridge99-ignore-carrier-loss.network') start_networkd() self.wait_online(['dummy98:enslaved', 'test1:enslaved', 'bridge99:routable']) @@ -3951,7 +3951,7 @@ class NetworkdBridgeTests(unittest.TestCase, Utilities): def test_bridge_ignore_carrier_loss_frequent_loss_and_gain(self): copy_unit_to_networkd_unit_path('26-bridge.netdev', '26-bridge-slave-interface-1.network', - 'bridge99-ignore-carrier-loss.network') + '25-bridge99-ignore-carrier-loss.network') start_networkd() self.wait_online(['bridge99:no-carrier']) @@ -4009,11 +4009,11 @@ class NetworkdRATests(unittest.TestCase, Utilities): units = [ '25-veth.netdev', - 'ipv6-prefix.network', - 'ipv6-prefix-veth.network', - 'ipv6-prefix-veth-token-static.network', - 'ipv6-prefix-veth-token-prefixstable.network', - 'ipv6-prefix-veth-token-prefixstable-without-address.network'] + '25-ipv6-prefix.network', + '25-ipv6-prefix-veth.network', + '25-ipv6-prefix-veth-token-static.network', + '25-ipv6-prefix-veth-token-prefixstable.network', + '25-ipv6-prefix-veth-token-prefixstable-without-address.network'] def setUp(self): remove_links(self.links) @@ -4025,7 +4025,7 @@ class NetworkdRATests(unittest.TestCase, Utilities): stop_networkd(show_logs=True) def test_ipv6_prefix_delegation(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'ipv6-prefix.network', 'ipv6-prefix-veth.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-ipv6-prefix.network', '25-ipv6-prefix-veth.network') start_networkd() self.wait_online(['veth99:routable', 'veth-peer:degraded']) @@ -4043,7 +4043,7 @@ class NetworkdRATests(unittest.TestCase, Utilities): self.assertRegex(output, '2002:da8:1:0') def test_ipv6_token_static(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'ipv6-prefix.network', 'ipv6-prefix-veth-token-static.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-ipv6-prefix.network', '25-ipv6-prefix-veth-token-static.network') start_networkd() self.wait_online(['veth99:routable', 'veth-peer:degraded']) @@ -4055,7 +4055,7 @@ class NetworkdRATests(unittest.TestCase, Utilities): self.assertRegex(output, '2002:da8:2:0:fa:de:ca:fe') def test_ipv6_token_prefixstable(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'ipv6-prefix.network', 'ipv6-prefix-veth-token-prefixstable.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-ipv6-prefix.network', '25-ipv6-prefix-veth-token-prefixstable.network') start_networkd() self.wait_online(['veth99:routable', 'veth-peer:degraded']) @@ -4065,7 +4065,7 @@ class NetworkdRATests(unittest.TestCase, Utilities): self.assertIn('2002:da8:2:0:1034:56ff:fe78:9abc', output) # EUI64 def test_ipv6_token_prefixstable_without_address(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'ipv6-prefix.network', 'ipv6-prefix-veth-token-prefixstable-without-address.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-ipv6-prefix.network', '25-ipv6-prefix-veth-token-prefixstable-without-address.network') start_networkd() self.wait_online(['veth99:routable', 'veth-peer:degraded']) @@ -4083,13 +4083,13 @@ class NetworkdDHCPServerTests(unittest.TestCase, Utilities): units = [ '12-dummy.netdev', '25-veth.netdev', - 'dhcp-client.network', - 'dhcp-client-static-lease.network', - 'dhcp-client-timezone-router.network', - 'dhcp-server.network', - 'dhcp-server-static-lease.network', - 'dhcp-server-timezone-router.network', - 'dhcp-server-uplink.network', + '25-dhcp-client.network', + '25-dhcp-client-static-lease.network', + '25-dhcp-client-timezone-router.network', + '25-dhcp-server.network', + '25-dhcp-server-static-lease.network', + '25-dhcp-server-timezone-router.network', + '25-dhcp-server-uplink.network', ] def setUp(self): @@ -4102,8 +4102,8 @@ class NetworkdDHCPServerTests(unittest.TestCase, Utilities): stop_networkd(show_logs=True) def test_dhcp_server(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-client.network', 'dhcp-server.network', - '12-dummy.netdev', 'dhcp-server-uplink.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp-client.network', '25-dhcp-server.network', + '12-dummy.netdev', '25-dhcp-server-uplink.network') start_networkd() self.wait_online(['veth99:routable', 'veth-peer:routable']) @@ -4115,7 +4115,7 @@ class NetworkdDHCPServerTests(unittest.TestCase, Utilities): self.assertIn('NTP: 192.168.5.1', output) def test_emit_router_timezone(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-client-timezone-router.network', 'dhcp-server-timezone-router.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp-client-timezone-router.network', '25-dhcp-server-timezone-router.network') start_networkd() self.wait_online(['veth99:routable', 'veth-peer:routable']) @@ -4126,7 +4126,7 @@ class NetworkdDHCPServerTests(unittest.TestCase, Utilities): self.assertIn('Time Zone: Europe/Berlin', output) def test_dhcp_server_static_lease(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-client-static-lease.network', 'dhcp-server-static-lease.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp-client-static-lease.network', '25-dhcp-server-static-lease.network') start_networkd() self.wait_online(['veth99:routable', 'veth-peer:routable']) @@ -4143,12 +4143,12 @@ class NetworkdDHCPServerRelayAgentTests(unittest.TestCase, Utilities): ] units = [ - 'agent-veth-client.netdev', - 'agent-veth-server.netdev', - 'agent-client.network', - 'agent-server.network', - 'agent-client-peer.network', - 'agent-server-peer.network', + '25-agent-veth-client.netdev', + '25-agent-veth-server.netdev', + '25-agent-client.network', + '25-agent-server.network', + '25-agent-client-peer.network', + '25-agent-server-peer.network', ] def setUp(self): @@ -4179,37 +4179,37 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): '25-veth.netdev', '25-vrf.netdev', '25-vrf.network', - 'dhcp-client-allow-list.network', - 'dhcp-client-anonymize.network', - 'dhcp-client-decline.network', - 'dhcp-client-gateway-ipv4.network', - 'dhcp-client-gateway-ipv6.network', - 'dhcp-client-gateway-onlink-implicit.network', - 'dhcp-client-ipv4-dhcp-settings.network', - 'dhcp-client-ipv4-only-ipv6-disabled.network', - 'dhcp-client-ipv4-only.network', - 'dhcp-client-ipv4-use-routes-use-gateway.network', - 'dhcp-client-ipv6-only.network', - 'dhcp-client-keep-configuration-dhcp-on-stop.network', - 'dhcp-client-keep-configuration-dhcp.network', - 'dhcp-client-listen-port.network', - 'dhcp-client-reassign-static-routes-ipv4.network', - 'dhcp-client-reassign-static-routes-ipv6.network', - 'dhcp-client-route-metric.network', - 'dhcp-client-route-table.network', - 'dhcp-client-use-dns-ipv4-and-ra.network', - 'dhcp-client-use-dns-ipv4.network', - 'dhcp-client-use-dns-no.network', - 'dhcp-client-use-dns-yes.network', - 'dhcp-client-use-domains.network', - 'dhcp-client-vrf.network', - 'dhcp-client-with-ipv4ll.network', - 'dhcp-client-with-static-address.network', - 'dhcp-client.network', - 'dhcp-server-decline.network', - 'dhcp-server-veth-peer.network', - 'dhcp-v4-server-veth-peer.network', - 'static.network'] + '25-dhcp-client-allow-list.network', + '25-dhcp-client-anonymize.network', + '25-dhcp-client-decline.network', + '25-dhcp-client-gateway-ipv4.network', + '25-dhcp-client-gateway-ipv6.network', + '25-dhcp-client-gateway-onlink-implicit.network', + '25-dhcp-client-ipv4-dhcp-settings.network', + '25-dhcp-client-ipv4-only-ipv6-disabled.network', + '25-dhcp-client-ipv4-only.network', + '25-dhcp-client-ipv4-use-routes-use-gateway.network', + '25-dhcp-client-ipv6-only.network', + '25-dhcp-client-keep-configuration-dhcp-on-stop.network', + '25-dhcp-client-keep-configuration-dhcp.network', + '25-dhcp-client-listen-port.network', + '25-dhcp-client-reassign-static-routes-ipv4.network', + '25-dhcp-client-reassign-static-routes-ipv6.network', + '25-dhcp-client-route-metric.network', + '25-dhcp-client-route-table.network', + '25-dhcp-client-use-dns-ipv4-and-ra.network', + '25-dhcp-client-use-dns-ipv4.network', + '25-dhcp-client-use-dns-no.network', + '25-dhcp-client-use-dns-yes.network', + '25-dhcp-client-use-domains.network', + '25-dhcp-client-vrf.network', + '25-dhcp-client-with-ipv4ll.network', + '25-dhcp-client-with-static-address.network', + '25-dhcp-client.network', + '25-dhcp-server-decline.network', + '25-dhcp-server-veth-peer.network', + '25-dhcp-v4-server-veth-peer.network', + '25-static.network'] def setUp(self): stop_dnsmasq() @@ -4227,7 +4227,7 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): stop_networkd(show_logs=True) def test_dhcp_client_ipv6_only(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', 'dhcp-client-ipv6-only.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp-server-veth-peer.network', '25-dhcp-client-ipv6-only.network') start_networkd() self.wait_online(['veth-peer:carrier']) @@ -4251,7 +4251,7 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): self.assertRegex(output, 'token :: dev veth99') def test_dhcp_client_ipv4_only(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', 'dhcp-client-ipv4-only-ipv6-disabled.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp-server-veth-peer.network', '25-dhcp-client-ipv4-only-ipv6-disabled.network') start_networkd() self.wait_online(['veth-peer:carrier']) @@ -4305,8 +4305,8 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): self.tearDown() def _test_dhcp_client_ipv4_use_routes_gateway(self, use_routes, use_gateway, dns_and_ntp_routes, classless): - testunit = 'dhcp-client-ipv4-use-routes-use-gateway.network' - testunits = ['25-veth.netdev', 'dhcp-server-veth-peer.network', testunit] + testunit = '25-dhcp-client-ipv4-use-routes-use-gateway.network' + testunits = ['25-veth.netdev', '25-dhcp-server-veth-peer.network', testunit] testunits.append(f'{testunit}.d/use-routes-{use_routes}.conf'); testunits.append(f'{testunit}.d/use-gateway-{use_gateway}.conf'); testunits.append(f'{testunit}.d/use-dns-and-ntp-routes-{dns_and_ntp_routes}.conf'); @@ -4375,7 +4375,7 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): check_output(*networkctl_cmd, '--json=short', 'status', env=env) def test_dhcp_client_ipv4_ipv6(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', 'dhcp-client-ipv4-only.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp-server-veth-peer.network', '25-dhcp-client-ipv4-only.network') start_networkd() self.wait_online(['veth-peer:carrier']) start_dnsmasq() @@ -4391,7 +4391,7 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): self.assertRegex(output, '192.168.5') def test_dhcp_client_settings(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', 'dhcp-client-ipv4-dhcp-settings.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp-server-veth-peer.network', '25-dhcp-client-ipv4-dhcp-settings.network') start_networkd() self.wait_online(['veth-peer:carrier']) @@ -4429,7 +4429,7 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): self.assertTrue(search_words_in_dnsmasq_log('26:mtu')) def test_dhcp_client_settings_anonymize(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', 'dhcp-client-anonymize.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp-server-veth-peer.network', '25-dhcp-client-anonymize.network') start_networkd() self.wait_online(['veth-peer:carrier']) start_dnsmasq() @@ -4440,7 +4440,7 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): self.assertFalse(search_words_in_dnsmasq_log('26:mtu')) def test_dhcp_client_listen_port(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', 'dhcp-client-listen-port.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp-server-veth-peer.network', '25-dhcp-client-listen-port.network') start_networkd() self.wait_online(['veth-peer:carrier']) start_dnsmasq('--dhcp-alternate-port=67,5555') @@ -4451,8 +4451,8 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): self.assertRegex(output, '192.168.5.* dynamic') def test_dhcp_client_with_static_address(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-v4-server-veth-peer.network', - 'dhcp-client-with-static-address.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp-v4-server-veth-peer.network', + '25-dhcp-client-with-static-address.network') start_networkd() self.wait_online(['veth-peer:carrier']) start_dnsmasq() @@ -4470,7 +4470,7 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): self.assertRegex(output, r'192.168.5.1 proto dhcp scope link src 192.168.5.[0-9]* metric 1024') def test_dhcp_route_table_id(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-v4-server-veth-peer.network', 'dhcp-client-route-table.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp-v4-server-veth-peer.network', '25-dhcp-client-route-table.network') start_networkd() self.wait_online(['veth-peer:carrier']) start_dnsmasq() @@ -4482,7 +4482,7 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): self.assertRegex(output, '192.168.5.1') def test_dhcp_route_metric(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-v4-server-veth-peer.network', 'dhcp-client-route-metric.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp-v4-server-veth-peer.network', '25-dhcp-client-route-metric.network') start_networkd() self.wait_online(['veth-peer:carrier']) start_dnsmasq() @@ -4495,8 +4495,8 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): self.assertIn('192.168.5.1 proto dhcp scope link src 192.168.5.181 metric 24', output) def test_dhcp_client_reassign_static_routes_ipv4(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', - 'dhcp-client-reassign-static-routes-ipv4.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp-server-veth-peer.network', + '25-dhcp-client-reassign-static-routes-ipv4.network') start_networkd() self.wait_online(['veth-peer:carrier']) start_dnsmasq(lease_time='2m') @@ -4530,8 +4530,8 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): self.assertRegex(output, r'192.168.7.0/24 proto static') def test_dhcp_client_reassign_static_routes_ipv6(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', - 'dhcp-client-reassign-static-routes-ipv6.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp-server-veth-peer.network', + '25-dhcp-client-reassign-static-routes-ipv6.network') start_networkd() self.wait_online(['veth-peer:carrier']) start_dnsmasq(lease_time='2m') @@ -4561,7 +4561,7 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): self.assertRegex(output, r'2600:0:0:1::/64 proto static metric 1024 pref medium') def test_dhcp_keep_configuration_dhcp(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-v4-server-veth-peer.network', 'dhcp-client-keep-configuration-dhcp.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp-v4-server-veth-peer.network', '25-dhcp-client-keep-configuration-dhcp.network') start_networkd() self.wait_online(['veth-peer:carrier']) start_dnsmasq(lease_time='2m') @@ -4599,7 +4599,7 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): print(output) self.assertRegex(output, r'192.168.5.*') - with open(os.path.join(network_unit_file_path, 'dhcp-client-keep-configuration-dhcp.network'), mode='a') as f: + with open(os.path.join(network_unit_file_path, '25-dhcp-client-keep-configuration-dhcp.network'), mode='a') as f: f.write('[Network]\nDHCP=no\n') start_networkd() @@ -4615,7 +4615,7 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): self.assertRegex(output, r'192.168.5.*') def test_dhcp_keep_configuration_dhcp_on_stop(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-v4-server-veth-peer.network', 'dhcp-client-keep-configuration-dhcp-on-stop.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp-v4-server-veth-peer.network', '25-dhcp-client-keep-configuration-dhcp-on-stop.network') start_networkd() self.wait_online(['veth-peer:carrier']) start_dnsmasq(lease_time='2m') @@ -4641,7 +4641,7 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): self.assertNotRegex(output, r'192.168.5.*') def test_dhcp_client_reuse_address_as_static(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', 'dhcp-client.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp-server-veth-peer.network', '25-dhcp-client.network') start_networkd() self.wait_online(['veth-peer:carrier']) start_dnsmasq() @@ -4661,9 +4661,9 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): static_network = '\n'.join(['[Match]', 'Name=veth99', '[Network]', 'IPv6AcceptRA=no', 'Address=' + ipv4_address.group(), 'Address=' + ipv6_address.group()]) print(static_network) - remove_unit_from_networkd_path(['dhcp-client.network']) + remove_unit_from_networkd_path(['25-dhcp-client.network']) - with open(os.path.join(network_unit_file_path, 'static.network'), mode='w') as f: + with open(os.path.join(network_unit_file_path, '25-static.network'), mode='w') as f: f.write(static_network) # When networkd started, the links are already configured, so let's wait for 5 seconds @@ -4683,7 +4683,7 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): @expectedFailureIfModuleIsNotAvailable('vrf') def test_dhcp_client_vrf(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', 'dhcp-client-vrf.network', + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp-server-veth-peer.network', '25-dhcp-client-vrf.network', '25-vrf.netdev', '25-vrf.network') start_networkd() self.wait_online(['veth-peer:carrier']) @@ -4726,8 +4726,8 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): self.assertEqual(output, '') def test_dhcp_client_gateway_ipv4(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', - 'dhcp-client-gateway-ipv4.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp-server-veth-peer.network', + '25-dhcp-client-gateway-ipv4.network') start_networkd() self.wait_online(['veth-peer:carrier']) start_dnsmasq() @@ -4738,7 +4738,7 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): self.assertRegex(output, 'default via 192.168.5.1 proto dhcp src 192.168.5.[0-9]*') self.assertIn('10.0.0.0/8 via 192.168.5.1 proto dhcp', output) - with open(os.path.join(network_unit_file_path, 'dhcp-client-gateway-ipv4.network'), mode='a') as f: + with open(os.path.join(network_unit_file_path, '25-dhcp-client-gateway-ipv4.network'), mode='a') as f: f.write('[DHCPv4]\nUseGateway=no\n') rc = call(*networkctl_cmd, 'reload', env=env) @@ -4753,8 +4753,8 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): self.assertIn('10.0.0.0/8 via 192.168.5.1 proto dhcp', output) def test_dhcp_client_gateway_ipv6(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', - 'dhcp-client-gateway-ipv6.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp-server-veth-peer.network', + '25-dhcp-client-gateway-ipv6.network') start_networkd() self.wait_online(['veth-peer:carrier']) start_dnsmasq() @@ -4765,8 +4765,8 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): self.assertRegex(output, 'via fe80::1034:56ff:fe78:9abd') def test_dhcp_client_gateway_onlink_implicit(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', - 'dhcp-client-gateway-onlink-implicit.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp-server-veth-peer.network', + '25-dhcp-client-gateway-onlink-implicit.network') start_networkd() self.wait_online(['veth-peer:carrier']) start_dnsmasq() @@ -4784,8 +4784,8 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): self.assertRegex(output, 'onlink') def test_dhcp_client_with_ipv4ll_with_dhcp_server(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', - 'dhcp-client-with-ipv4ll.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp-server-veth-peer.network', + '25-dhcp-client-with-ipv4ll.network') start_networkd() self.wait_online(['veth-peer:carrier']) start_dnsmasq(lease_time='2m') @@ -4821,8 +4821,8 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): search_words_in_dnsmasq_log('DHCPOFFER', show_all=True) def test_dhcp_client_with_ipv4ll_without_dhcp_server(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', - 'dhcp-client-with-ipv4ll.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp-server-veth-peer.network', + '25-dhcp-client-with-ipv4ll.network') start_networkd() # we need to increase timeout above default, as this will need to wait for # systemd-networkd to get the dhcpv4 transient failure event @@ -4845,8 +4845,8 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): self.wait_address_dropped('veth99', r'inet 169\.254\.\d+\.\d+/16 metric 2048 brd 169\.255\.255\.255 scope link', scope='link', ipv='-4') def test_dhcp_client_route_remove_on_renew(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', - 'dhcp-client-ipv4-only-ipv6-disabled.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp-server-veth-peer.network', + '25-dhcp-client-ipv4-only-ipv6-disabled.network') start_networkd() self.wait_online(['veth-peer:carrier']) start_dnsmasq(ipv4_range='192.168.5.100,192.168.5.199', lease_time='2m') @@ -4893,7 +4893,7 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): self.assertRegex(output, f'192.168.5.1 proto dhcp scope link src {address2} metric 1024') def test_dhcp_client_use_dns_yes(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', 'dhcp-client-use-dns-yes.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp-server-veth-peer.network', '25-dhcp-client-use-dns-yes.network') start_networkd() self.wait_online(['veth-peer:carrier']) @@ -4914,7 +4914,7 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): check_output(*networkctl_cmd, '--json=short', 'status', env=env) def test_dhcp_client_use_dns_no(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', 'dhcp-client-use-dns-no.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp-server-veth-peer.network', '25-dhcp-client-use-dns-no.network') start_networkd() self.wait_online(['veth-peer:carrier']) @@ -4932,7 +4932,7 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): self.assertNotRegex(output, '2600::1') def test_dhcp_client_use_dns_ipv4(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', 'dhcp-client-use-dns-ipv4.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp-server-veth-peer.network', '25-dhcp-client-use-dns-ipv4.network') start_networkd() self.wait_online(['veth-peer:carrier']) @@ -4950,7 +4950,7 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): self.assertNotRegex(output, '2600::1') def test_dhcp_client_use_dns_ipv4_and_ra(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', 'dhcp-client-use-dns-ipv4-and-ra.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp-server-veth-peer.network', '25-dhcp-client-use-dns-ipv4-and-ra.network') start_networkd() self.wait_online(['veth-peer:carrier']) @@ -4968,7 +4968,7 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): self.assertRegex(output, '2600::1') def test_dhcp_client_use_domains(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', 'dhcp-client-use-domains.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp-server-veth-peer.network', '25-dhcp-client-use-domains.network') start_networkd() self.wait_online(['veth-peer:carrier']) @@ -4985,7 +4985,7 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): self.assertRegex(output, 'example.com') def test_dhcp_client_decline(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-decline.network', 'dhcp-client-decline.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp-server-decline.network', '25-dhcp-client-decline.network') start_networkd() self.wait_online(['veth99:routable', 'veth-peer:routable']) @@ -4995,7 +4995,7 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): self.assertRegex(output, 'inet 192.168.5.[0-9]*/24 metric 1024 brd 192.168.5.255 scope global dynamic veth99') def test_dhcp_client_allow_list(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-decline.network', 'dhcp-client-allow-list.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp-server-decline.network', '25-dhcp-client-allow-list.network') start_networkd() self.wait_online(['veth99:routable', 'veth-peer:routable']) @@ -5023,18 +5023,18 @@ class NetworkdDHCPPDTests(unittest.TestCase, Utilities): '25-veth-downstream-veth97.netdev', '25-veth-downstream-veth98.netdev', '80-6rd-tunnel.network', - 'dhcp-pd-downstream-dummy97.network', - 'dhcp-pd-downstream-dummy98.network', - 'dhcp-pd-downstream-dummy99.network', - 'dhcp-pd-downstream-test1.network', - 'dhcp-pd-downstream-veth97.network', - 'dhcp-pd-downstream-veth97-peer.network', - 'dhcp-pd-downstream-veth98.network', - 'dhcp-pd-downstream-veth98-peer.network', - 'dhcp4-6rd-server.network', - 'dhcp4-6rd-upstream.network', - 'dhcp6pd-server.network', - 'dhcp6pd-upstream.network', + '25-dhcp-pd-downstream-dummy97.network', + '25-dhcp-pd-downstream-dummy98.network', + '25-dhcp-pd-downstream-dummy99.network', + '25-dhcp-pd-downstream-test1.network', + '25-dhcp-pd-downstream-veth97.network', + '25-dhcp-pd-downstream-veth97-peer.network', + '25-dhcp-pd-downstream-veth98.network', + '25-dhcp-pd-downstream-veth98-peer.network', + '25-dhcp4-6rd-server.network', + '25-dhcp4-6rd-upstream.network', + '25-dhcp6pd-server.network', + '25-dhcp6pd-upstream.network', ] def setUp(self): @@ -5051,13 +5051,13 @@ class NetworkdDHCPPDTests(unittest.TestCase, Utilities): stop_networkd(show_logs=True) def test_dhcp6pd(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp6pd-server.network', 'dhcp6pd-upstream.network', - '25-veth-downstream-veth97.netdev', 'dhcp-pd-downstream-veth97.network', 'dhcp-pd-downstream-veth97-peer.network', - '25-veth-downstream-veth98.netdev', 'dhcp-pd-downstream-veth98.network', 'dhcp-pd-downstream-veth98-peer.network', - '11-dummy.netdev', 'dhcp-pd-downstream-test1.network', - 'dhcp-pd-downstream-dummy97.network', - '12-dummy.netdev', 'dhcp-pd-downstream-dummy98.network', - '13-dummy.netdev', 'dhcp-pd-downstream-dummy99.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp6pd-server.network', '25-dhcp6pd-upstream.network', + '25-veth-downstream-veth97.netdev', '25-dhcp-pd-downstream-veth97.network', '25-dhcp-pd-downstream-veth97-peer.network', + '25-veth-downstream-veth98.netdev', '25-dhcp-pd-downstream-veth98.network', '25-dhcp-pd-downstream-veth98-peer.network', + '11-dummy.netdev', '25-dhcp-pd-downstream-test1.network', + '25-dhcp-pd-downstream-dummy97.network', + '12-dummy.netdev', '25-dhcp-pd-downstream-dummy98.network', + '13-dummy.netdev', '25-dhcp-pd-downstream-dummy99.network') start_networkd() self.wait_online(['veth-peer:routable']) @@ -5425,13 +5425,13 @@ class NetworkdDHCPPDTests(unittest.TestCase, Utilities): self.assertIn('via ::10.0.0.1 dev {}'.format(tunnel_name), output) def test_dhcp4_6rd(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp4-6rd-server.network', 'dhcp4-6rd-upstream.network', - '25-veth-downstream-veth97.netdev', 'dhcp-pd-downstream-veth97.network', 'dhcp-pd-downstream-veth97-peer.network', - '25-veth-downstream-veth98.netdev', 'dhcp-pd-downstream-veth98.network', 'dhcp-pd-downstream-veth98-peer.network', - '11-dummy.netdev', 'dhcp-pd-downstream-test1.network', - 'dhcp-pd-downstream-dummy97.network', - '12-dummy.netdev', 'dhcp-pd-downstream-dummy98.network', - '13-dummy.netdev', 'dhcp-pd-downstream-dummy99.network', + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-dhcp4-6rd-server.network', '25-dhcp4-6rd-upstream.network', + '25-veth-downstream-veth97.netdev', '25-dhcp-pd-downstream-veth97.network', '25-dhcp-pd-downstream-veth97-peer.network', + '25-veth-downstream-veth98.netdev', '25-dhcp-pd-downstream-veth98.network', '25-dhcp-pd-downstream-veth98-peer.network', + '11-dummy.netdev', '25-dhcp-pd-downstream-test1.network', + '25-dhcp-pd-downstream-dummy97.network', + '12-dummy.netdev', '25-dhcp-pd-downstream-dummy98.network', + '13-dummy.netdev', '25-dhcp-pd-downstream-dummy99.network', '80-6rd-tunnel.network') start_networkd() @@ -5492,10 +5492,10 @@ class NetworkdIPv6PrefixTests(unittest.TestCase, Utilities): units = [ '12-dummy.netdev', '25-veth.netdev', - 'ipv6ra-prefix-client-deny-list.network', - 'ipv6ra-prefix-client.network', - 'ipv6ra-prefix.network', - 'ipv6ra-uplink.network', + '25-ipv6ra-prefix-client-deny-list.network', + '25-ipv6ra-prefix-client.network', + '25-ipv6ra-prefix.network', + '25-ipv6ra-uplink.network', ] def setUp(self): @@ -5508,8 +5508,8 @@ class NetworkdIPv6PrefixTests(unittest.TestCase, Utilities): stop_networkd(show_logs=True) def test_ipv6_route_prefix(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'ipv6ra-prefix-client.network', 'ipv6ra-prefix.network', - '12-dummy.netdev', 'ipv6ra-uplink.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-ipv6ra-prefix-client.network', '25-ipv6ra-prefix.network', + '12-dummy.netdev', '25-ipv6ra-uplink.network') start_networkd() self.wait_online(['veth99:routable', 'veth-peer:routable', 'dummy98:routable']) @@ -5548,8 +5548,8 @@ class NetworkdIPv6PrefixTests(unittest.TestCase, Utilities): check_output(*networkctl_cmd, '--json=short', 'status', env=env) def test_ipv6_route_prefix_deny_list(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'ipv6ra-prefix-client-deny-list.network', 'ipv6ra-prefix.network', - '12-dummy.netdev', 'ipv6ra-uplink.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', '25-ipv6ra-prefix-client-deny-list.network', '25-ipv6ra-prefix.network', + '12-dummy.netdev', '25-ipv6ra-uplink.network') start_networkd() self.wait_online(['veth99:routable', 'veth-peer:routable', 'dummy98:routable']) From c01a098cf7a421c7c142b83fda96f94f02e82ac6 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Feb 18 2022 12:23:35 +0000 Subject: [PATCH 6/6] mkosi: Add more packages required to run systemd-networkd-tests.py Let's also add the required packages to run systemd-networkd-tests.py for Ubuntu and Debian. The Fedora and Arch lists are also updated to include python which is also required to run the tests. --- diff --git a/mkosi.default.d/arch/10-mkosi.arch b/mkosi.default.d/arch/10-mkosi.arch index 0458889..55e8a20 100644 --- a/mkosi.default.d/arch/10-mkosi.arch +++ b/mkosi.default.d/arch/10-mkosi.arch @@ -64,6 +64,7 @@ Packages= # Run `autoload -Uz compinit; compinit` from a zsh shell in the booted image to enable completions. zsh # Required to run systemd-networkd-tests.py + python iproute dnsmasq wireguard-tools diff --git a/mkosi.default.d/debian/10-mkosi.debian b/mkosi.default.d/debian/10-mkosi.debian index 2be71f3..ea2ebda 100644 --- a/mkosi.default.d/debian/10-mkosi.debian +++ b/mkosi.default.d/debian/10-mkosi.debian @@ -73,3 +73,9 @@ Packages= locales nano strace + # Required to run systemd-networkd-tests.py + python3 + iproute2 + dnsmasq-base + wireguard-tools + isc-dhcp-server diff --git a/mkosi.default.d/fedora/10-mkosi.fedora b/mkosi.default.d/fedora/10-mkosi.fedora index 4886431..5fb4cca 100644 --- a/mkosi.default.d/fedora/10-mkosi.fedora +++ b/mkosi.default.d/fedora/10-mkosi.fedora @@ -76,6 +76,7 @@ Packages= e2fsprogs compsize # Required to run systemd-networkd-tests.py + python iproute iproute-tc dnsmasq diff --git a/mkosi.default.d/ubuntu/10-mkosi.ubuntu b/mkosi.default.d/ubuntu/10-mkosi.ubuntu index c9c473e..109bd46 100644 --- a/mkosi.default.d/ubuntu/10-mkosi.ubuntu +++ b/mkosi.default.d/ubuntu/10-mkosi.ubuntu @@ -71,3 +71,9 @@ Packages= locales nano strace + # Required to run systemd-networkd-tests.py + python3 + iproute2 + dnsmasq-base + wireguard-tools + isc-dhcp-server