From fc53809803cd2bc2434e312b19a18fa36776da12 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 12 Jun 2024 05:50:40 +0200 Subject: Adding upstream version 256. Signed-off-by: Daniel Baumann --- test/test-network/conf/11-test-unit-file.link | 20 +++++ .../conf/11-test-unit-file.link.d/dropin.conf | 2 + test/test-network/conf/11-test-unit-file.netdev | 4 + .../conf/11-test-unit-file.netdev.d/dropin.conf | 2 + test/test-network/conf/11-test-unit-file.network | 6 ++ .../conf/11-test-unit-file.network.d/dropin.conf | 2 + test/test-network/conf/21-macvlan.netdev | 4 + test/test-network/conf/24-rps-cpu-disable.link | 6 ++ test/test-network/conf/24-rps-cpu-empty.link | 6 ++ test/test-network/conf/24-rps-cpu-invalid.link | 6 ++ .../20-clear-addresses.conf | 6 ++ .../test-network/conf/25-agent-bridge-port.network | 7 ++ test/test-network/conf/25-agent-bridge.netdev | 4 + test/test-network/conf/25-agent-bridge.network | 12 +++ .../test-network/conf/25-agent-client-peer.network | 2 +- test/test-network/conf/25-agent-client.network | 2 +- .../test-network/conf/25-agent-server-peer.network | 2 +- test/test-network/conf/25-agent-server.network | 2 +- test/test-network/conf/25-bond-property.netdev | 10 +++ .../conf/25-dhcp-server-veth-peer.network | 2 + test/test-network/conf/25-dummy.netdev | 4 + test/test-network/conf/25-dummy.network | 6 ++ test/test-network/conf/25-fibrule-l3mdev.network | 15 ++++ .../conf/25-ipv6-neigh-retrans-time-0s.network | 7 ++ .../conf/25-ipv6-neigh-retrans-time-3s.network | 7 ++ .../conf/25-ipv6-neigh-retrans-time-4s.network | 7 ++ .../25-ipv6-neigh-retrans-time-infinity.network | 7 ++ .../25-ipv6-neigh-retrans-time-invalid.network | 7 ++ .../conf/25-ipv6-neigh-retrans-time-toobig.network | 7 ++ .../25-ipv6-prefix-veth-token-prefixstable.network | 9 +- test/test-network/conf/25-ipv6-prefix.network | 2 + test/test-network/conf/25-ipv6-proxy-ndp.network | 1 - test/test-network/conf/25-neighbor-dummy.network | 8 ++ .../conf/25-neighbor-dummy.network.d/10-step1.conf | 21 +++++ .../conf/25-neighbor-dummy.network.d/10-step2.conf | 8 ++ .../conf/25-neighbor-dummy.network.d/10-step3.conf | 4 + .../test-network/conf/25-neighbor-ip-dummy.network | 8 -- test/test-network/conf/25-neighbor-next.network | 10 --- test/test-network/conf/25-neighbor-section.network | 27 ------ .../25-neighbor-section.network.d/override.conf | 9 -- test/test-network/conf/25-netdevsim.link | 11 +++ test/test-network/conf/25-nexthop-1.network | 82 ++++++++++++++++++ test/test-network/conf/25-nexthop-2.network | 98 ++++++++++++++++++++++ test/test-network/conf/25-nexthop-dummy-1.network | 15 ++++ test/test-network/conf/25-nexthop-dummy-2.network | 20 +++++ test/test-network/conf/25-nexthop-dummy.network | 15 ---- test/test-network/conf/25-nexthop-test1.network | 12 +++ test/test-network/conf/25-nexthop.network | 83 ------------------ test/test-network/conf/25-route-static.network | 2 +- test/test-network/conf/25-rps-cpu-0-1.link | 6 ++ test/test-network/conf/25-rps-cpu-0-empty.link | 7 ++ test/test-network/conf/25-rps-cpu-0-invalid.link | 7 ++ test/test-network/conf/25-rps-cpu-0.link | 6 ++ test/test-network/conf/25-rps-cpu-1.link | 6 ++ test/test-network/conf/25-rps-cpu-all.link | 6 ++ test/test-network/conf/25-rps-cpu-multi.link | 7 ++ test/test-network/conf/25-sriov-udev.network | 2 +- test/test-network/conf/25-sriov.link | 3 + test/test-network/conf/25-sriov.network | 2 +- test/test-network/conf/25-sysctl.network | 4 +- test/test-network/conf/25-veth-bridge.network | 2 +- .../conf/25-veth-peer-no-address.network | 6 ++ .../test-network/conf/25-veth-router-high2.network | 18 ++++ .../conf/25-veth-router-hop-limit.network | 18 ++++ test/test-network/conf/25-veth-router-low2.network | 18 ++++ test/test-network/conf/25-veth-router.netdev | 9 ++ .../conf/25-wireguard-endpoint-peer0-cred.txt | 1 + .../conf/25-wireguard-no-peer-private-key-cred.txt | 1 + test/test-network/conf/25-wireguard-no-peer.netdev | 2 +- .../conf/25-wireguard-preshared-key-peer2-cred.txt | 1 + test/test-network/conf/25-wireguard.netdev | 4 +- .../conf/25-wireguard.netdev.d/peer2.conf | 2 +- .../test-network/conf/26-bridge-mac-master.network | 6 ++ test/test-network/conf/26-bridge-mac-slave.network | 7 ++ test/test-network/conf/26-bridge-mac.link | 6 ++ test/test-network/conf/26-bridge-mac.netdev | 5 ++ .../conf/26-bridge-vlan-master-issue-20373.network | 1 - .../conf/26-bridge-vlan-master.network | 6 +- .../10-override.conf | 11 +++ .../20-override.conf | 9 ++ .../30-override.conf | 5 ++ .../conf/26-bridge-vlan-slave-issue-20373.network | 1 - .../test-network/conf/26-bridge-vlan-slave.network | 6 +- .../10-override.conf | 11 +++ .../20-override.conf | 9 ++ .../30-override.conf | 5 ++ .../conf/networkd-manage-foreign-nexthops-no.conf | 3 + test/test-network/conf/persist-leases-no.conf | 3 + 88 files changed, 679 insertions(+), 172 deletions(-) create mode 100644 test/test-network/conf/11-test-unit-file.link create mode 100644 test/test-network/conf/11-test-unit-file.link.d/dropin.conf create mode 100644 test/test-network/conf/11-test-unit-file.netdev create mode 100644 test/test-network/conf/11-test-unit-file.netdev.d/dropin.conf create mode 100644 test/test-network/conf/11-test-unit-file.network create mode 100644 test/test-network/conf/11-test-unit-file.network.d/dropin.conf create mode 100644 test/test-network/conf/24-rps-cpu-disable.link create mode 100644 test/test-network/conf/24-rps-cpu-empty.link create mode 100644 test/test-network/conf/24-rps-cpu-invalid.link create mode 100644 test/test-network/conf/25-address-static.network.d/20-clear-addresses.conf create mode 100644 test/test-network/conf/25-agent-bridge-port.network create mode 100644 test/test-network/conf/25-agent-bridge.netdev create mode 100644 test/test-network/conf/25-agent-bridge.network create mode 100644 test/test-network/conf/25-bond-property.netdev create mode 100644 test/test-network/conf/25-dummy.netdev create mode 100644 test/test-network/conf/25-dummy.network create mode 100644 test/test-network/conf/25-fibrule-l3mdev.network create mode 100644 test/test-network/conf/25-ipv6-neigh-retrans-time-0s.network create mode 100644 test/test-network/conf/25-ipv6-neigh-retrans-time-3s.network create mode 100644 test/test-network/conf/25-ipv6-neigh-retrans-time-4s.network create mode 100644 test/test-network/conf/25-ipv6-neigh-retrans-time-infinity.network create mode 100644 test/test-network/conf/25-ipv6-neigh-retrans-time-invalid.network create mode 100644 test/test-network/conf/25-ipv6-neigh-retrans-time-toobig.network create mode 100644 test/test-network/conf/25-neighbor-dummy.network create mode 100644 test/test-network/conf/25-neighbor-dummy.network.d/10-step1.conf create mode 100644 test/test-network/conf/25-neighbor-dummy.network.d/10-step2.conf create mode 100644 test/test-network/conf/25-neighbor-dummy.network.d/10-step3.conf delete mode 100644 test/test-network/conf/25-neighbor-ip-dummy.network delete mode 100644 test/test-network/conf/25-neighbor-next.network delete mode 100644 test/test-network/conf/25-neighbor-section.network delete mode 100644 test/test-network/conf/25-neighbor-section.network.d/override.conf create mode 100644 test/test-network/conf/25-netdevsim.link create mode 100644 test/test-network/conf/25-nexthop-1.network create mode 100644 test/test-network/conf/25-nexthop-2.network create mode 100644 test/test-network/conf/25-nexthop-dummy-1.network create mode 100644 test/test-network/conf/25-nexthop-dummy-2.network delete mode 100644 test/test-network/conf/25-nexthop-dummy.network create mode 100644 test/test-network/conf/25-nexthop-test1.network delete mode 100644 test/test-network/conf/25-nexthop.network create mode 100644 test/test-network/conf/25-rps-cpu-0-1.link create mode 100644 test/test-network/conf/25-rps-cpu-0-empty.link create mode 100644 test/test-network/conf/25-rps-cpu-0-invalid.link create mode 100644 test/test-network/conf/25-rps-cpu-0.link create mode 100644 test/test-network/conf/25-rps-cpu-1.link create mode 100644 test/test-network/conf/25-rps-cpu-all.link create mode 100644 test/test-network/conf/25-rps-cpu-multi.link create mode 100644 test/test-network/conf/25-veth-peer-no-address.network create mode 100644 test/test-network/conf/25-veth-router-high2.network create mode 100644 test/test-network/conf/25-veth-router-hop-limit.network create mode 100644 test/test-network/conf/25-veth-router-low2.network create mode 100644 test/test-network/conf/25-veth-router.netdev create mode 100644 test/test-network/conf/25-wireguard-endpoint-peer0-cred.txt create mode 100644 test/test-network/conf/25-wireguard-no-peer-private-key-cred.txt create mode 100644 test/test-network/conf/25-wireguard-preshared-key-peer2-cred.txt create mode 100644 test/test-network/conf/26-bridge-mac-master.network create mode 100644 test/test-network/conf/26-bridge-mac-slave.network create mode 100644 test/test-network/conf/26-bridge-mac.link create mode 100644 test/test-network/conf/26-bridge-mac.netdev create mode 100644 test/test-network/conf/26-bridge-vlan-master.network.d/10-override.conf create mode 100644 test/test-network/conf/26-bridge-vlan-master.network.d/20-override.conf create mode 100644 test/test-network/conf/26-bridge-vlan-master.network.d/30-override.conf create mode 100644 test/test-network/conf/26-bridge-vlan-slave.network.d/10-override.conf create mode 100644 test/test-network/conf/26-bridge-vlan-slave.network.d/20-override.conf create mode 100644 test/test-network/conf/26-bridge-vlan-slave.network.d/30-override.conf create mode 100644 test/test-network/conf/networkd-manage-foreign-nexthops-no.conf create mode 100644 test/test-network/conf/persist-leases-no.conf (limited to 'test/test-network/conf') diff --git a/test/test-network/conf/11-test-unit-file.link b/test/test-network/conf/11-test-unit-file.link new file mode 100644 index 0000000..429ac31 --- /dev/null +++ b/test/test-network/conf/11-test-unit-file.link @@ -0,0 +1,20 @@ +# SPDX-License-Identifier: MIT-0 +# +# This config file is installed as part of systemd. +# It may be freely copied and edited (following the MIT No Attribution license). +# +# To make local modifications, one of the following methods may be used: +# 1. add a drop-in file that extends this file by creating the +# /etc/systemd/network/99-default.link.d/ directory and creating a +# new .conf file there. +# 2. copy this file into /etc/systemd/network or one of the other paths checked +# by systemd-udevd and edit it there. +# This file should not be edited in place, because it'll be overwritten on upgrades. + +[Match] +OriginalName=* + +[Link] +NamePolicy=keep kernel database onboard slot path +AlternativeNamesPolicy=database onboard slot path +MACAddressPolicy=persistent diff --git a/test/test-network/conf/11-test-unit-file.link.d/dropin.conf b/test/test-network/conf/11-test-unit-file.link.d/dropin.conf new file mode 100644 index 0000000..dfddc0a --- /dev/null +++ b/test/test-network/conf/11-test-unit-file.link.d/dropin.conf @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Link] diff --git a/test/test-network/conf/11-test-unit-file.netdev b/test/test-network/conf/11-test-unit-file.netdev new file mode 100644 index 0000000..86af17f --- /dev/null +++ b/test/test-network/conf/11-test-unit-file.netdev @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[NetDev] +Name=test1 +Kind=dummy diff --git a/test/test-network/conf/11-test-unit-file.netdev.d/dropin.conf b/test/test-network/conf/11-test-unit-file.netdev.d/dropin.conf new file mode 100644 index 0000000..6fde598 --- /dev/null +++ b/test/test-network/conf/11-test-unit-file.netdev.d/dropin.conf @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[NetDev] diff --git a/test/test-network/conf/11-test-unit-file.network b/test/test-network/conf/11-test-unit-file.network new file mode 100644 index 0000000..0a4511b --- /dev/null +++ b/test/test-network/conf/11-test-unit-file.network @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=test1 + +[Network] +IPv6AcceptRA=no diff --git a/test/test-network/conf/11-test-unit-file.network.d/dropin.conf b/test/test-network/conf/11-test-unit-file.network.d/dropin.conf new file mode 100644 index 0000000..f2f6099 --- /dev/null +++ b/test/test-network/conf/11-test-unit-file.network.d/dropin.conf @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Network] diff --git a/test/test-network/conf/21-macvlan.netdev b/test/test-network/conf/21-macvlan.netdev index fdc81ea..d742f64 100644 --- a/test/test-network/conf/21-macvlan.netdev +++ b/test/test-network/conf/21-macvlan.netdev @@ -3,3 +3,7 @@ Name=macvlan99 Kind=macvlan MTUBytes=2000 + +[MACVLAN] +BroadcastMulticastQueueLength=1234 +BroadcastQueueThreshold=2147483647 diff --git a/test/test-network/conf/24-rps-cpu-disable.link b/test/test-network/conf/24-rps-cpu-disable.link new file mode 100644 index 0000000..fb3451a --- /dev/null +++ b/test/test-network/conf/24-rps-cpu-disable.link @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +OriginalName=dummy98 + +[Link] +ReceivePacketSteeringCPUMask=disable diff --git a/test/test-network/conf/24-rps-cpu-empty.link b/test/test-network/conf/24-rps-cpu-empty.link new file mode 100644 index 0000000..fc1342b --- /dev/null +++ b/test/test-network/conf/24-rps-cpu-empty.link @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +OriginalName=dummy98 + +[Link] +ReceivePacketSteeringCPUMask= diff --git a/test/test-network/conf/24-rps-cpu-invalid.link b/test/test-network/conf/24-rps-cpu-invalid.link new file mode 100644 index 0000000..76d6713 --- /dev/null +++ b/test/test-network/conf/24-rps-cpu-invalid.link @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +OriginalName=dummy98 + +[Link] +ReceivePacketSteeringCPUMask=0 3 8-invalid diff --git a/test/test-network/conf/25-address-static.network.d/20-clear-addresses.conf b/test/test-network/conf/25-address-static.network.d/20-clear-addresses.conf new file mode 100644 index 0000000..a38b07c --- /dev/null +++ b/test/test-network/conf/25-address-static.network.d/20-clear-addresses.conf @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +[Network] +# An empty string clears previously configured addresses. +Address= +Address=10.4.0.1/16 diff --git a/test/test-network/conf/25-agent-bridge-port.network b/test/test-network/conf/25-agent-bridge-port.network new file mode 100644 index 0000000..709a783 --- /dev/null +++ b/test/test-network/conf/25-agent-bridge-port.network @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=client-peer + +[Network] +Bridge=bridge-relay +IPv6AcceptRA=no diff --git a/test/test-network/conf/25-agent-bridge.netdev b/test/test-network/conf/25-agent-bridge.netdev new file mode 100644 index 0000000..a611337 --- /dev/null +++ b/test/test-network/conf/25-agent-bridge.netdev @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[NetDev] +Name=bridge-relay +Kind=bridge diff --git a/test/test-network/conf/25-agent-bridge.network b/test/test-network/conf/25-agent-bridge.network new file mode 100644 index 0000000..8383790 --- /dev/null +++ b/test/test-network/conf/25-agent-bridge.network @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=bridge-relay + +[Network] +Address=192.168.2.1/24 +DHCPServer=yes +IPv6AcceptRA=no + +[DHCPServer] +RelayTarget=192.168.1.1 +RelayAgentRemoteId=string:aabbccdd diff --git a/test/test-network/conf/25-agent-client-peer.network b/test/test-network/conf/25-agent-client-peer.network index e31108b..4d7d758 100644 --- a/test/test-network/conf/25-agent-client-peer.network +++ b/test/test-network/conf/25-agent-client-peer.network @@ -5,7 +5,7 @@ Name=client-peer [Network] Address=192.168.6.2/24 DHCPServer=yes -IPForward=ipv4 +IPv4Forwarding=yes IPv6AcceptRA=no [DHCPServer] diff --git a/test/test-network/conf/25-agent-client.network b/test/test-network/conf/25-agent-client.network index cfa7e5a..219d40a 100644 --- a/test/test-network/conf/25-agent-client.network +++ b/test/test-network/conf/25-agent-client.network @@ -4,5 +4,5 @@ Name=client [Network] DHCP=yes -IPForward=ipv4 +IPv4Forwarding=yes IPv6AcceptRA=no diff --git a/test/test-network/conf/25-agent-server-peer.network b/test/test-network/conf/25-agent-server-peer.network index 1f6fa4b..5e005c7 100644 --- a/test/test-network/conf/25-agent-server-peer.network +++ b/test/test-network/conf/25-agent-server-peer.network @@ -4,5 +4,5 @@ Name=server-peer [Network] Address=192.168.5.2/24 -IPForward=ipv4 +IPv4Forwarding=yes IPv6AcceptRA=no diff --git a/test/test-network/conf/25-agent-server.network b/test/test-network/conf/25-agent-server.network index 905508f..0108039 100644 --- a/test/test-network/conf/25-agent-server.network +++ b/test/test-network/conf/25-agent-server.network @@ -4,7 +4,7 @@ Name=server [Network] Address=192.168.5.1/24 -IPForward=ipv4 +IPv4Forwarding=yes DHCPServer=yes IPv6AcceptRA=no diff --git a/test/test-network/conf/25-bond-property.netdev b/test/test-network/conf/25-bond-property.netdev new file mode 100644 index 0000000..3954689 --- /dev/null +++ b/test/test-network/conf/25-bond-property.netdev @@ -0,0 +1,10 @@ +[NetDev] +Name=bond97 +Kind=bond + +[Bond] +Mode=active-backup +PrimaryReselectPolicy=always +MIIMonitorSec=1s +ARPMissedMax=10 +PeerNotifyDelaySec=300s diff --git a/test/test-network/conf/25-dhcp-server-veth-peer.network b/test/test-network/conf/25-dhcp-server-veth-peer.network index d5cc6d3..abe3fa2 100644 --- a/test/test-network/conf/25-dhcp-server-veth-peer.network +++ b/test/test-network/conf/25-dhcp-server-veth-peer.network @@ -6,3 +6,5 @@ Name=veth-peer IPv6AcceptRA=no Address=2600::1/0 Address=192.168.5.1/24 +# To make the kernel send NA with IsRouter flag. +IPv6Forwarding=yes diff --git a/test/test-network/conf/25-dummy.netdev b/test/test-network/conf/25-dummy.netdev new file mode 100644 index 0000000..d7cf7b4 --- /dev/null +++ b/test/test-network/conf/25-dummy.netdev @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[NetDev] +Name=test25 +Kind=dummy diff --git a/test/test-network/conf/25-dummy.network b/test/test-network/conf/25-dummy.network new file mode 100644 index 0000000..a6e93fd --- /dev/null +++ b/test/test-network/conf/25-dummy.network @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=test25 + +[Network] +IPv6AcceptRA=no diff --git a/test/test-network/conf/25-fibrule-l3mdev.network b/test/test-network/conf/25-fibrule-l3mdev.network new file mode 100644 index 0000000..a1afcd2 --- /dev/null +++ b/test/test-network/conf/25-fibrule-l3mdev.network @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=test1 + +[Network] +IPv6AcceptRA=no + +[RoutingPolicyRule] +Priority=1500 +L3MasterDevice=true + +[RoutingPolicyRule] +Priority=2000 +L3MasterDevice=true +Type=unreachable diff --git a/test/test-network/conf/25-ipv6-neigh-retrans-time-0s.network b/test/test-network/conf/25-ipv6-neigh-retrans-time-0s.network new file mode 100644 index 0000000..04c7c49 --- /dev/null +++ b/test/test-network/conf/25-ipv6-neigh-retrans-time-0s.network @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=test25 + +[Network] +IPv6AcceptRA=no +IPv6RetransmissionTimeSec=0 diff --git a/test/test-network/conf/25-ipv6-neigh-retrans-time-3s.network b/test/test-network/conf/25-ipv6-neigh-retrans-time-3s.network new file mode 100644 index 0000000..b4dbd06 --- /dev/null +++ b/test/test-network/conf/25-ipv6-neigh-retrans-time-3s.network @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=test25 + +[Network] +IPv6AcceptRA=no +IPv6RetransmissionTimeSec=3 diff --git a/test/test-network/conf/25-ipv6-neigh-retrans-time-4s.network b/test/test-network/conf/25-ipv6-neigh-retrans-time-4s.network new file mode 100644 index 0000000..cbdf4f3 --- /dev/null +++ b/test/test-network/conf/25-ipv6-neigh-retrans-time-4s.network @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=test25 + +[Network] +IPv6AcceptRA=no +IPv6RetransmissionTimeSec=4 diff --git a/test/test-network/conf/25-ipv6-neigh-retrans-time-infinity.network b/test/test-network/conf/25-ipv6-neigh-retrans-time-infinity.network new file mode 100644 index 0000000..085cb30 --- /dev/null +++ b/test/test-network/conf/25-ipv6-neigh-retrans-time-infinity.network @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=test25 + +[Network] +IPv6AcceptRA=no +IPv6RetransmissionTimeSec=infinity diff --git a/test/test-network/conf/25-ipv6-neigh-retrans-time-invalid.network b/test/test-network/conf/25-ipv6-neigh-retrans-time-invalid.network new file mode 100644 index 0000000..8a0bf83 --- /dev/null +++ b/test/test-network/conf/25-ipv6-neigh-retrans-time-invalid.network @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=test25 + +[Network] +IPv6AcceptRA=no +IPv6RetransmissionTimeSec=-2 diff --git a/test/test-network/conf/25-ipv6-neigh-retrans-time-toobig.network b/test/test-network/conf/25-ipv6-neigh-retrans-time-toobig.network new file mode 100644 index 0000000..0976bae --- /dev/null +++ b/test/test-network/conf/25-ipv6-neigh-retrans-time-toobig.network @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=test25 + +[Network] +IPv6AcceptRA=no +IPv6RetransmissionTimeSec=999999999999999999 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 index ac50700..11502fd 100644 --- a/test/test-network/conf/25-ipv6-prefix-veth-token-prefixstable.network +++ b/test/test-network/conf/25-ipv6-prefix-veth-token-prefixstable.network @@ -6,8 +6,6 @@ Name=veth99 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::, @@ -17,3 +15,10 @@ Token=prefixstable@ Token=static Token=static: Token=static::: +# valid token +Token=prefixstable:2002:da8:1:: +Token=prefixstable:2002:da8:1::,86b123b969ba4b7eb8b3d8605123525a +# reset token +Token= +# set token again +Token=prefixstable:2002:da8:1::,86b123b969ba4b7eb8b3d8605123525a diff --git a/test/test-network/conf/25-ipv6-prefix.network b/test/test-network/conf/25-ipv6-prefix.network index 9cf8f25..e801581 100644 --- a/test/test-network/conf/25-ipv6-prefix.network +++ b/test/test-network/conf/25-ipv6-prefix.network @@ -10,6 +10,8 @@ IPv6SendRA=yes DNS=_link_local 2002:da8:1:0::1 DNSLifetimeSec=1min Domains=hogehoge.test +ReachableTimeSec=42 +RetransmitSec=500ms [IPv6Prefix] Prefix=2002:da8:1:0::/64 diff --git a/test/test-network/conf/25-ipv6-proxy-ndp.network b/test/test-network/conf/25-ipv6-proxy-ndp.network index 81302ab..d01a633 100644 --- a/test/test-network/conf/25-ipv6-proxy-ndp.network +++ b/test/test-network/conf/25-ipv6-proxy-ndp.network @@ -9,7 +9,6 @@ IPv6ProxyNDPAddress=2607:5300:203:5215:3::1 IPv6ProxyNDPAddress=2607:5300:203:5215:2::1 IPv6ProxyNDPAddress=2607:5300:203:5215:1::1 IPv6AcceptRA=no -IPForward=yes Address=66.70.129.136/32 Address=66.70.129.142/32 Address=66.70.129.143/32 diff --git a/test/test-network/conf/25-neighbor-dummy.network b/test/test-network/conf/25-neighbor-dummy.network new file mode 100644 index 0000000..f1b1151 --- /dev/null +++ b/test/test-network/conf/25-neighbor-dummy.network @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=dummy98 + +[Network] +IPv6AcceptRA=no +Tunnel=gretun97 +Tunnel=ip6gretun97 diff --git a/test/test-network/conf/25-neighbor-dummy.network.d/10-step1.conf b/test/test-network/conf/25-neighbor-dummy.network.d/10-step1.conf new file mode 100644 index 0000000..727089e --- /dev/null +++ b/test/test-network/conf/25-neighbor-dummy.network.d/10-step1.conf @@ -0,0 +1,21 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Neighbor] +Address=192.168.10.1 +LinkLayerAddress=00:00:5e:00:02:65 + +[Neighbor] +Address=2004:da8:1:0::1 +LinkLayerAddress=00:00:5e:00:02:66 + +[Neighbor] +# unmatching link layer address length +Address=2004:da8:1:0::2 +LinkLayerAddress=192.168.0.1 + +[Neighbor] +# invalid setting (without LinkLayerAddress=) +Address=192.168.10.2 + +[Neighbor] +# invalid setting (without Address=) +LinkLayerAddress=00:00:5e:00:02:67 diff --git a/test/test-network/conf/25-neighbor-dummy.network.d/10-step2.conf b/test/test-network/conf/25-neighbor-dummy.network.d/10-step2.conf new file mode 100644 index 0000000..e28e3fc --- /dev/null +++ b/test/test-network/conf/25-neighbor-dummy.network.d/10-step2.conf @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Neighbor] +Address=192.168.10.1 +LinkLayerAddress=00:00:5e:00:03:65 + +[Neighbor] +Address=2004:da8:1:0::1 +LinkLayerAddress=00:00:5e:00:03:66 diff --git a/test/test-network/conf/25-neighbor-dummy.network.d/10-step3.conf b/test/test-network/conf/25-neighbor-dummy.network.d/10-step3.conf new file mode 100644 index 0000000..9262b74 --- /dev/null +++ b/test/test-network/conf/25-neighbor-dummy.network.d/10-step3.conf @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Neighbor] +Address=192.168.10.1 +LinkLayerAddress=00:00:5e:00:03:66 diff --git a/test/test-network/conf/25-neighbor-ip-dummy.network b/test/test-network/conf/25-neighbor-ip-dummy.network deleted file mode 100644 index f1b1151..0000000 --- a/test/test-network/conf/25-neighbor-ip-dummy.network +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=dummy98 - -[Network] -IPv6AcceptRA=no -Tunnel=gretun97 -Tunnel=ip6gretun97 diff --git a/test/test-network/conf/25-neighbor-next.network b/test/test-network/conf/25-neighbor-next.network deleted file mode 100644 index 6911f48..0000000 --- a/test/test-network/conf/25-neighbor-next.network +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=dummy98 - -[Network] -IPv6AcceptRA=no - -[Neighbor] -Address=192.168.10.1 -LinkLayerAddress=00:00:5e:00:02:66 diff --git a/test/test-network/conf/25-neighbor-section.network b/test/test-network/conf/25-neighbor-section.network deleted file mode 100644 index 59e21eb..0000000 --- a/test/test-network/conf/25-neighbor-section.network +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=dummy98 - -[Network] -IPv6AcceptRA=no - -[Neighbor] -Address=192.168.10.1 -LinkLayerAddress=00:00:5e:00:02:65 - -[Neighbor] -Address=2004:da8:1:0::1 -LinkLayerAddress=00:00:5e:00:02:66 - -[Neighbor] -# unmatching link layer address length -Address=2004:da8:1:0::2 -LinkLayerAddress=192.168.0.1 - -[Neighbor] -# invalid setting (without LinkLayerAddress=) -Address=192.168.10.2 - -[Neighbor] -# invalid setting (without Address=) -LinkLayerAddress=00:00:5e:00:02:67 diff --git a/test/test-network/conf/25-neighbor-section.network.d/override.conf b/test/test-network/conf/25-neighbor-section.network.d/override.conf deleted file mode 100644 index 01027e3..0000000 --- a/test/test-network/conf/25-neighbor-section.network.d/override.conf +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later - -[Neighbor] -Address=192.168.10.1 -LinkLayerAddress=00:00:5e:00:03:65 - -[Neighbor] -Address=2004:da8:1:0::1 -LinkLayerAddress=00:00:5e:00:03:66 diff --git a/test/test-network/conf/25-netdevsim.link b/test/test-network/conf/25-netdevsim.link new file mode 100644 index 0000000..f8beb55 --- /dev/null +++ b/test/test-network/conf/25-netdevsim.link @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Driver=netdevsim + +[Link] +NamePolicy=keep kernel database onboard slot path +AlternativeNamesPolicy=database onboard slot path mac +# Also set a fixed name. Workaround for bug in kernel 6.9: +# https://github.com/torvalds/linux/commit/8debcf5832c3e8a6baaea27c75ad8a6ba5077beb +AlternativeName=sim99 +MACAddressPolicy=persistent diff --git a/test/test-network/conf/25-nexthop-1.network b/test/test-network/conf/25-nexthop-1.network new file mode 100644 index 0000000..a5a8d81 --- /dev/null +++ b/test/test-network/conf/25-nexthop-1.network @@ -0,0 +1,82 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth99 + +[Network] +IPv6AcceptRA=no +Address=2001:1234:5:8f63::1/120 +Address=192.168.5.10/24 + +[NextHop] +Id=1 +Gateway=192.168.5.1 + +[NextHop] +Id=2 +Gateway=2001:1234:5:8f63::2 + +[NextHop] +Id=3 +Family=ipv6 + +[NextHop] +Id=4 +Family=ipv4 + +[NextHop] +Id=5 +Gateway=192.168.10.1 +OnLink=yes + +[NextHop] +Id=6 +Family=ipv4 +Blackhole=yes + +[NextHop] +Id=7 +Family=ipv6 +Blackhole=yes + +[NextHop] +Id=8 +Gateway=fe80::222:4dff:ff:ff:ff:ff + +[NextHop] +Gateway=192.168.5.2 + +[NextHop] +Family=ipv4 +Blackhole=yes + +[NextHop] +Family=ipv6 +Blackhole=yes + +[Route] +NextHop=1 +Destination=10.10.10.10 + +[Route] +NextHop=2 +Destination=10.10.10.11 + +[Route] +NextHop=2 +Destination=2001:1234:5:8f62::1 + +[Route] +NextHop=5 +Destination=10.10.10.12 + +[Route] +NextHop=6 +Destination=10.10.10.13 + +[Route] +NextHop=7 +Destination=2001:1234:5:8f62::2 + +[Route] +NextHop=21 +Destination=10.10.10.14 diff --git a/test/test-network/conf/25-nexthop-2.network b/test/test-network/conf/25-nexthop-2.network new file mode 100644 index 0000000..63062f3 --- /dev/null +++ b/test/test-network/conf/25-nexthop-2.network @@ -0,0 +1,98 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth99 + +[Network] +IPv6AcceptRA=no +Address=2001:1234:5:8f63::1/120 +Address=192.168.5.10/24 + +# Commented out lines are specified in 25-nexthop.network + +[NextHop] +#Id=1 +Id=6 +Gateway=192.168.5.1 + +[NextHop] +#Id=2 +Id=7 +Gateway=2001:1234:5:8f63::2 + +[NextHop] +#Id=3 +Id=4 +Family=ipv6 + +[NextHop] +#Id=4 +Id=3 +Family=ipv4 + +[NextHop] +Id=5 +#Gateway=192.168.10.1 +#OnLink=yes +Gateway=192.168.5.3 +OnLink=no + +[NextHop] +#Id=6 +Id=1 +Family=ipv4 +Blackhole=yes + +[NextHop] +#Id=7 +Id=2 +Family=ipv6 +Blackhole=yes + +[NextHop] +Id=8 +Gateway=fe80::222:4dff:ff:ff:ff:ff + +[NextHop] +Gateway=192.168.5.2 + +[NextHop] +Family=ipv4 +Blackhole=yes + +[NextHop] +Family=ipv6 +Blackhole=yes + +[Route] +#NextHop=1 +NextHop=6 +Destination=10.10.10.10 + +[Route] +#NextHop=2 +NextHop=7 +Destination=10.10.10.11 + +[Route] +#NextHop=2 +NextHop=7 +Destination=2001:1234:5:8f62::1 + +[Route] +NextHop=5 +Destination=10.10.10.12 + +[Route] +#NextHop=6 +NextHop=1 +Destination=10.10.10.13 + +[Route] +#NextHop=7 +NextHop=2 +Destination=2001:1234:5:8f62::2 + +[Route] +#NextHop=21 +NextHop=20 +Destination=10.10.10.14 diff --git a/test/test-network/conf/25-nexthop-dummy-1.network b/test/test-network/conf/25-nexthop-dummy-1.network new file mode 100644 index 0000000..a7bdaa9 --- /dev/null +++ b/test/test-network/conf/25-nexthop-dummy-1.network @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=dummy98 + +[Network] +Address=192.168.20.20/24 +IPv6AcceptRA=no + +[NextHop] +Id=20 +Gateway=192.168.20.1 + +[NextHop] +Id=21 +Group=1:3 20:1 diff --git a/test/test-network/conf/25-nexthop-dummy-2.network b/test/test-network/conf/25-nexthop-dummy-2.network new file mode 100644 index 0000000..2556b1f --- /dev/null +++ b/test/test-network/conf/25-nexthop-dummy-2.network @@ -0,0 +1,20 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=dummy98 + +[Network] +Address=192.168.20.20/24 +IPv6AcceptRA=no + +# Commented out lines are specified in 25-nexthop-dummy.network + +[NextHop] +#Id=20 +Id=21 +Gateway=192.168.20.1 + +[NextHop] +#Id=21 +#Group=1:3 20:1 +Id=20 +Group=5:3 21:1 diff --git a/test/test-network/conf/25-nexthop-dummy.network b/test/test-network/conf/25-nexthop-dummy.network deleted file mode 100644 index a7bdaa9..0000000 --- a/test/test-network/conf/25-nexthop-dummy.network +++ /dev/null @@ -1,15 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=dummy98 - -[Network] -Address=192.168.20.20/24 -IPv6AcceptRA=no - -[NextHop] -Id=20 -Gateway=192.168.20.1 - -[NextHop] -Id=21 -Group=1:3 20:1 diff --git a/test/test-network/conf/25-nexthop-test1.network b/test/test-network/conf/25-nexthop-test1.network new file mode 100644 index 0000000..5a4c596 --- /dev/null +++ b/test/test-network/conf/25-nexthop-test1.network @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=test1 + +[Network] +Address=192.168.20.21/24 +IPv6AcceptRA=no + +[Route] +Destination=10.10.11.10 +# Nexthop 21 is configured as a group nexthop of 1 and 20 +NextHop=21 diff --git a/test/test-network/conf/25-nexthop.network b/test/test-network/conf/25-nexthop.network deleted file mode 100644 index f53a58b..0000000 --- a/test/test-network/conf/25-nexthop.network +++ /dev/null @@ -1,83 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Match] -Name=veth99 - -[Network] -IPv6AcceptRA=no -Address=2001:1234:5:8f63::1/120 -Address=192.168.5.10/24 -Gateway=192.168.5.1 - -[NextHop] -Id=1 -Gateway=192.168.5.1 - -[NextHop] -Id=2 -Gateway=2001:1234:5:8f63::2 - -[NextHop] -Id=3 -Family=ipv6 - -[NextHop] -Id=4 -Family=ipv4 - -[NextHop] -Id=5 -Gateway=192.168.10.1 -OnLink=yes - -[NextHop] -Id=6 -Family=ipv4 -Blackhole=yes - -[NextHop] -Id=7 -Family=ipv6 -Blackhole=yes - -[NextHop] -Id=8 -Gateway=fe80::222:4dff:ff:ff:ff:ff - -[NextHop] -Gateway=192.168.5.2 - -[NextHop] -Family=ipv4 -Blackhole=yes - -[NextHop] -Family=ipv6 -Blackhole=yes - -[Route] -NextHop=1 -Destination=10.10.10.10 - -[Route] -NextHop=2 -Destination=10.10.10.11 - -[Route] -NextHop=2 -Destination=2001:1234:5:8f62::1 - -[Route] -NextHop=5 -Destination=10.10.10.12 - -[Route] -NextHop=6 -Destination=10.10.10.13 - -[Route] -NextHop=7 -Destination=2001:1234:5:8f62::2 - -[Route] -NextHop=21 -Destination=10.10.10.14 diff --git a/test/test-network/conf/25-route-static.network b/test/test-network/conf/25-route-static.network index 7ef211d..5ddd7de 100644 --- a/test/test-network/conf/25-route-static.network +++ b/test/test-network/conf/25-route-static.network @@ -96,7 +96,7 @@ MultiPathRoute=149.10.124.59 10 MultiPathRoute=149.10.124.60 5 [Route] -Destination=2001:1234:5:7fff:ff:ff:ff:ff/128 +Destination=2001:1234:5:bfff:ff:ff:ff:ff/128 MultiPathRoute=2001:1234:5:6fff:ff:ff:ff:ff@test1 20 MultiPathRoute=2001:1234:5:7fff:ff:ff:ff:ff@test1 30 MultiPathRoute=2001:1234:5:8fff:ff:ff:ff:ff@dummy98 10 diff --git a/test/test-network/conf/25-rps-cpu-0-1.link b/test/test-network/conf/25-rps-cpu-0-1.link new file mode 100644 index 0000000..d026248 --- /dev/null +++ b/test/test-network/conf/25-rps-cpu-0-1.link @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +OriginalName=dummy98 + +[Link] +ReceivePacketSteeringCPUMask=0 1 diff --git a/test/test-network/conf/25-rps-cpu-0-empty.link b/test/test-network/conf/25-rps-cpu-0-empty.link new file mode 100644 index 0000000..b25b417 --- /dev/null +++ b/test/test-network/conf/25-rps-cpu-0-empty.link @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +OriginalName=dummy98 + +[Link] +ReceivePacketSteeringCPUMask=0 +ReceivePacketSteeringCPUMask= diff --git a/test/test-network/conf/25-rps-cpu-0-invalid.link b/test/test-network/conf/25-rps-cpu-0-invalid.link new file mode 100644 index 0000000..26147a0 --- /dev/null +++ b/test/test-network/conf/25-rps-cpu-0-invalid.link @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +OriginalName=dummy98 + +[Link] +ReceivePacketSteeringCPUMask=0 +ReceivePacketSteeringCPUMask=invalid diff --git a/test/test-network/conf/25-rps-cpu-0.link b/test/test-network/conf/25-rps-cpu-0.link new file mode 100644 index 0000000..b1f4bc2 --- /dev/null +++ b/test/test-network/conf/25-rps-cpu-0.link @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +OriginalName=dummy98 + +[Link] +ReceivePacketSteeringCPUMask=0 diff --git a/test/test-network/conf/25-rps-cpu-1.link b/test/test-network/conf/25-rps-cpu-1.link new file mode 100644 index 0000000..d24d713 --- /dev/null +++ b/test/test-network/conf/25-rps-cpu-1.link @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +OriginalName=dummy98 + +[Link] +ReceivePacketSteeringCPUMask=1 diff --git a/test/test-network/conf/25-rps-cpu-all.link b/test/test-network/conf/25-rps-cpu-all.link new file mode 100644 index 0000000..b7a8eda --- /dev/null +++ b/test/test-network/conf/25-rps-cpu-all.link @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +OriginalName=dummy98 + +[Link] +ReceivePacketSteeringCPUMask=all diff --git a/test/test-network/conf/25-rps-cpu-multi.link b/test/test-network/conf/25-rps-cpu-multi.link new file mode 100644 index 0000000..d7d4d04 --- /dev/null +++ b/test/test-network/conf/25-rps-cpu-multi.link @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +OriginalName=dummy98 + +[Link] +ReceivePacketSteeringCPUMask=0 1 +ReceivePacketSteeringCPUMask=2,3 diff --git a/test/test-network/conf/25-sriov-udev.network b/test/test-network/conf/25-sriov-udev.network index e914131..308f5a0 100644 --- a/test/test-network/conf/25-sriov-udev.network +++ b/test/test-network/conf/25-sriov-udev.network @@ -1,6 +1,6 @@ # SPDX-License-Identifier: LGPL-2.1-or-later [Match] -Name=eni99np1 +Name=sim99 [Network] Address=192.168.100.100/24 diff --git a/test/test-network/conf/25-sriov.link b/test/test-network/conf/25-sriov.link index cc19561..8f6e377 100644 --- a/test/test-network/conf/25-sriov.link +++ b/test/test-network/conf/25-sriov.link @@ -5,6 +5,9 @@ Driver=netdevsim [Link] NamePolicy=keep kernel database onboard slot path AlternativeNamesPolicy=database onboard slot path mac +# Also set a fixed name. Workaround for bug in kernel 6.9: +# https://github.com/torvalds/linux/commit/8debcf5832c3e8a6baaea27c75ad8a6ba5077beb +AlternativeName=sim99 MACAddressPolicy=persistent [SR-IOV] diff --git a/test/test-network/conf/25-sriov.network b/test/test-network/conf/25-sriov.network index d87615e..46573d9 100644 --- a/test/test-network/conf/25-sriov.network +++ b/test/test-network/conf/25-sriov.network @@ -1,6 +1,6 @@ # SPDX-License-Identifier: LGPL-2.1-or-later [Match] -Name=eni99np1 +Name=sim99 [Network] Address=192.168.100.100/24 diff --git a/test/test-network/conf/25-sysctl.network b/test/test-network/conf/25-sysctl.network index a71ffb2..759fe65 100644 --- a/test/test-network/conf/25-sysctl.network +++ b/test/test-network/conf/25-sysctl.network @@ -3,10 +3,12 @@ Name=dummy98 [Network] -IPForward=yes +IPv4Forwarding=yes +IPv6Forwarding=yes IPv6DuplicateAddressDetection=3 IPv6HopLimit=5 IPv4ProxyARP=yes +IPv4ProxyARPPrivateVLAN=yes IPv6ProxyNDP=yes IPv6AcceptRA=no IPv4AcceptLocal=yes diff --git a/test/test-network/conf/25-veth-bridge.network b/test/test-network/conf/25-veth-bridge.network index b2f1634..a8be06d 100644 --- a/test/test-network/conf/25-veth-bridge.network +++ b/test/test-network/conf/25-veth-bridge.network @@ -1,10 +1,10 @@ # SPDX-License-Identifier: LGPL-2.1-or-later [Match] Name=client-p +Name=router-p Name=router-high-p Name=router-low-p [Network] Bridge=bridge99 IPv6AcceptRA=no -IPv6SendRA=yes diff --git a/test/test-network/conf/25-veth-peer-no-address.network b/test/test-network/conf/25-veth-peer-no-address.network new file mode 100644 index 0000000..dbea3bd --- /dev/null +++ b/test/test-network/conf/25-veth-peer-no-address.network @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=veth-peer + +[Network] +IPv6AcceptRA=no diff --git a/test/test-network/conf/25-veth-router-high2.network b/test/test-network/conf/25-veth-router-high2.network new file mode 100644 index 0000000..47e8cd7 --- /dev/null +++ b/test/test-network/conf/25-veth-router-high2.network @@ -0,0 +1,18 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=router-low + +[Network] +IPv6AcceptRA=no +IPv6SendRA=yes + +[IPv6SendRA] +# changed from low to high +RouterPreference=high +EmitDNS=no +EmitDomains=no + +[IPv6Prefix] +Prefix=2002:da8:1:98::/64 +PreferredLifetimeSec=1000s +ValidLifetimeSec=2100s diff --git a/test/test-network/conf/25-veth-router-hop-limit.network b/test/test-network/conf/25-veth-router-hop-limit.network new file mode 100644 index 0000000..643e362 --- /dev/null +++ b/test/test-network/conf/25-veth-router-hop-limit.network @@ -0,0 +1,18 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=router + +[Network] +IPv6AcceptRA=no +IPv6SendRA=yes + +[IPv6SendRA] +RouterPreference=high +EmitDNS=no +EmitDomains=no +HopLimit=42 + +[IPv6Prefix] +Prefix=2002:da8:1:99::/64 +PreferredLifetimeSec=1000s +ValidLifetimeSec=2100s diff --git a/test/test-network/conf/25-veth-router-low2.network b/test/test-network/conf/25-veth-router-low2.network new file mode 100644 index 0000000..f318938 --- /dev/null +++ b/test/test-network/conf/25-veth-router-low2.network @@ -0,0 +1,18 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=router-high + +[Network] +IPv6AcceptRA=no +IPv6SendRA=yes + +[IPv6SendRA] +# changed from high to low +RouterPreference=low +EmitDNS=no +EmitDomains=no + +[IPv6Prefix] +Prefix=2002:da8:1:99::/64 +PreferredLifetimeSec=1000s +ValidLifetimeSec=2100s diff --git a/test/test-network/conf/25-veth-router.netdev b/test/test-network/conf/25-veth-router.netdev new file mode 100644 index 0000000..d462313 --- /dev/null +++ b/test/test-network/conf/25-veth-router.netdev @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[NetDev] +Name=router +Kind=veth +MACAddress=12:34:56:78:9a:99 + +[Peer] +Name=router-p +MACAddress=12:34:56:78:9b:99 diff --git a/test/test-network/conf/25-wireguard-endpoint-peer0-cred.txt b/test/test-network/conf/25-wireguard-endpoint-peer0-cred.txt new file mode 100644 index 0000000..b4251c3 --- /dev/null +++ b/test/test-network/conf/25-wireguard-endpoint-peer0-cred.txt @@ -0,0 +1 @@ +192.168.27.3:51820 diff --git a/test/test-network/conf/25-wireguard-no-peer-private-key-cred.txt b/test/test-network/conf/25-wireguard-no-peer-private-key-cred.txt new file mode 100644 index 0000000..8011c64 --- /dev/null +++ b/test/test-network/conf/25-wireguard-no-peer-private-key-cred.txt @@ -0,0 +1 @@ +EEGlnEPYJV//kbvvIqxKkQwOiS+UENyPncC4bF46ong= diff --git a/test/test-network/conf/25-wireguard-no-peer.netdev b/test/test-network/conf/25-wireguard-no-peer.netdev index ce3b31a..8c90735 100644 --- a/test/test-network/conf/25-wireguard-no-peer.netdev +++ b/test/test-network/conf/25-wireguard-no-peer.netdev @@ -4,6 +4,6 @@ Name=wg97 Kind=wireguard [WireGuard] -PrivateKey=EEGlnEPYJV//kbvvIqxKkQwOiS+UENyPncC4bF46ong= +#PrivateKey=EEGlnEPYJV//kbvvIqxKkQwOiS+UENyPncC4bF46ong= ListenPort=51821 FwMark=1235 diff --git a/test/test-network/conf/25-wireguard-preshared-key-peer2-cred.txt b/test/test-network/conf/25-wireguard-preshared-key-peer2-cred.txt new file mode 100644 index 0000000..5e79c19 --- /dev/null +++ b/test/test-network/conf/25-wireguard-preshared-key-peer2-cred.txt @@ -0,0 +1 @@ +6Fsg8XN0DE6aPQgAX4r2oazEYJOGqyHUz3QRH/jCB+I= diff --git a/test/test-network/conf/25-wireguard.netdev b/test/test-network/conf/25-wireguard.netdev index 4fed38e..6a2bb88 100644 --- a/test/test-network/conf/25-wireguard.netdev +++ b/test/test-network/conf/25-wireguard.netdev @@ -13,8 +13,8 @@ RouteMetric=456 [WireGuardPeer] PublicKey=RDf+LSpeEre7YEIKaxg+wbpsNV7du+ktR99uBEtIiCA= AllowedIPs=fd31:bf08:57cb::/48,192.168.26.3/24 -#Endpoint=wireguard.example.com:51820 -Endpoint=192.168.27.3:51820 +#Endpoint=192.168.27.3:51820 +Endpoint=@network.wireguard.peer0.endpoint PresharedKey=IIWIV17wutHv7t4cR6pOT91z6NSz/T8Arh0yaywhw3M= PersistentKeepalive=20 RouteTable=1234 diff --git a/test/test-network/conf/25-wireguard.netdev.d/peer2.conf b/test/test-network/conf/25-wireguard.netdev.d/peer2.conf index bf99a5a..f3440df 100644 --- a/test/test-network/conf/25-wireguard.netdev.d/peer2.conf +++ b/test/test-network/conf/25-wireguard.netdev.d/peer2.conf @@ -1,5 +1,5 @@ [WireGuardPeer] PublicKey=9uioxkGzjvGjkse3V35I9AhorWfIjBcrf3UPMS0bw2c= -PresharedKey=6Fsg8XN0DE6aPQgAX4r2oazEYJOGqyHUz3QRH/jCB+I= +PresharedKey=@network.wireguard.peer2.psk AllowedIPs=192.168.124.3 diff --git a/test/test-network/conf/26-bridge-mac-master.network b/test/test-network/conf/26-bridge-mac-master.network new file mode 100644 index 0000000..d08970b --- /dev/null +++ b/test/test-network/conf/26-bridge-mac-master.network @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=bridge99 + +[Network] +IPv6AcceptRA=false diff --git a/test/test-network/conf/26-bridge-mac-slave.network b/test/test-network/conf/26-bridge-mac-slave.network new file mode 100644 index 0000000..81a0b46 --- /dev/null +++ b/test/test-network/conf/26-bridge-mac-slave.network @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=dummy98 + +[Network] +IPv6AcceptRA=no +Bridge=bridge99 diff --git a/test/test-network/conf/26-bridge-mac.link b/test/test-network/conf/26-bridge-mac.link new file mode 100644 index 0000000..82ed937 --- /dev/null +++ b/test/test-network/conf/26-bridge-mac.link @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +OriginalName=bridge99 + +[Link] +MACAddressPolicy=none diff --git a/test/test-network/conf/26-bridge-mac.netdev b/test/test-network/conf/26-bridge-mac.netdev new file mode 100644 index 0000000..2d26a03 --- /dev/null +++ b/test/test-network/conf/26-bridge-mac.netdev @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[NetDev] +Name=bridge99 +Kind=bridge +MACAddress=none diff --git a/test/test-network/conf/26-bridge-vlan-master-issue-20373.network b/test/test-network/conf/26-bridge-vlan-master-issue-20373.network index 7a69757..67011ac 100644 --- a/test/test-network/conf/26-bridge-vlan-master-issue-20373.network +++ b/test/test-network/conf/26-bridge-vlan-master-issue-20373.network @@ -4,7 +4,6 @@ Name=bridge99 [Network] VLAN=vlan99 -IPForward=yes ConfigureWithoutCarrier=yes LLDP=yes IPv6AcceptRA=false diff --git a/test/test-network/conf/26-bridge-vlan-master.network b/test/test-network/conf/26-bridge-vlan-master.network index 4bbbc56..90ae0b2 100644 --- a/test/test-network/conf/26-bridge-vlan-master.network +++ b/test/test-network/conf/26-bridge-vlan-master.network @@ -6,4 +6,8 @@ Name=bridge99 IPv6AcceptRA=false [BridgeVLAN] -VLAN=4060-4094 +PVID=1020 +VLAN=1018-1023 +VLAN=1200-1210 +EgressUntagged=1022-1025 +EgressUntagged=1203-1208 diff --git a/test/test-network/conf/26-bridge-vlan-master.network.d/10-override.conf b/test/test-network/conf/26-bridge-vlan-master.network.d/10-override.conf new file mode 100644 index 0000000..25d213f --- /dev/null +++ b/test/test-network/conf/26-bridge-vlan-master.network.d/10-override.conf @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[BridgeVLAN] +PVID= +VLAN= +EgressUntagged= + +PVID=2020 +VLAN=2018-2023 +VLAN=2200-2210 +EgressUntagged=2022-2025 +EgressUntagged=2203-2208 diff --git a/test/test-network/conf/26-bridge-vlan-master.network.d/20-override.conf b/test/test-network/conf/26-bridge-vlan-master.network.d/20-override.conf new file mode 100644 index 0000000..0dcaee0 --- /dev/null +++ b/test/test-network/conf/26-bridge-vlan-master.network.d/20-override.conf @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[BridgeVLAN] +PVID= +VLAN= +EgressUntagged= + +PVID=2020 +VLAN=2018-2023 +EgressUntagged=2022-2025 diff --git a/test/test-network/conf/26-bridge-vlan-master.network.d/30-override.conf b/test/test-network/conf/26-bridge-vlan-master.network.d/30-override.conf new file mode 100644 index 0000000..409296f --- /dev/null +++ b/test/test-network/conf/26-bridge-vlan-master.network.d/30-override.conf @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[BridgeVLAN] +PVID=no +VLAN= +EgressUntagged= diff --git a/test/test-network/conf/26-bridge-vlan-slave-issue-20373.network b/test/test-network/conf/26-bridge-vlan-slave-issue-20373.network index 876219f..bc7c3b0 100644 --- a/test/test-network/conf/26-bridge-vlan-slave-issue-20373.network +++ b/test/test-network/conf/26-bridge-vlan-slave-issue-20373.network @@ -4,7 +4,6 @@ Name=test1 [Network] IPv6AcceptRA=no -IPForward=yes Bridge=bridge99 LinkLocalAddressing=no EmitLLDP=nearest-bridge diff --git a/test/test-network/conf/26-bridge-vlan-slave.network b/test/test-network/conf/26-bridge-vlan-slave.network index 9ac8510..d23d0fc 100644 --- a/test/test-network/conf/26-bridge-vlan-slave.network +++ b/test/test-network/conf/26-bridge-vlan-slave.network @@ -7,4 +7,8 @@ IPv6AcceptRA=no Bridge=bridge99 [BridgeVLAN] -VLAN=4064-4094 +PVID=1010 +VLAN=1008-1013 +VLAN=1100-1110 +EgressUntagged=1012-1015 +EgressUntagged=1103-1108 diff --git a/test/test-network/conf/26-bridge-vlan-slave.network.d/10-override.conf b/test/test-network/conf/26-bridge-vlan-slave.network.d/10-override.conf new file mode 100644 index 0000000..0511b64 --- /dev/null +++ b/test/test-network/conf/26-bridge-vlan-slave.network.d/10-override.conf @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[BridgeVLAN] +PVID= +VLAN= +EgressUntagged= + +PVID=2010 +VLAN=2008-2013 +VLAN=2100-2110 +EgressUntagged=2012-2015 +EgressUntagged=2103-2108 diff --git a/test/test-network/conf/26-bridge-vlan-slave.network.d/20-override.conf b/test/test-network/conf/26-bridge-vlan-slave.network.d/20-override.conf new file mode 100644 index 0000000..58df686 --- /dev/null +++ b/test/test-network/conf/26-bridge-vlan-slave.network.d/20-override.conf @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[BridgeVLAN] +PVID= +VLAN= +EgressUntagged= + +PVID=2010 +VLAN=2008-2013 +EgressUntagged=2012-2015 diff --git a/test/test-network/conf/26-bridge-vlan-slave.network.d/30-override.conf b/test/test-network/conf/26-bridge-vlan-slave.network.d/30-override.conf new file mode 100644 index 0000000..409296f --- /dev/null +++ b/test/test-network/conf/26-bridge-vlan-slave.network.d/30-override.conf @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[BridgeVLAN] +PVID=no +VLAN= +EgressUntagged= diff --git a/test/test-network/conf/networkd-manage-foreign-nexthops-no.conf b/test/test-network/conf/networkd-manage-foreign-nexthops-no.conf new file mode 100644 index 0000000..9bf5d7e --- /dev/null +++ b/test/test-network/conf/networkd-manage-foreign-nexthops-no.conf @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Network] +ManageForeignNextHops=no diff --git a/test/test-network/conf/persist-leases-no.conf b/test/test-network/conf/persist-leases-no.conf new file mode 100644 index 0000000..5025265 --- /dev/null +++ b/test/test-network/conf/persist-leases-no.conf @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[DHCPServer] +PersistLeases=no -- cgit v1.2.3