diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-02-10 20:40:04 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-10 20:40:04 +0900 |
commit | 2d88df457ae20bcf498064bafb2facb28d9c0268 (patch) | |
tree | 2e822ded94e820cd136cc9f8e370965dea496874 /test/test-network | |
parent | ac7e18be76a6069e29b01d13152256bc195cb639 (diff) | |
parent | b6d5dab7bbb8ecf4ce1229840085daa15ab4cf57 (diff) | |
download | systemd-2d88df457ae20bcf498064bafb2facb28d9c0268.tar.gz |
Merge pull request #22471 from yuwata/network-bridge-vlan-protocol
network: bridge: fix vlan protocol
Diffstat (limited to 'test/test-network')
-rw-r--r-- | test/test-network/conf/25-bridge.netdev | 10 | ||||
-rwxr-xr-x | test/test-network/systemd-networkd-tests.py | 6 |
2 files changed, 13 insertions, 3 deletions
diff --git a/test/test-network/conf/25-bridge.netdev b/test/test-network/conf/25-bridge.netdev index 6d8cea9021..d9d6f6e792 100644 --- a/test/test-network/conf/25-bridge.netdev +++ b/test/test-network/conf/25-bridge.netdev @@ -6,10 +6,14 @@ Kind=bridge [Bridge] HelloTimeSec=9 MaxAgeSec=9 -ForwardDelaySec=9 AgeingTimeSec=9 +ForwardDelaySec=9 Priority=9 -MulticastQuerier= true -MulticastSnooping=true +#GroupForwardMask=9 # This interferes other other settings +DefaultPVID=9 +MulticastQuerier=yes +MulticastSnooping=yes +VLANFiltering=yes +VLANProtocol=802.1ad STP=true MulticastIGMPVersion=3 diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index e3fd85d4f2..6fc8398e0f 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -1185,6 +1185,12 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.assertRegex(output, 'STP: yes') self.assertRegex(output, 'Multicast IGMP Version: 3') + output = check_output('ip -d link show bridge99') + print(output) + self.assertIn('vlan_filtering 1 ', output) + self.assertIn('vlan_protocol 802.1ad ', output) + self.assertIn('vlan_default_pvid 9 ', output) + def test_bond(self): copy_unit_to_networkd_unit_path('25-bond.netdev', '25-bond-balanced-tlb.netdev') start_networkd() |