3 files changed, 111 insertions, 0 deletions
diff --git a/smoketest/scripts/cli/base_interfaces_test.py b/smoketest/scripts/cli/base_interfaces_test.py
index 816ba6dcd..8acf52243 100644
--- a/smoketest/scripts/cli/base_interfaces_test.py
+++ b/smoketest/scripts/cli/base_interfaces_test.py
@@ -232,6 +232,9 @@ class BasicInterfaceTest:
 
             for interface in self._interfaces:
                 base = self._base_path + [interface]
+                # just set the interface base without any option - some interfaces
+                # (VTI) do not require any option to be brought up
+                self.cli_set(base)
                 for option in self._options.get(interface, []):
                     self.cli_set(base + option.split())
 
diff --git a/smoketest/scripts/cli/test_interfaces_bridge.py b/smoketest/scripts/cli/test_interfaces_bridge.py
index ca0ead9e8..26d3a23c9 100755
--- a/smoketest/scripts/cli/test_interfaces_bridge.py
+++ b/smoketest/scripts/cli/test_interfaces_bridge.py
@@ -86,9 +86,83 @@ class BridgeInterfaceTest(BasicInterfaceTest.TestCase):
             # validate member interface configuration
             for member in self._members:
                 tmp = get_interface_config(member)
+                # verify member is assigned to the bridge
+                self.assertEqual(interface, tmp['master'])
                 # Isolated must be enabled as configured above
                 self.assertTrue(tmp['linkinfo']['info_slave_data']['isolated'])
 
+    def test_igmp_querier_snooping(self):
+        # Add member interfaces to bridge
+        for interface in self._interfaces:
+            base = self._base_path + [interface]
+
+            # assign members to bridge interface
+            for member in self._members:
+                base_member = base + ['member', 'interface', member]
+                self.cli_set(base_member)
+
+        # commit config
+        self.cli_commit()
+
+        for interface in self._interfaces:
+            # Verify IGMP default configuration
+            tmp = read_file(f'/sys/class/net/{interface}/bridge/multicast_snooping')
+            self.assertEqual(tmp, '0')
+            tmp = read_file(f'/sys/class/net/{interface}/bridge/multicast_querier')
+            self.assertEqual(tmp, '0')
+
+        # Enable IGMP snooping
+        for interface in self._interfaces:
+            base = self._base_path + [interface]
+            self.cli_set(base + ['igmp', 'snooping'])
+
+        # commit config
+        self.cli_commit()
+
+        for interface in self._interfaces:
+            # Verify IGMP snooping configuration
+            # Verify IGMP default configuration
+            tmp = read_file(f'/sys/class/net/{interface}/bridge/multicast_snooping')
+            self.assertEqual(tmp, '1')
+            tmp = read_file(f'/sys/class/net/{interface}/bridge/multicast_querier')
+            self.assertEqual(tmp, '0')
+
+        # Enable IGMP querieer
+        for interface in self._interfaces:
+            base = self._base_path + [interface]
+            self.cli_set(base + ['igmp', 'querier'])
+
+        # commit config
+        self.cli_commit()
+
+        for interface in self._interfaces:
+            # Verify IGMP snooping & querier configuration
+            tmp = read_file(f'/sys/class/net/{interface}/bridge/multicast_snooping')
+            self.assertEqual(tmp, '1')
+            tmp = read_file(f'/sys/class/net/{interface}/bridge/multicast_querier')
+            self.assertEqual(tmp, '1')
+
+        # Disable IGMP
+        for interface in self._interfaces:
+            base = self._base_path + [interface]
+            self.cli_delete(base + ['igmp'])
+
+        # commit config
+        self.cli_commit()
+
+        for interface in self._interfaces:
+            # Verify IGMP snooping & querier configuration
+            tmp = read_file(f'/sys/class/net/{interface}/bridge/multicast_snooping')
+            self.assertEqual(tmp, '0')
+            tmp = read_file(f'/sys/class/net/{interface}/bridge/multicast_querier')
+            self.assertEqual(tmp, '0')
+
+            # validate member interface configuration
+            for member in self._members:
+                tmp = get_interface_config(member)
+                # verify member is assigned to the bridge
+                self.assertEqual(interface, tmp['master'])
+
 
     def test_add_remove_bridge_member(self):
         # Add member interfaces to bridge and set STP cost/priority
diff --git a/smoketest/scripts/cli/test_interfaces_vti.py b/smoketest/scripts/cli/test_interfaces_vti.py
new file mode 100755
index 000000000..9cbf104f0
--- /dev/null
+++ b/smoketest/scripts/cli/test_interfaces_vti.py
@@ -0,0 +1,34 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2022 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import unittest
+
+from base_interfaces_test import BasicInterfaceTest
+
+class VTIInterfaceTest(BasicInterfaceTest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        cls._test_ip = True
+        cls._test_ipv6 = True
+        cls._test_mtu = True
+        cls._base_path = ['interfaces', 'vti']
+        cls._interfaces = ['vti10', 'vti20', 'vti30']
+
+        # call base-classes classmethod
+        super(VTIInterfaceTest, cls).setUpClass()
+
+if __name__ == '__main__':
+    unittest.main(verbosity=2)