]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test-network: add tests for Family= in [NextHop] 18632/head
authorYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 3 Feb 2021 08:19:04 +0000 (17:19 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 17 Feb 2021 06:55:37 +0000 (15:55 +0900)
test/test-network/conf/25-nexthop.network
test/test-network/systemd-networkd-tests.py

index 3eea077345ea610008b5769be177e7f00f0501a7..f32cc1a2dbd124b6ae52e7b72c9eb7140fec41d0 100644 (file)
@@ -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
index 0740003ed345c9f5fcdb1484a8f670adba8b9e30..e9dc185345700c203158d2f9e7500f547e4fae9b 100755 (executable)
@@ -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',