diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-07-09 10:13:33 +0900 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-07-09 11:44:25 +0900 |
commit | 589af70b8707048b1df7926909e0891dfc94123a (patch) | |
tree | 3fc21a84bf20a5ac5cfcd030e905b7fad50aa203 /test | |
parent | 4b31fc88ac751d5f4d5d760412e7e0a4a47200b0 (diff) | |
download | systemd-589af70b8707048b1df7926909e0891dfc94123a.tar.gz |
test-network: merge two DHCPv6 client tests
Diffstat (limited to 'test')
-rw-r--r-- | test/test-network/conf/25-dhcp-client-gateway-ipv6.network | 10 | ||||
-rw-r--r-- | test/test-network/conf/25-dhcp-client-ipv6-only.network | 4 | ||||
-rwxr-xr-x | test/test-network/systemd-networkd-tests.py | 18 |
3 files changed, 9 insertions, 23 deletions
diff --git a/test/test-network/conf/25-dhcp-client-gateway-ipv6.network b/test/test-network/conf/25-dhcp-client-gateway-ipv6.network deleted file mode 100644 index 11a2fee050..0000000000 --- a/test/test-network/conf/25-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/25-dhcp-client-ipv6-only.network b/test/test-network/conf/25-dhcp-client-ipv6-only.network index f2874281f8..eb5bd027ff 100644 --- a/test/test-network/conf/25-dhcp-client-ipv6-only.network +++ b/test/test-network/conf/25-dhcp-client-ipv6-only.network @@ -5,3 +5,7 @@ Name=veth99 [Network] DHCP=ipv6 IPv6Token=::1a:2b:3c:4d + +[Route] +Gateway=_ipv6ra +Destination=2001:1234:5:9fff:ff:ff:ff:ff/128 diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index b5baef49a5..eb93440851 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -4480,7 +4480,6 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): '25-vrf.netdev', '25-vrf.network', '25-dhcp-client-anonymize.network', - '25-dhcp-client-gateway-ipv6.network', '25-dhcp-client-gateway-onlink-implicit.network', '25-dhcp-client-ipv4-only.network', '25-dhcp-client-ipv4-use-routes-use-gateway.network', @@ -4522,6 +4521,11 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): self.assertRegex(output, r'inet6 2600::[0-9a-f:]*/128 scope global dynamic noprefixroute') self.assertNotIn('192.168.5', output) + # checking semi-static route + output = check_output('ip -6 route list dev veth99 2001:1234:5:9fff:ff:ff:ff:ff') + print(output) + self.assertRegex(output, 'via fe80::1034:56ff:fe78:9abd') + # Confirm that ipv6 token is not set in the kernel output = check_output('ip token show dev veth99') print(output) @@ -4885,18 +4889,6 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): print(output) self.assertEqual(output, '') - def test_dhcp_client_gateway_ipv6(self): - 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() - self.wait_online(['veth99:routable', 'veth-peer:routable']) - - output = check_output('ip -6 route list dev veth99 2001:1234:5:9fff:ff:ff:ff:ff') - print(output) - 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', '25-dhcp-server-veth-peer.network', '25-dhcp-client-gateway-onlink-implicit.network') |