Merge pull request systemd#16808 from yuwata/test-network-reconfigure-routing-policy-rules

keszybz · web-flow · commit eea63c03b91c · 2020-08-21T14:20:52.000+02:00
add a test case for [RoutingPolicyRule] and fix minor issue in man page
diff --git a/man/networkd.conf.xml b/man/networkd.conf.xml
@@ -52,8 +52,8 @@
         <term><varname>SpeedMeter=</varname></term>
         <listitem><para>Takes a boolean. If set to yes, then <command>systemd-networkd</command>
         measures the traffic of each interface, and
-        <command>networkctl status <replaceable>INTERFACE</replaceable> shows the measured speed.
-        </command>Defaults to no.</para></listitem>
+        <command>networkctl status <replaceable>INTERFACE</replaceable></command> shows the measured speed.
+        Defaults to no.</para></listitem>
       </varlistentry>
 
       <varlistentry>
diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py
@@ -1976,6 +1976,25 @@ def test_routing_policy_rule(self):
         self.assertRegex(output, 'iif test1')
         self.assertRegex(output, 'lookup 9')
 
+        run('ip rule delete iif test1 priority 111')
+
+        output = check_output('ip rule list iif test1 priority 111')
+        print(output)
+        self.assertEqual(output, '')
+
+        run(*networkctl_cmd, 'reconfigure', 'test1', env=env)
+
+        self.wait_online(['test1:degraded'])
+
+        output = check_output('ip rule list iif test1 priority 111')
+        print(output)
+        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')
+
     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')
