vpp: T8416: Prevent interfaces from being assigned to xconnect and bridge/bonding at the same time

3 files changed, 14 insertions, 15 deletions

diff --git a/src/conf_mode/vpp_interfaces_bonding.py b/src/conf_mode/vpp_interfaces_bonding.py
index fa49f2da5..107922ed8 100644
--- a/src/conf_mode/vpp_interfaces_bonding.py
+++ b/src/conf_mode/vpp_interfaces_bonding.py
@@ -27,6 +27,7 @@ from vyos.ifconfig.vpp import VPPBondInterface
 from vyos.vpp.config_deps import deps_bond_dict
 from vyos.vpp.config_deps import deps_bridge_dict
 from vyos.vpp.config_deps import deps_xconnect_dict
+from vyos.vpp.config_verify import verify_member_conflicts
 from vyos.vpp.config_verify import verify_vpp_remove_bridge_interface
 from vyos.vpp.config_verify import verify_vpp_remove_xconnect_interface
 from vyos.vpp.utils import cli_ifaces_list
@@ -166,13 +167,7 @@ def verify(config):
                 f'Interface {iface} cannot be a member of multiple bonding interfaces: {", ".join(bond_members)}'
             )
 
-        # Interface cannot be a member of a bridge and a bond at the same time
-        bridge_members = config['bridge_members'].get(iface)
-        if bridge_members:
-            raise ConfigError(
-                f'Interface {iface} cannot be a member of a bond because '
-                f'it already belongs to bridge interface: {", ".join(bridge_members)}.'
-            )
+        verify_member_conflicts(iface, config, 'bond')
 
     if 'mac' in config:
         mac = config['mac']
diff --git a/src/conf_mode/vpp_interfaces_bridge.py b/src/conf_mode/vpp_interfaces_bridge.py
index 162345e6e..25fad5e5b 100644
--- a/src/conf_mode/vpp_interfaces_bridge.py
+++ b/src/conf_mode/vpp_interfaces_bridge.py
@@ -24,6 +24,8 @@ from vyos.utils.process import is_systemd_service_active
 from vyos.ifconfig.vpp import VPPBridgeInterface
 from vyos.vpp.config_deps import deps_bond_dict
 from vyos.vpp.config_deps import deps_bridge_dict
+from vyos.vpp.config_deps import deps_xconnect_dict
+from vyos.vpp.config_verify import verify_member_conflicts
 
 
 def get_config(config=None) -> dict:
@@ -67,6 +69,7 @@ def get_config(config=None) -> dict:
 
     config['bond_members'] = deps_bond_dict(conf)
     config['bridge_members'] = deps_bridge_dict(conf)
+    config['xconn_members'] = deps_xconnect_dict(conf)
 
     return config
 
@@ -104,13 +107,7 @@ def verify(config):
                     f'Interface {member} is added to more than one bridge: {", ".join(bridge_members)}'
                 )
 
-            # Interface cannot be a member of a bridge and a bond at the same time
-            bond_members = config['bond_members'].get(member)
-            if bond_members:
-                raise ConfigError(
-                    f'Interface {member} cannot be a member of a bridge '
-                    f'because it already belongs to bonding interface: {", ".join(bond_members)}.'
-                )
+            verify_member_conflicts(member, config, 'bridge')
 
             # Check if BVI is already defined, only one BVI per bridge domain is allowed
             if 'bvi' in member_config:
diff --git a/src/conf_mode/vpp_interfaces_xconnect.py b/src/conf_mode/vpp_interfaces_xconnect.py
index 090d913b0..91fa27c1b 100644
--- a/src/conf_mode/vpp_interfaces_xconnect.py
+++ b/src/conf_mode/vpp_interfaces_xconnect.py
@@ -22,7 +22,10 @@ from vyos.configdict import get_interface_dict
 from vyos.utils.process import is_systemd_service_active
 
 from vyos.ifconfig.vpp import VPPXconnectInterface
+from vyos.vpp.config_deps import deps_bond_dict
+from vyos.vpp.config_deps import deps_bridge_dict
 from vyos.vpp.config_deps import deps_xconnect_dict
+from vyos.vpp.config_verify import verify_member_conflicts
 from vyos.vpp.utils import cli_ifaces_list
 
 
@@ -59,6 +62,8 @@ def get_config(config=None) -> dict:
     if effective_config:
         config.update({'effective': effective_config})
 
+    config['bond_members'] = deps_bond_dict(conf)
+    config['bridge_members'] = deps_bridge_dict(conf)
     config['xconn_members'] = deps_xconnect_dict(conf)
     config['vpp_ifaces'] = cli_ifaces_list(conf, 'candidate')
 
@@ -78,7 +83,7 @@ def verify(config):
     if len(config.get('member', {}).get('interface')) != 2:
         raise ConfigError('Cross connect requires 2 members')
 
-    not_allowed_prefixes = ('vppbond', 'vppbridge', 'vpplo')
+    not_allowed_prefixes = ('vppbond', 'vppbr', 'vpplo')
     for iface in config.get('member', {}).get('interface', []):
         # Ensure the interface is allowed as xconnect member
         if iface.startswith(not_allowed_prefixes):
@@ -94,6 +99,8 @@ def verify(config):
                 f'Interface {iface} added to more than one xconnect: {", ".join(xconn_members)}'
             )
 
+        verify_member_conflicts(iface, config, 'xconn')
+
 
 def generate(config):
     pass