From 65c24cd087d0aa718ca12f870a7591c92d7c67d0 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 31 Jul 2019 12:09:03 +0900 Subject: [PATCH] test-network: add tests for RoutingPolicyRule.Family=ipv6 and both --- .../conf/routing-policy-rule-test1.network | 12 +++++++++ test/test-network/systemd-networkd-tests.py | 27 ++++++++++++++++--- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/test/test-network/conf/routing-policy-rule-test1.network b/test/test-network/conf/routing-policy-rule-test1.network index 46b87c5a9ad..ffcedc99a2b 100644 --- a/test/test-network/conf/routing-policy-rule-test1.network +++ b/test/test-network/conf/routing-policy-rule-test1.network @@ -8,3 +8,15 @@ From= 192.168.100.18 Priority=111 IncomingInterface=test1 OutgoingInterface=test1 + +[RoutingPolicyRule] +IncomingInterface=test1 +Table=8 +Priority=100 +Family=ipv6 + +[RoutingPolicyRule] +IncomingInterface=test1 +Table=9 +Priority=101 +Family=both diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 593a9c976ab..cde79817c84 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -1439,7 +1439,7 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities): 'routing-policy-rule-dummy98.network', 'routing-policy-rule-test1.network'] - routing_policy_rule_tables = ['7', '8'] + routing_policy_rule_tables = ['7', '8', '9'] routes = [['blackhole', '202.54.1.2'], ['unreachable', '202.54.1.3'], ['prohibit', '202.54.1.4']] def setUp(self): @@ -1520,15 +1520,36 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities): start_networkd() self.wait_online(['test1:degraded']) - output = check_output('ip rule') + output = check_output('ip rule list iif test1 priority 111') print(output) - self.assertRegex(output, '111') + self.assertRegex(output, '111:') self.assertRegex(output, 'from 192.168.100.18') self.assertRegex(output, r'tos (?:0x08|throughput)\s') self.assertRegex(output, 'iif test1') self.assertRegex(output, 'oif test1') self.assertRegex(output, 'lookup 7') + output = check_output('ip rule list iif test1 priority 101') + print(output) + self.assertRegex(output, '101:') + self.assertRegex(output, 'from all') + self.assertRegex(output, 'iif test1') + self.assertRegex(output, 'lookup 9') + + output = check_output('ip -6 rule list iif test1 priority 100') + print(output) + self.assertRegex(output, '100:') + self.assertRegex(output, 'from all') + self.assertRegex(output, 'iif test1') + self.assertRegex(output, 'lookup 8') + + output = check_output('ip -6 rule list iif test1 priority 101') + print(output) + self.assertRegex(output, '101:') + self.assertRegex(output, 'from all') + self.assertRegex(output, 'iif test1') + self.assertRegex(output, 'lookup 9') + 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') -- 2.47.3