Merge remote-tracking branch 'upstream/current' into current

1 files changed, 37 insertions, 0 deletions

diff --git a/smoketest/scripts/cli/test_interfaces_bridge.py b/smoketest/scripts/cli/test_interfaces_bridge.py
index bc0bb69c6..a1359680b 100755
--- a/smoketest/scripts/cli/test_interfaces_bridge.py
+++ b/smoketest/scripts/cli/test_interfaces_bridge.py
@@ -18,6 +18,8 @@ import os
 import unittest
 
 from base_interfaces_test import BasicInterfaceTest
+from glob import glob
+from netifaces import interfaces
 from vyos.ifconfig import Section
 
 class BridgeInterfaceTest(BasicInterfaceTest.BaseTest):
@@ -44,6 +46,7 @@ class BridgeInterfaceTest(BasicInterfaceTest.BaseTest):
             self._options['br0'].append(f'member interface {member}')
 
     def test_add_remove_member(self):
+        """ Add member interfaces to bridge and set STP cost/priority """
         for interface in self._interfaces:
             base = self._base_path + [interface]
             self.session.set(base + ['stp'])
@@ -59,12 +62,46 @@ class BridgeInterfaceTest(BasicInterfaceTest.BaseTest):
                 cost += 1
                 priority += 1
 
+        # commit config
         self.session.commit()
 
+        # check member interfaces are added on the bridge
+        bridge_members = []
+        for tmp in glob(f'/sys/class/net/{interface}/lower_*'):
+            bridge_members.append(os.path.basename(tmp).replace('lower_', ''))
+
+        for member in self._members:
+            self.assertIn(member, bridge_members)
+
+        # delete all members
         for interface in self._interfaces:
             self.session.delete(self._base_path + [interface, 'member'])
 
         self.session.commit()
 
+    def test_vlan_members(self):
+        """ T2945: ensure that VIFs are not dropped from bridge """
+
+        self.session.set(['interfaces', 'ethernet', 'eth0', 'vif', '300'])
+        self.session.set(['interfaces', 'bridge', 'br0', 'member', 'interface', 'eth0.300'])
+        self.session.commit()
+
+        # member interface must be assigned to the bridge
+        self.assertTrue(os.path.exists('/sys/class/net/br0/lower_eth0.300'))
+
+        # add second bridge member
+        self.session.set(['interfaces', 'ethernet', 'eth0', 'vif', '400'])
+        self.session.commit()
+
+        # member interface must still be assigned to the bridge
+        self.assertTrue(os.path.exists('/sys/class/net/br0/lower_eth0.300'))
+
+        # remove VLAN interfaces
+        self.session.delete(['interfaces', 'ethernet', 'eth0', 'vif', '300'])
+        self.session.delete(['interfaces', 'ethernet', 'eth0', 'vif', '400'])
+        self.session.commit()
+
+
 if __name__ == '__main__':
     unittest.main()
+