Merge branch 't5242-smoketest-dynamic' into current

* t5242-smoketest-dynamic:
  smoketest: T5242: automatically detect interface "capabilities"
  geneve: T2630: change lower limit MTU to 1200 bytes
  gitignore: T5242: add XML dict cache file
  bridge: T4579: fix error message for bridge and bond membership
  T5242: example use of cli_defined
  xml: T5242: add cli_defined boolean test for node existing under path

23 files changed, 150 insertions, 120 deletions

diff --git a/.gitignore b/.gitignore
index a31d037f2..fe92f5b9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -138,3 +138,5 @@ debian/*.substvars
 
 # vyos-1x JSON version
 data/component-versions.json
+# vyos-1x XML cache
+python/vyos/xml_ref/cache.py
diff --git a/interface-definitions/interfaces-geneve.xml.in b/interface-definitions/interfaces-geneve.xml.in
index ac9794870..330dadd95 100644
--- a/interface-definitions/interfaces-geneve.xml.in
+++ b/interface-definitions/interfaces-geneve.xml.in
@@ -22,7 +22,7 @@
           #include <include/interface/ipv4-options.xml.i>
           #include <include/interface/ipv6-options.xml.i>
           #include <include/interface/mac.xml.i>
-          #include <include/interface/mtu-1450-16000.xml.i>
+          #include <include/interface/mtu-1200-16000.xml.i>
           <node name="parameters">
             <properties>
               <help>GENEVE tunnel parameters</help>
diff --git a/python/vyos/xml_ref/__init__.py b/python/vyos/xml_ref/__init__.py
index ae5184746..2e144ef10 100644
--- a/python/vyos/xml_ref/__init__.py
+++ b/python/vyos/xml_ref/__init__.py
@@ -45,6 +45,9 @@ def is_valueless(path: list) -> bool:
 def is_leaf(path: list) -> bool:
     return load_reference().is_leaf(path)
 
+def cli_defined(path: list, node: str, non_local=False) -> bool:
+    return load_reference().cli_defined(path, node, non_local=non_local)
+
 def component_version() -> dict:
     return load_reference().component_version()
 
diff --git a/python/vyos/xml_ref/definition.py b/python/vyos/xml_ref/definition.py
index 429331577..95ecc01a6 100644
--- a/python/vyos/xml_ref/definition.py
+++ b/python/vyos/xml_ref/definition.py
@@ -92,6 +92,31 @@ class Xml:
         d = self._get_ref_path(path)
         return self._is_leaf_node(d)
 
+    @staticmethod
+    def _dict_get(d: dict, path: list) -> dict:
+        for i in path:
+            d = d.get(i, {})
+            if not isinstance(d, dict):
+                return {}
+            if not d:
+                break
+        return d
+
+    def _dict_find(self, d: dict, key: str, non_local=False) -> bool:
+        for k in list(d):
+            if k in ('node_data', 'component_version'):
+                continue
+            if k == key:
+                return True
+            if non_local and isinstance(d[k], dict):
+                if self._dict_find(d[k], key):
+                    return True
+        return False
+
+    def cli_defined(self, path: list, node: str, non_local=False) -> bool:
+        d = self._dict_get(self.ref, path)
+        return self._dict_find(d, node, non_local=non_local)
+
     def component_version(self) -> dict:
         d = {}
         for k, v in self.ref['component_version']:
diff --git a/smoketest/scripts/cli/base_interfaces_test.py b/smoketest/scripts/cli/base_interfaces_test.py
index 2f730abfb..970f12bd7 100644
--- a/smoketest/scripts/cli/base_interfaces_test.py
+++ b/smoketest/scripts/cli/base_interfaces_test.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2019-2022 VyOS maintainers and contributors
+# Copyright (C) 2019-2023 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
@@ -35,6 +35,7 @@ from vyos.util import process_named_running
 from vyos.util import get_interface_config
 from vyos.validate import is_intf_addr_assigned
 from vyos.validate import is_ipv6_link_local
+from vyos.xml_ref import cli_defined
 
 def is_mirrored_to(interface, mirror_if, qdisc):
     """
@@ -82,6 +83,17 @@ class BasicInterfaceTest:
         def setUpClass(cls):
             super(BasicInterfaceTest.TestCase, cls).setUpClass()
 
+            # XXX the case of test_vif_8021q_mtu_limits, below, shows that
+            # we should extend cli_defined to support more complex queries
+            cls._test_vlan = cli_defined(cls._base_path, 'vif')
+            cls._test_qinq = cli_defined(cls._base_path, 'vif-s')
+            cls._test_dhcp = cli_defined(cls._base_path, 'dhcp-options')
+            cls._test_ip = cli_defined(cls._base_path, 'ip')
+            cls._test_ipv6 = cli_defined(cls._base_path, 'ipv6')
+            cls._test_ipv6_dhcpc6 = cli_defined(cls._base_path, 'dhcpv6-options')
+            cls._test_ipv6_pd = cli_defined(cls._base_path + ['dhcpv6-options'], 'pd')
+            cls._test_mtu = cli_defined(cls._base_path, 'mtu')
+
             # Setup mirror interfaces for SPAN (Switch Port Analyzer)
             for span in cls._mirror_interfaces:
                 section = Section.section(span)
@@ -634,58 +646,90 @@ class BasicInterfaceTest:
                     self.cli_set(path + option.split())
 
                 # Options
-                self.cli_set(path + ['ip', 'adjust-mss', mss])
-                self.cli_set(path + ['ip', 'arp-cache-timeout', arp_tmo])
-                self.cli_set(path + ['ip', 'disable-arp-filter'])
-                self.cli_set(path + ['ip', 'disable-forwarding'])
-                self.cli_set(path + ['ip', 'enable-directed-broadcast'])
-                self.cli_set(path + ['ip', 'enable-arp-accept'])
-                self.cli_set(path + ['ip', 'enable-arp-announce'])
-                self.cli_set(path + ['ip', 'enable-arp-ignore'])
-                self.cli_set(path + ['ip', 'enable-proxy-arp'])
-                self.cli_set(path + ['ip', 'proxy-arp-pvlan'])
-                self.cli_set(path + ['ip', 'source-validation', 'loose'])
+                if cli_defined(self._base_path + ['ip'], 'adjust-mss'):
+                    self.cli_set(path + ['ip', 'adjust-mss', mss])
+
+                if cli_defined(self._base_path + ['ip'], 'arp-cache-timeout'):
+                    self.cli_set(path + ['ip', 'arp-cache-timeout', arp_tmo])
+
+                if cli_defined(self._base_path + ['ip'], 'disable-arp-filter'):
+                    self.cli_set(path + ['ip', 'disable-arp-filter'])
+
+                if cli_defined(self._base_path + ['ip'], 'disable-forwarding'):
+                    self.cli_set(path + ['ip', 'disable-forwarding'])
+
+                if cli_defined(self._base_path + ['ip'], 'enable-directed-broadcast'):
+                    self.cli_set(path + ['ip', 'enable-directed-broadcast'])
+
+                if cli_defined(self._base_path + ['ip'], 'enable-arp-accept'):
+                    self.cli_set(path + ['ip', 'enable-arp-accept'])
+
+                if cli_defined(self._base_path + ['ip'], 'enable-arp-announce'):
+                    self.cli_set(path + ['ip', 'enable-arp-announce'])
+
+                if cli_defined(self._base_path + ['ip'], 'enable-arp-ignore'):
+                    self.cli_set(path + ['ip', 'enable-arp-ignore'])
+
+                if cli_defined(self._base_path + ['ip'], 'enable-proxy-arp'):
+                    self.cli_set(path + ['ip', 'enable-proxy-arp'])
+
+                if cli_defined(self._base_path + ['ip'], 'proxy-arp-pvlan'):
+                    self.cli_set(path + ['ip', 'proxy-arp-pvlan'])
+
+                if cli_defined(self._base_path + ['ip'], 'source-validation'):
+                    self.cli_set(path + ['ip', 'source-validation', 'loose'])
 
             self.cli_commit()
 
             for interface in self._interfaces:
-                base_options = f'oifname "{interface}"'
-                out = cmd('sudo nft list chain raw VYOS_TCP_MSS')
-                for line in out.splitlines():
-                    if line.startswith(base_options):
-                        self.assertIn(f'tcp option maxseg size set {mss}', line)
+                if cli_defined(self._base_path + ['ip'], 'adjust-mss'):
+                    base_options = f'oifname "{interface}"'
+                    out = cmd('sudo nft list chain raw VYOS_TCP_MSS')
+                    for line in out.splitlines():
+                        if line.startswith(base_options):
+                            self.assertIn(f'tcp option maxseg size set {mss}', line)
 
-                tmp = read_file(f'/proc/sys/net/ipv4/neigh/{interface}/base_reachable_time_ms')
-                self.assertEqual(tmp, str((int(arp_tmo) * 1000))) # tmo value is in milli seconds
+                if cli_defined(self._base_path + ['ip'], 'arp-cache-timeout'):
+                    tmp = read_file(f'/proc/sys/net/ipv4/neigh/{interface}/base_reachable_time_ms')
+                    self.assertEqual(tmp, str((int(arp_tmo) * 1000))) # tmo value is in milli seconds
 
                 proc_base = f'/proc/sys/net/ipv4/conf/{interface}'
 
-                tmp = read_file(f'{proc_base}/arp_filter')
-                self.assertEqual('0', tmp)
+                if cli_defined(self._base_path + ['ip'], 'disable-arp-filter'):
+                    tmp = read_file(f'{proc_base}/arp_filter')
+                    self.assertEqual('0', tmp)
 
-                tmp = read_file(f'{proc_base}/arp_accept')
-                self.assertEqual('1', tmp)
+                if cli_defined(self._base_path + ['ip'], 'enable-arp-accept'):
+                    tmp = read_file(f'{proc_base}/arp_accept')
+                    self.assertEqual('1', tmp)
 
-                tmp = read_file(f'{proc_base}/arp_announce')
-                self.assertEqual('1', tmp)
+                if cli_defined(self._base_path + ['ip'], 'enable-arp-announce'):
+                    tmp = read_file(f'{proc_base}/arp_announce')
+                    self.assertEqual('1', tmp)
 
-                tmp = read_file(f'{proc_base}/arp_ignore')
-                self.assertEqual('1', tmp)
+                if cli_defined(self._base_path + ['ip'], 'enable-arp-ignore'):
+                    tmp = read_file(f'{proc_base}/arp_ignore')
+                    self.assertEqual('1', tmp)
 
-                tmp = read_file(f'{proc_base}/forwarding')
-                self.assertEqual('0', tmp)
+                if cli_defined(self._base_path + ['ip'], 'disable-forwarding'):
+                    tmp = read_file(f'{proc_base}/forwarding')
+                    self.assertEqual('0', tmp)
 
-                tmp = read_file(f'{proc_base}/bc_forwarding')
-                self.assertEqual('1', tmp)
+                if cli_defined(self._base_path + ['ip'], 'enable-directed-broadcast'):
+                    tmp = read_file(f'{proc_base}/bc_forwarding')
+                    self.assertEqual('1', tmp)
 
-                tmp = read_file(f'{proc_base}/proxy_arp')
-                self.assertEqual('1', tmp)
+                if cli_defined(self._base_path + ['ip'], 'enable-proxy-arp'):
+                    tmp = read_file(f'{proc_base}/proxy_arp')
+                    self.assertEqual('1', tmp)
 
-                tmp = read_file(f'{proc_base}/proxy_arp_pvlan')
-                self.assertEqual('1', tmp)
+                if cli_defined(self._base_path + ['ip'], 'proxy-arp-pvlan'):
+                    tmp = read_file(f'{proc_base}/proxy_arp_pvlan')
+                    self.assertEqual('1', tmp)
 
-                tmp = read_file(f'{proc_base}/rp_filter')
-                self.assertEqual('2', tmp)
+                if cli_defined(self._base_path + ['ip'], 'source-validation'):
+                    tmp = read_file(f'{proc_base}/rp_filter')
+                    self.assertEqual('2', tmp)
 
         def test_interface_ipv6_options(self):
             if not self._test_ipv6:
@@ -700,26 +744,33 @@ class BasicInterfaceTest:
                     self.cli_set(path + option.split())
 
                 # Options
-                self.cli_set(path + ['ipv6', 'adjust-mss', mss])
-                self.cli_set(path + ['ipv6', 'disable-forwarding'])
-                self.cli_set(path + ['ipv6', 'dup-addr-detect-transmits', dad_transmits])
+                if cli_defined(self._base_path + ['ipv6'], 'adjust-mss'):
+                    self.cli_set(path + ['ipv6', 'adjust-mss', mss])
+
+                if cli_defined(self._base_path + ['ipv6'], 'dup-addr-detect-transmits'):
+                    self.cli_set(path + ['ipv6', 'dup-addr-detect-transmits', dad_transmits])
+
+                if cli_defined(self._base_path + ['ipv6'], 'disable-forwarding'):
+                    self.cli_set(path + ['ipv6', 'disable-forwarding'])
 
             self.cli_commit()
 
             for interface in self._interfaces:
-                base_options = f'oifname "{interface}"'
-                out = cmd('sudo nft list chain ip6 raw VYOS_TCP_MSS')
-                for line in out.splitlines():
-                    if line.startswith(base_options):
-                        self.assertIn(f'tcp option maxseg size set {mss}', line)
-
                 proc_base = f'/proc/sys/net/ipv6/conf/{interface}'
-
-                tmp = read_file(f'{proc_base}/forwarding')
-                self.assertEqual('0', tmp)
-
-                tmp = read_file(f'{proc_base}/dad_transmits')
-                self.assertEqual(dad_transmits, tmp)
+                if cli_defined(self._base_path + ['ipv6'], 'adjust-mss'):
+                    base_options = f'oifname "{interface}"'
+                    out = cmd('sudo nft list chain ip6 raw VYOS_TCP_MSS')
+                    for line in out.splitlines():
+                        if line.startswith(base_options):
+                            self.assertIn(f'tcp option maxseg size set {mss}', line)
+
+                if cli_defined(self._base_path + ['ipv6'], 'dup-addr-detect-transmits'):
+                    tmp = read_file(f'{proc_base}/dad_transmits')
+                    self.assertEqual(dad_transmits, tmp)
+
+                if cli_defined(self._base_path + ['ipv6'], 'disable-forwarding'):
+                    tmp = read_file(f'{proc_base}/forwarding')
+                    self.assertEqual('0', tmp)
 
         def test_dhcpv6_client_options(self):
             if not self._test_ipv6_dhcpc6:
diff --git a/smoketest/scripts/cli/test_interfaces_bonding.py b/smoketest/scripts/cli/test_interfaces_bonding.py
index cd3995ed9..2e09173a7 100755
--- a/smoketest/scripts/cli/test_interfaces_bonding.py
+++ b/smoketest/scripts/cli/test_interfaces_bonding.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2020-2022 VyOS maintainers and contributors
+# Copyright (C) 2020-2023 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
@@ -28,14 +28,6 @@ from vyos.util import read_file
 class BondingInterfaceTest(BasicInterfaceTest.TestCase):
     @classmethod
     def setUpClass(cls):
-        cls._test_dhcp = True
-        cls._test_ip = True
-        cls._test_ipv6 = True
-        cls._test_ipv6_pd = True
-        cls._test_ipv6_dhcpc6 = True
-        cls._test_mtu = True
-        cls._test_vlan = True
-        cls._test_qinq = True
         cls._base_path = ['interfaces', 'bonding']
         cls._mirror_interfaces = ['dum21354']
         cls._members = []
@@ -251,4 +243,4 @@ class BondingInterfaceTest(BasicInterfaceTest.TestCase):
                 self.assertIn(member, slaves)
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2)
+    unittest.main(verbosity=2, failfast=True)
diff --git a/smoketest/scripts/cli/test_interfaces_bridge.py b/smoketest/scripts/cli/test_interfaces_bridge.py
index 6d7af78eb..85b45c8fa 100755
--- a/smoketest/scripts/cli/test_interfaces_bridge.py
+++ b/smoketest/scripts/cli/test_interfaces_bridge.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2020-2022 VyOS maintainers and contributors
+# Copyright (C) 2020-2023 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
@@ -32,12 +32,6 @@ from vyos.validate import is_intf_addr_assigned
 class BridgeInterfaceTest(BasicInterfaceTest.TestCase):
     @classmethod
     def setUpClass(cls):
-        cls._test_dhcp = True
-        cls._test_ip = True
-        cls._test_ipv6 = True
-        cls._test_ipv6_pd = True
-        cls._test_ipv6_dhcpc6 = True
-        cls._test_vlan = True
         cls._base_path = ['interfaces', 'bridge']
         cls._mirror_interfaces = ['dum21354']
         cls._members = []
diff --git a/smoketest/scripts/cli/test_interfaces_dummy.py b/smoketest/scripts/cli/test_interfaces_dummy.py
index a79e4cb1b..d96ec2c5d 100755
--- a/smoketest/scripts/cli/test_interfaces_dummy.py
+++ b/smoketest/scripts/cli/test_interfaces_dummy.py
@@ -21,7 +21,6 @@ from base_interfaces_test import BasicInterfaceTest
 class DummyInterfaceTest(BasicInterfaceTest.TestCase):
     @classmethod
     def setUpClass(cls):
-        cls._test_mtu = True
         cls._base_path = ['interfaces', 'dummy']
         cls._interfaces = ['dum435', 'dum8677', 'dum0931', 'dum089']
         # call base-classes classmethod
diff --git a/smoketest/scripts/cli/test_interfaces_ethernet.py b/smoketest/scripts/cli/test_interfaces_ethernet.py
index e53413f0d..a1bc8481d 100755
--- a/smoketest/scripts/cli/test_interfaces_ethernet.py
+++ b/smoketest/scripts/cli/test_interfaces_ethernet.py
@@ -109,14 +109,6 @@ def get_certificate_count(interface, cert_type):
 class EthernetInterfaceTest(BasicInterfaceTest.TestCase):
     @classmethod
     def setUpClass(cls):
-        cls._test_dhcp = True
-        cls._test_ip = True
-        cls._test_ipv6 = True
-        cls._test_ipv6_pd = True
-        cls._test_ipv6_dhcpc6 = True
-        cls._test_mtu = True
-        cls._test_vlan = True
-        cls._test_qinq = True
         cls._base_path = ['interfaces', 'ethernet']
         cls._mirror_interfaces = ['dum21354']
 
diff --git a/smoketest/scripts/cli/test_interfaces_geneve.py b/smoketest/scripts/cli/test_interfaces_geneve.py
index 0e5098aa7..24d350aeb 100755
--- a/smoketest/scripts/cli/test_interfaces_geneve.py
+++ b/smoketest/scripts/cli/test_interfaces_geneve.py
@@ -24,8 +24,6 @@ from base_interfaces_test import BasicInterfaceTest
 class GeneveInterfaceTest(BasicInterfaceTest.TestCase):
     @classmethod
     def setUpClass(cls):
-        cls._test_ip = True
-        cls._test_ipv6 = True
         cls._base_path = ['interfaces', 'geneve']
         cls._options = {
             'gnv0': ['vni 10', 'remote 127.0.1.1'],
diff --git a/smoketest/scripts/cli/test_interfaces_input.py b/smoketest/scripts/cli/test_interfaces_input.py
index c6d7febec..b4cae4695 100755
--- a/smoketest/scripts/cli/test_interfaces_input.py
+++ b/smoketest/scripts/cli/test_interfaces_input.py
@@ -27,7 +27,6 @@ class InputInterfaceTest(VyOSUnitTestSHIM.TestCase):
     @classmethod
     def setUpClass(cls):
         super(InputInterfaceTest, cls).setUpClass()
-
         cls._interfaces = ['ifb10', 'ifb20', 'ifb30']
 
     def tearDown(self):
diff --git a/smoketest/scripts/cli/test_interfaces_l2tpv3.py b/smoketest/scripts/cli/test_interfaces_l2tpv3.py
index aed8e6f15..b1d5b7c19 100755
--- a/smoketest/scripts/cli/test_interfaces_l2tpv3.py
+++ b/smoketest/scripts/cli/test_interfaces_l2tpv3.py
@@ -24,8 +24,6 @@ from vyos.util import cmd
 class L2TPv3InterfaceTest(BasicInterfaceTest.TestCase):
     @classmethod
     def setUpClass(cls):
-        cls._test_ip = True
-        cls._test_ipv6 = True
         cls._base_path = ['interfaces', 'l2tpv3']
         cls._options = {
             'l2tpeth10': ['source-address 127.0.0.1', 'remote 127.10.10.10',
diff --git a/smoketest/scripts/cli/test_interfaces_loopback.py b/smoketest/scripts/cli/test_interfaces_loopback.py
index 5ff9c250e..cde90189b 100755
--- a/smoketest/scripts/cli/test_interfaces_loopback.py
+++ b/smoketest/scripts/cli/test_interfaces_loopback.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2020-2021 VyOS maintainers and contributors
+# Copyright (C) 2020-2023 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
@@ -31,6 +31,9 @@ class LoopbackInterfaceTest(BasicInterfaceTest.TestCase):
         # call base-classes classmethod
         super(LoopbackInterfaceTest, cls).setUpClass()
 
+    # we need to override tearDown() as loopback interfaces are ephemeral and
+    # will always be present on the system - the base class check will fail as
+    # the loopback interface will still exist.
     def tearDown(self):
         self.cli_delete(self._base_path)
         self.cli_commit()
diff --git a/smoketest/scripts/cli/test_interfaces_macsec.py b/smoketest/scripts/cli/test_interfaces_macsec.py
index f141cc6d3..433336f07 100755
--- a/smoketest/scripts/cli/test_interfaces_macsec.py
+++ b/smoketest/scripts/cli/test_interfaces_macsec.py
@@ -42,9 +42,6 @@ def get_cipher(interface):
 class MACsecInterfaceTest(BasicInterfaceTest.TestCase):
     @classmethod
     def setUpClass(cls):
-        cls._test_dhcp = True
-        cls._test_ip = True
-        cls._test_ipv6 = True
         cls._base_path = ['interfaces', 'macsec']
         cls._options = { 'macsec0': ['source-interface eth0', 'security cipher gcm-aes-128'] }
 
diff --git a/smoketest/scripts/cli/test_interfaces_netns.py b/smoketest/scripts/cli/test_interfaces_netns.py
index 9975a6b09..dffa7e0ac 100755
--- a/smoketest/scripts/cli/test_interfaces_netns.py
+++ b/smoketest/scripts/cli/test_interfaces_netns.py
@@ -14,9 +14,6 @@
 # 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 re
-import os
-import json
 import unittest
 
 from netifaces import interfaces
@@ -32,7 +29,6 @@ base_path = ['netns']
 namespaces = ['mgmt', 'front', 'back', 'ams-ix']
 
 class NETNSTest(VyOSUnitTestSHIM.TestCase):
-
     def setUp(self):
         self._interfaces = ['dum10', 'dum12', 'dum50']
 
diff --git a/smoketest/scripts/cli/test_interfaces_pppoe.py b/smoketest/scripts/cli/test_interfaces_pppoe.py
index f4efed641..0ce5e2fe0 100755
--- a/smoketest/scripts/cli/test_interfaces_pppoe.py
+++ b/smoketest/scripts/cli/test_interfaces_pppoe.py
@@ -14,7 +14,6 @@
 # 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 re
 import unittest
 
 from psutil import process_iter
diff --git a/smoketest/scripts/cli/test_interfaces_pseudo_ethernet.py b/smoketest/scripts/cli/test_interfaces_pseudo_ethernet.py
index a51b8d52c..0d6f5bc1f 100755
--- a/smoketest/scripts/cli/test_interfaces_pseudo_ethernet.py
+++ b/smoketest/scripts/cli/test_interfaces_pseudo_ethernet.py
@@ -23,14 +23,6 @@ from base_interfaces_test import BasicInterfaceTest
 class PEthInterfaceTest(BasicInterfaceTest.TestCase):
     @classmethod
     def setUpClass(cls):
-        cls._test_dhcp = True
-        cls._test_ip = True
-        cls._test_ipv6 = True
-        cls._test_ipv6_pd = True
-        cls._test_ipv6_dhcpc6 = True
-        cls._test_mtu = True
-        cls._test_vlan = True
-        cls._test_qinq = True
         cls._base_path = ['interfaces', 'pseudo-ethernet']
 
         cls._options = {}
diff --git a/smoketest/scripts/cli/test_interfaces_tunnel.py b/smoketest/scripts/cli/test_interfaces_tunnel.py
index 44bfbb5f0..9dce2b52c 100755
--- a/smoketest/scripts/cli/test_interfaces_tunnel.py
+++ b/smoketest/scripts/cli/test_interfaces_tunnel.py
@@ -30,9 +30,6 @@ mtu = 1476
 class TunnelInterfaceTest(BasicInterfaceTest.TestCase):
     @classmethod
     def setUpClass(cls):
-        cls._test_ip = True
-        cls._test_ipv6 = True
-        cls._test_mtu = True
         cls._base_path = ['interfaces', 'tunnel']
         cls.local_v4 = '192.0.2.1'
         cls.local_v6 = '2001:db8::1'
diff --git a/smoketest/scripts/cli/test_interfaces_virtual_ethernet.py b/smoketest/scripts/cli/test_interfaces_virtual_ethernet.py
index 4732342fc..e09846673 100755
--- a/smoketest/scripts/cli/test_interfaces_virtual_ethernet.py
+++ b/smoketest/scripts/cli/test_interfaces_virtual_ethernet.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2022 VyOS maintainers and contributors
+# Copyright (C) 2023 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
@@ -14,7 +14,6 @@
 # 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 os
 import unittest
 
 from vyos.ifconfig import Section
@@ -23,9 +22,7 @@ from base_interfaces_test import BasicInterfaceTest
 class VEthInterfaceTest(BasicInterfaceTest.TestCase):
     @classmethod
     def setUpClass(cls):
-        cls._test_dhcp = True
         cls._base_path = ['interfaces', 'virtual-ethernet']
-
         cls._options = {
             'veth0': ['peer-name veth1'],
             'veth1': ['peer-name veth0'],
@@ -35,5 +32,8 @@ class VEthInterfaceTest(BasicInterfaceTest.TestCase):
         # call base-classes classmethod
         super(VEthInterfaceTest, cls).setUpClass()
 
+    def test_vif_8021q_mtu_limits(self):
+        self.skipTest('not supported')
+
 if __name__ == '__main__':
     unittest.main(verbosity=2)
diff --git a/smoketest/scripts/cli/test_interfaces_vti.py b/smoketest/scripts/cli/test_interfaces_vti.py
index 9cbf104f0..7f13575a3 100755
--- a/smoketest/scripts/cli/test_interfaces_vti.py
+++ b/smoketest/scripts/cli/test_interfaces_vti.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2022 VyOS maintainers and contributors
+# Copyright (C) 2023 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
@@ -21,9 +21,6 @@ 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']
 
diff --git a/smoketest/scripts/cli/test_interfaces_vxlan.py b/smoketest/scripts/cli/test_interfaces_vxlan.py
index 058f13721..60a9d1966 100755
--- a/smoketest/scripts/cli/test_interfaces_vxlan.py
+++ b/smoketest/scripts/cli/test_interfaces_vxlan.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2020-2022 VyOS maintainers and contributors
+# Copyright (C) 2020-2023 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
@@ -26,9 +26,6 @@ from base_interfaces_test import BasicInterfaceTest
 class VXLANInterfaceTest(BasicInterfaceTest.TestCase):
     @classmethod
     def setUpClass(cls):
-        cls._test_ip = True
-        cls._test_ipv6 = True
-        cls._test_mtu = True
         cls._base_path = ['interfaces', 'vxlan']
         cls._options = {
             'vxlan10': ['vni 10', 'remote 127.0.0.2'],
diff --git a/smoketest/scripts/cli/test_interfaces_wireless.py b/smoketest/scripts/cli/test_interfaces_wireless.py
index a24f37d8d..5d77454b5 100755
--- a/smoketest/scripts/cli/test_interfaces_wireless.py
+++ b/smoketest/scripts/cli/test_interfaces_wireless.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2020-2021 VyOS maintainers and contributors
+# Copyright (C) 2020-2023 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
@@ -34,7 +34,6 @@ def get_config_value(interface, key):
 class WirelessInterfaceTest(BasicInterfaceTest.TestCase):
     @classmethod
     def setUpClass(cls):
-        cls._test_ip = True
         cls._base_path = ['interfaces', 'wireless']
         cls._options = {
             'wlan0':  ['physical-device phy0', 'ssid VyOS-WIFI-0',
diff --git a/src/conf_mode/interfaces-bridge.py b/src/conf_mode/interfaces-bridge.py
index b961408db..4da3b097f 100755
--- a/src/conf_mode/interfaces-bridge.py
+++ b/src/conf_mode/interfaces-bridge.py
@@ -131,11 +131,11 @@ def verify(bridge):
                 raise ConfigError('Loopback interface "lo" can not be added to a bridge')
 
             if 'is_bridge_member' in interface_config:
-                tmp = interface_config['is_bridge_member']
+                tmp = next(iter(interface_config['is_bridge_member']))
                 raise ConfigError(error_msg + f'it is already a member of bridge "{tmp}"!')
 
             if 'is_bond_member' in interface_config:
-                tmp = interface_config['is_bond_member']
+                tmp = next(iter(interface_config['is_bond_member']))
                 raise ConfigError(error_msg + f'it is already a member of bond "{tmp}"!')
 
             if 'is_source_interface' in interface_config: