From c90512f68dbabe6f005c259f6e787abe527fe975 Mon Sep 17 00:00:00 2001
From: Nataliia Solomko <natalirs1985@gmail.com>
Date: Fri, 27 Feb 2026 21:22:15 +0200
Subject: vpp: T8327: Migrate bridge interface to 'interfaces vpp bridge'

---
 interface-definitions/vpp.xml.in                  | 46 -------------------
 interface-definitions/vpp_interface_bridge.xml.in | 56 +++++++++++++++++++++++
 2 files changed, 56 insertions(+), 46 deletions(-)
 create mode 100644 interface-definitions/vpp_interface_bridge.xml.in

(limited to 'interface-definitions')

diff --git a/interface-definitions/vpp.xml.in b/interface-definitions/vpp.xml.in
index 517129e78..141c40275 100644
--- a/interface-definitions/vpp.xml.in
+++ b/interface-definitions/vpp.xml.in
@@ -12,52 +12,6 @@
           <priority>300</priority>
         </properties>
         <children>
-          <tagNode name="bridge" owner="${vyos_conf_scripts_dir}/vpp_interfaces_bridge.py">
-            <properties>
-              <priority>327</priority>
-              <help>Bridge domain</help>
-              <constraint>
-                <!-- Bridge domain 0 is reserved to vpp default -->
-                <regex>br(?!0$)[0-9]+</regex>
-              </constraint>
-              <constraintErrorMessage>Bridge domain must be named brN and br0 is reserved</constraintErrorMessage>
-              <valueHelp>
-                <format>brN</format>
-                <description>Bridge interface name</description>
-              </valueHelp>
-            </properties>
-            <children>
-              #include <include/generic-description.xml.i>
-              #include <include/interface/disable.xml.i>
-              <node name="member">
-                <properties>
-                  <help>Bridge member interfaces</help>
-                </properties>
-                <children>
-                  <tagNode name="interface">
-                    <properties>
-                      <help>Member interface name</help>
-                      <completionHelp>
-                        <script>${vyos_completion_dir}/list_interfaces --bridgeable</script>
-                      </completionHelp>
-                      <valueHelp>
-                        <format>txt</format>
-                        <description>Interface name</description>
-                      </valueHelp>
-                    </properties>
-                    <children>
-                      <leafNode name="bvi">
-                        <properties>
-                          <help>Bridge Virtual Interface (BVI)</help>
-                          <valueless/>
-                        </properties>
-                      </leafNode>
-                    </children>
-                  </tagNode>
-                </children>
-              </node>
-            </children>
-          </tagNode>
           <!-- Disable as geneve interface index in the VPP always 0 and not configured -->
           <!-- <tagNode name="geneve" owner="${vyos_conf_scripts_dir}/vpp_interfaces_geneve.py">
             <properties>
diff --git a/interface-definitions/vpp_interface_bridge.xml.in b/interface-definitions/vpp_interface_bridge.xml.in
new file mode 100644
index 000000000..a918ec99b
--- /dev/null
+++ b/interface-definitions/vpp_interface_bridge.xml.in
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name='interfaces'>
+    <children>
+      <node name='vpp'>
+        <children>
+          <tagNode name="bridge" owner="${vyos_conf_scripts_dir}/vpp_interfaces_bridge.py">
+            <properties>
+              <priority>327</priority>
+              <help>Bridge domain</help>
+              <constraint>
+                <!-- Bridge domain 0 is reserved to vpp default -->
+                <regex>vppbr(?!0$)[0-9]+</regex>
+              </constraint>
+              <constraintErrorMessage>Bridge domain must be named vppbrN and vppbr0 is reserved</constraintErrorMessage>
+              <valueHelp>
+                <format>vppbrN</format>
+                <description>Bridge interface name</description>
+              </valueHelp>
+            </properties>
+            <children>
+              #include <include/generic-description.xml.i>
+              <node name="member">
+                <properties>
+                  <help>Bridge member interfaces</help>
+                </properties>
+                <children>
+                  <tagNode name="interface">
+                    <properties>
+                      <help>Member interface name</help>
+                      <completionHelp>
+                        <script>${vyos_completion_dir}/list_interfaces --bridgeable</script>
+                      </completionHelp>
+                      <valueHelp>
+                        <format>txt</format>
+                        <description>Interface name</description>
+                      </valueHelp>
+                    </properties>
+                    <children>
+                      <leafNode name="bvi">
+                        <properties>
+                          <help>Bridge Virtual Interface (BVI)</help>
+                          <valueless/>
+                        </properties>
+                      </leafNode>
+                    </children>
+                  </tagNode>
+                </children>
+              </node>
+            </children>
+          </tagNode>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
-- 
cgit v1.2.3