From 9f773037a05a086db00350c52808dae35bf7a97f Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 17 Sep 2020 14:32:03 +0900 Subject: [PATCH] test-network: add test for bridge MDB entries on bridge master --- test/test-network/conf/26-bridge-mdb-master.network | 8 ++++++++ test/test-network/systemd-networkd-tests.py | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/test/test-network/conf/26-bridge-mdb-master.network b/test/test-network/conf/26-bridge-mdb-master.network index b88ea397c4..3fa1737f81 100644 --- a/test/test-network/conf/26-bridge-mdb-master.network +++ b/test/test-network/conf/26-bridge-mdb-master.network @@ -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 diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 12f91bf3c9..f2fd86aa4a 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -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',