2 files changed, 91 insertions, 0 deletions
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_system_ntp.py b/smoketest/scripts/cli/test_system_ntp.py
index e2821687c..a0806acf0 100755
--- a/smoketest/scripts/cli/test_system_ntp.py
+++ b/smoketest/scripts/cli/test_system_ntp.py
@@ -108,5 +108,22 @@ class TestSystemNTP(VyOSUnitTestSHIM.TestCase):
         for listen in listen_address:
             self.assertIn(f'interface listen {listen}', config)
 
+    def test_03_ntp_interface(self):
+        interfaces = ['eth0', 'eth1']
+        for interface in interfaces:
+            self.cli_set(base_path + ['interface', interface])
+
+        servers = ['time1.vyos.net', 'time2.vyos.net']
+        for server in servers:
+            self.cli_set(base_path + ['server', server])
+
+        self.cli_commit()
+
+        # Check generated client address configuration
+        config = read_file(NTP_CONF)
+        self.assertIn('interface ignore wildcard', config)
+        for interface in interfaces:
+            self.assertIn(f'interface listen {interface}', config)
+
 if __name__ == '__main__':
     unittest.main(verbosity=2)