From 6a44472d0b94ff225499f61ce057ad7709c9fafc Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Wed, 12 Jul 2023 21:02:58 +0200
Subject: bgp: T2387: re-use XML building blocks to simplify CLI definition

---
 .../include/bgp/afi-vpn-label.xml.i                | 14 +++++++
 .../include/bgp/protocol-common-config.xml.i       | 43 ++--------------------
 2 files changed, 18 insertions(+), 39 deletions(-)
 create mode 100644 interface-definitions/include/bgp/afi-vpn-label.xml.i

diff --git a/interface-definitions/include/bgp/afi-vpn-label.xml.i b/interface-definitions/include/bgp/afi-vpn-label.xml.i
new file mode 100644
index 000000000..6c7e73d9b
--- /dev/null
+++ b/interface-definitions/include/bgp/afi-vpn-label.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from bgp/afi-vpn-label.xml.i -->
+<leafNode name="label">
+  <properties>
+    <help>MPLS label value assigned to route</help>
+    <valueHelp>
+      <format>u32:0-1048575</format>
+      <description>MPLS label value</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 0-1048575"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/protocol-common-config.xml.i b/interface-definitions/include/bgp/protocol-common-config.xml.i
index 07b6868ee..dde7fc8c7 100644
--- a/interface-definitions/include/bgp/protocol-common-config.xml.i
+++ b/interface-definitions/include/bgp/protocol-common-config.xml.i
@@ -355,15 +355,7 @@
             <help>Apply local policy routing to interface</help>
           </properties>
           <children>
-            <leafNode name="interface">
-              <properties>
-                <help>Interface</help>
-                <completionHelp>
-                  <script>${vyos_completion_dir}/list_interfaces</script>
-                </completionHelp>
-                <multi/>
-              </properties>
-            </leafNode>
+            #include <include/generic-interface-multi.xml.i>
           </children>
         </node>
       </children>
@@ -386,18 +378,7 @@
           </properties>
           <children>
             #include <include/bgp/route-distinguisher.xml.i>
-            <leafNode name="label">
-              <properties>
-                <help>MPLS label value assigned to route</help>
-                <valueHelp>
-                  <format>u32:0-1048575</format>
-                  <description>MPLS label value</description>
-                </valueHelp>
-                <constraint>
-                  <validator name="numeric" argument="--range 0-1048575"/>
-                </constraint>
-              </properties>
-            </leafNode>
+            #include <include/bgp/afi-vpn-label.xml.i>
           </children>
         </tagNode>
       </children>
@@ -766,18 +747,7 @@
           </properties>
           <children>
             #include <include/bgp/route-distinguisher.xml.i>
-            <leafNode name="label">
-              <properties>
-                <help>MPLS label value assigned to route</help>
-                <valueHelp>
-                  <format>u32:0-1048575</format>
-                  <description>MPLS label value</description>
-                </valueHelp>
-                <constraint>
-                  <validator name="numeric" argument="--range 0-1048575"/>
-                </constraint>
-              </properties>
-            </leafNode>
+            #include <include/bgp/afi-vpn-label.xml.i>
           </children>
         </tagNode>
       </children>
@@ -840,12 +810,7 @@
             <help>Specify handling for BUM packets</help>
           </properties>
           <children>
-            <leafNode name="disable">
-              <properties>
-                <help>Do not flood any BUM packets</help>
-                <valueless/>
-              </properties>
-            </leafNode>
+            #include <include/generic-disable-node.xml.i>
             <leafNode name="head-end-replication">
               <properties>
                 <help>Flood BUM packets using head-end replication</help>
-- 
cgit v1.2.3