Merge pull request #5080 from natali-rs1985/T8416

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

1 files changed, 23 insertions, 0 deletions

diff --git a/smoketest/scripts/cli/test_vpp.py b/smoketest/scripts/cli/test_vpp.py
index a98b5ff0b..108741790 100755
--- a/smoketest/scripts/cli/test_vpp.py
+++ b/smoketest/scripts/cli/test_vpp.py
@@ -543,6 +543,19 @@ class TestVPP(VyOSUnitTestSHIM.TestCase):
         self.assertRegex(out, r'\s*eth1\s+\d+\s+\d+')
         self.assertRegex(out, r'\s*vxlan_tunnel23\s+\d+\s+\d+')
 
+        # Cannot add members of bridge interface to cross-connect
+        # expect raise ConfigError
+        self.cli_set(
+            interfaces_path + ['xconnect', 'vppxcon1', 'member', 'interface', interface]
+        )
+        self.cli_set(
+            interfaces_path
+            + ['xconnect', 'vppxcon1', 'member', 'interface', interface_vxlan]
+        )
+        with self.assertRaises(ConfigSessionError):
+            self.cli_commit()
+        self.cli_delete(interfaces_path + ['xconnect'])
+
         # Add Loopback BVI to the bridge
         self.cli_set(interfaces_path + ['loopback', f'vpplo{vni}'])
         self.cli_set(
@@ -653,6 +666,16 @@ class TestVPP(VyOSUnitTestSHIM.TestCase):
         for required_string in required_str_list:
             self.assertIn(required_string, out)
 
+        # Cannot add members of cross-connect interface to bond/bridge
+        # expect raise ConfigError
+        self.cli_set(
+            interfaces_path
+            + ['bonding', 'vppbond1', 'member', 'interface', interface_vxlan]
+        )
+        with self.assertRaises(ConfigSessionError):
+            self.cli_commit()
+        self.cli_delete(interfaces_path + ['bonding'])
+
         # delete xconnect interface
         self.cli_delete(xconn_path + [interface_xconnect])
         self.cli_commit()