From 6cd8f9b5f2844040898efa0ebbbb30498e548f62 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 3 Feb 2021 17:19:04 +0900 Subject: [PATCH] test-network: add tests for Family= in [NextHop] --- test/test-network/conf/25-nexthop.network | 16 ++++++++++++++++ test/test-network/systemd-networkd-tests.py | 6 +++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/test/test-network/conf/25-nexthop.network b/test/test-network/conf/25-nexthop.network index 3eea077345e..f32cc1a2dbd 100644 --- a/test/test-network/conf/25-nexthop.network +++ b/test/test-network/conf/25-nexthop.network @@ -3,9 +3,25 @@ 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] +Gateway=192.168.5.2 diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 0740003ed34..e9dc1853457 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -2799,7 +2799,11 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities): output = check_output('ip nexthop list dev veth99') print(output) - self.assertRegex(output, '192.168.5.1') + self.assertIn('id 1 via 192.168.5.1 dev veth99', output) + self.assertIn('id 2 via 2001:1234:5:8f63::2 dev veth99', output) + self.assertIn('id 3 dev veth99', output) + self.assertIn('id 4 dev veth99', output) + self.assertRegex(output, r'id [0-9]* via 192.168.5.2 dev veth99') def test_qdisc(self): copy_unit_to_networkd_unit_path('25-qdisc-clsact-and-htb.network', '12-dummy.netdev', -- 2.47.3