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

1 files changed, 35 insertions, 0 deletions

diff --git a/smoketest/scripts/cli/test_interfaces_bonding.py b/smoketest/scripts/cli/test_interfaces_bonding.py
index e3d3b25ee..ac5e01e50 100755
--- a/smoketest/scripts/cli/test_interfaces_bonding.py
+++ b/smoketest/scripts/cli/test_interfaces_bonding.py
@@ -20,6 +20,7 @@ import unittest
 from base_interfaces_test import BasicInterfaceTest
 
 from vyos.ifconfig import Section
+from vyos.ifconfig.interface import Interface
 from vyos.configsession import ConfigSessionError
 from vyos.util import read_file
 
@@ -57,5 +58,39 @@ class BondingInterfaceTest(BasicInterfaceTest.BaseTest):
             slaves = read_file(f'/sys/class/net/{interface}/bonding/slaves').split()
             self.assertListEqual(slaves, self._members)
 
+    def test_8021q_vlan(self):
+        """ Testcase for 802.1q VLAN interfaces created on top of a lacp / bond
+        interface. This is the testcase for T2894 """
+        super().test_8021q_vlan()
+
+        for interface in self._interfaces:
+            slaves = read_file(f'/sys/class/net/{interface}/bonding/slaves').split()
+            self.assertListEqual(slaves, self._members)
+
+    def test_remove_member(self):
+        """ T2515: when removing a bond member the previously enslaved/member
+        interface must be in its former admin-up/down state. Here we ensure that
+        it is admin-up as it was admin-up before. """
+
+        # configure member interfaces
+        for interface in self._interfaces:
+            for option in self._options.get(interface, []):
+                self.session.set(self._base_path + [interface] + option.split())
+
+        self.session.commit()
+
+        # remove single bond member port
+        for interface in self._interfaces:
+            remove_member = self._members[0]
+            self.session.delete(self._base_path + [interface, 'member', 'interface', remove_member])
+
+        self.session.commit()
+
+        # removed member port must be admin-up
+        for interface in self._interfaces:
+            remove_member = self._members[0]
+            state = Interface(remove_member).get_admin_state()
+            self.assertEqual('up', state)
+
 if __name__ == '__main__':
     unittest.main()