]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test-network: add test for bridge MDB entries on bridge master 17085/head
authorYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 17 Sep 2020 05:32:03 +0000 (14:32 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 17 Sep 2020 09:15:25 +0000 (18:15 +0900)
test/test-network/conf/26-bridge-mdb-master.network
test/test-network/systemd-networkd-tests.py

index b88ea397c40d8f150f94ecaa3b55fe9d09b61d99..3fa1737f8167d66a438a4ab7dcf2ceb5b762cd97 100644 (file)
@@ -3,3 +3,11 @@ Name=bridge99
 
 [Network]
 IPv6AcceptRA=false
+
+[BridgeMDB]
+VLANId=4066
+MulticastGroupAddress=ff02:aaaa:fee5:0000:0000:0000:0001:0004
+
+[BridgeMDB]
+VLANId=4067
+MulticastGroupAddress=224.0.1.2
index 12f91bf3c9ea6b7e1d8700519059c8d6470592c1..f2fd86aa4a97476791eed3ddff76cb655498c0dc 100755 (executable)
@@ -2923,6 +2923,11 @@ class NetworkdBridgeTests(unittest.TestCase, Utilities):
         self.assertRegex(output, 'dev bridge99 port test1 grp ff02:aaaa:fee5::1:3 permanent *vid 4064')
         self.assertRegex(output, 'dev bridge99 port test1 grp 224.0.1.1 permanent *vid 4065')
 
+        # Old kernel may not support bridge MDB entries on bridge master
+        if call('bridge mdb add dev bridge99 port bridge99 grp 224.0.1.3 temp vid 4068', stderr=subprocess.DEVNULL) == 0:
+            self.assertRegex(output, 'dev bridge99 port bridge99 grp ff02:aaaa:fee5::1:4 temp *vid 4066')
+            self.assertRegex(output, 'dev bridge99 port bridge99 grp 224.0.1.2 temp *vid 4067')
+
     def test_bridge_property(self):
         copy_unit_to_networkd_unit_path('11-dummy.netdev', '12-dummy.netdev', '26-bridge.netdev',
                                         '26-bridge-slave-interface-1.network', '26-bridge-slave-interface-2.network',