From 020f217c2e4bfcff3cecb0b33c93af517775f4ae Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Mon, 23 Dec 2024 13:31:32 +0100
Subject: xml: T5738: re-use XML building blocks for interfaces as much as
 possible

Change XML definitions to re-use already existing building blocks, or merge
two building block sinto one (e.g. static route interfaces).
---
 interface-definitions/high-availability.xml.in     | 17 +-----------
 .../include/bgp/protocol-common-config.xml.i       | 10 +------
 .../include/generic-interface-broadcast.xml.i      |  2 +-
 .../generic-interface-multi-broadcast.xml.i        |  2 +-
 .../include/generic-interface-multi-wildcard.xml.i |  2 +-
 .../include/generic-interface-multi.xml.i          |  2 +-
 .../include/generic-interface.xml.i                |  2 +-
 .../include/static/static-route-interface.xml.i    | 17 ------------
 .../include/static/static-route.xml.i              |  2 +-
 .../include/static/static-route6.xml.i             |  2 +-
 interface-definitions/protocols_failover.xml.in    |  2 +-
 interface-definitions/service_dhcpv6-server.xml.in | 32 ++--------------------
 interface-definitions/service_ndp-proxy.xml.in     | 12 +-------
 13 files changed, 13 insertions(+), 91 deletions(-)
 delete mode 100644 interface-definitions/include/static/static-route-interface.xml.i

(limited to 'interface-definitions')

diff --git a/interface-definitions/high-availability.xml.in b/interface-definitions/high-availability.xml.in
index 7108aa06c..6cf6237ca 100644
--- a/interface-definitions/high-availability.xml.in
+++ b/interface-definitions/high-availability.xml.in
@@ -247,22 +247,7 @@
                       <help>Disable track state of main interface</help>
                     </properties>
                   </leafNode>
-                  <leafNode name="interface">
-                    <properties>
-                      <help>Interface name state check</help>
-                      <completionHelp>
-                        <script>${vyos_completion_dir}/list_interfaces --broadcast</script>
-                      </completionHelp>
-                      <valueHelp>
-                        <format>txt</format>
-                        <description>Interface name</description>
-                      </valueHelp>
-                      <constraint>
-                        #include <include/constraint/interface-name.xml.i>
-                      </constraint>
-                      <multi/>
-                    </properties>
-                  </leafNode>
+                  #include <include/generic-interface-multi-broadcast.xml.i>
                 </children>
               </node>
               #include <include/vrrp-transition-script.xml.i>
diff --git a/interface-definitions/include/bgp/protocol-common-config.xml.i b/interface-definitions/include/bgp/protocol-common-config.xml.i
index 0f05625a7..4953251c5 100644
--- a/interface-definitions/include/bgp/protocol-common-config.xml.i
+++ b/interface-definitions/include/bgp/protocol-common-config.xml.i
@@ -721,15 +721,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>
diff --git a/interface-definitions/include/generic-interface-broadcast.xml.i b/interface-definitions/include/generic-interface-broadcast.xml.i
index e37e75012..52a4a2717 100644
--- a/interface-definitions/include/generic-interface-broadcast.xml.i
+++ b/interface-definitions/include/generic-interface-broadcast.xml.i
@@ -1,7 +1,7 @@
 <!-- include start from generic-interface-broadcast.xml.i -->
 <leafNode name="interface">
   <properties>
-    <help>Interface to use</help>
+    <help>Interface</help>
     <completionHelp>
       <script>${vyos_completion_dir}/list_interfaces --broadcast</script>
     </completionHelp>
diff --git a/interface-definitions/include/generic-interface-multi-broadcast.xml.i b/interface-definitions/include/generic-interface-multi-broadcast.xml.i
index ed13cf2cf..65ca1ffab 100644
--- a/interface-definitions/include/generic-interface-multi-broadcast.xml.i
+++ b/interface-definitions/include/generic-interface-multi-broadcast.xml.i
@@ -1,7 +1,7 @@
 <!-- include start from generic-interface-multi-broadcast.xml.i -->
 <leafNode name="interface">
   <properties>
-    <help>Interface to use</help>
+    <help>Interface</help>
     <completionHelp>
       <script>${vyos_completion_dir}/list_interfaces --broadcast</script>
     </completionHelp>
diff --git a/interface-definitions/include/generic-interface-multi-wildcard.xml.i b/interface-definitions/include/generic-interface-multi-wildcard.xml.i
index 6c846a795..cd65028ac 100644
--- a/interface-definitions/include/generic-interface-multi-wildcard.xml.i
+++ b/interface-definitions/include/generic-interface-multi-wildcard.xml.i
@@ -1,7 +1,7 @@
 <!-- include start from generic-interface-multi-wildcard.xml.i -->
 <leafNode name="interface">
   <properties>
-    <help>Interface to use</help>
+    <help>Interface</help>
     <completionHelp>
       <script>${vyos_completion_dir}/list_interfaces</script>
     </completionHelp>
diff --git a/interface-definitions/include/generic-interface-multi.xml.i b/interface-definitions/include/generic-interface-multi.xml.i
index cfc77af3a..a4329cba7 100644
--- a/interface-definitions/include/generic-interface-multi.xml.i
+++ b/interface-definitions/include/generic-interface-multi.xml.i
@@ -1,7 +1,7 @@
 <!-- include start from generic-interface-multi.xml.i -->
 <leafNode name="interface">
   <properties>
-    <help>Interface to use</help>
+    <help>Interface</help>
     <completionHelp>
       <script>${vyos_completion_dir}/list_interfaces</script>
     </completionHelp>
diff --git a/interface-definitions/include/generic-interface.xml.i b/interface-definitions/include/generic-interface.xml.i
index 65f5bfbb8..cf6fb9151 100644
--- a/interface-definitions/include/generic-interface.xml.i
+++ b/interface-definitions/include/generic-interface.xml.i
@@ -1,7 +1,7 @@
 <!-- include start from generic-interface.xml.i -->
 <leafNode name="interface">
   <properties>
-    <help>Interface to use</help>
+    <help>Interface</help>
     <completionHelp>
       <script>${vyos_completion_dir}/list_interfaces</script>
     </completionHelp>
diff --git a/interface-definitions/include/static/static-route-interface.xml.i b/interface-definitions/include/static/static-route-interface.xml.i
deleted file mode 100644
index cb5436847..000000000
--- a/interface-definitions/include/static/static-route-interface.xml.i
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- include start from static/static-route-interface.xml.i -->
-<leafNode name="interface">
-  <properties>
-    <help>Gateway interface name</help>
-    <completionHelp>
-      <script>${vyos_completion_dir}/list_interfaces</script>
-    </completionHelp>
-    <valueHelp>
-      <format>txt</format>
-      <description>Gateway interface name</description>
-    </valueHelp>
-    <constraint>
-      #include <include/constraint/interface-name.xml.i>
-    </constraint>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/static/static-route.xml.i b/interface-definitions/include/static/static-route.xml.i
index fd7366286..c261874f5 100644
--- a/interface-definitions/include/static/static-route.xml.i
+++ b/interface-definitions/include/static/static-route.xml.i
@@ -49,7 +49,7 @@
       <children>
         #include <include/generic-disable-node.xml.i>
         #include <include/static/static-route-distance.xml.i>
-        #include <include/static/static-route-interface.xml.i>
+        #include <include/generic-interface.xml.i>
         #include <include/static/static-route-vrf.xml.i>
         <node name="bfd">
           <properties>
diff --git a/interface-definitions/include/static/static-route6.xml.i b/interface-definitions/include/static/static-route6.xml.i
index 6fcc18b8a..a3d972d39 100644
--- a/interface-definitions/include/static/static-route6.xml.i
+++ b/interface-definitions/include/static/static-route6.xml.i
@@ -49,7 +49,7 @@
       <children>
         #include <include/generic-disable-node.xml.i>
         #include <include/static/static-route-distance.xml.i>
-        #include <include/static/static-route-interface.xml.i>
+        #include <include/generic-interface.xml.i>
         #include <include/static/static-route-segments.xml.i>
         #include <include/static/static-route-vrf.xml.i>
         <node name="bfd">
diff --git a/interface-definitions/protocols_failover.xml.in b/interface-definitions/protocols_failover.xml.in
index f70975949..fae9be76a 100644
--- a/interface-definitions/protocols_failover.xml.in
+++ b/interface-definitions/protocols_failover.xml.in
@@ -110,7 +110,7 @@
                       </leafNode>
                     </children>
                   </node>
-                  #include <include/static/static-route-interface.xml.i>
+                  #include <include/generic-interface.xml.i>
                   <leafNode name="metric">
                     <properties>
                       <help>Route metric for this gateway</help>
diff --git a/interface-definitions/service_dhcpv6-server.xml.in b/interface-definitions/service_dhcpv6-server.xml.in
index cf14388e8..a6763a345 100644
--- a/interface-definitions/service_dhcpv6-server.xml.in
+++ b/interface-definitions/service_dhcpv6-server.xml.in
@@ -48,21 +48,7 @@
             <children>
               #include <include/generic-disable-node.xml.i>
               #include <include/generic-description.xml.i>
-              <leafNode name="interface">
-                <properties>
-                  <help>Optional interface for this shared network to accept requests from</help>
-                  <completionHelp>
-                    <script>${vyos_completion_dir}/list_interfaces</script>
-                  </completionHelp>
-                  <valueHelp>
-                    <format>txt</format>
-                    <description>Interface name</description>
-                  </valueHelp>
-                  <constraint>
-                    #include <include/constraint/interface-name.xml.i>
-                  </constraint>
-                </properties>
-              </leafNode>
+              #include <include/generic-interface.xml.i>
               #include <include/dhcp/option-v6.xml.i>
               <tagNode name="subnet">
                 <properties>
@@ -77,21 +63,7 @@
                 </properties>
                 <children>
                   #include <include/dhcp/option-v6.xml.i>
-                  <leafNode name="interface">
-                    <properties>
-                      <help>Optional interface for this subnet to accept requests from</help>
-                      <completionHelp>
-                        <script>${vyos_completion_dir}/list_interfaces</script>
-                      </completionHelp>
-                      <valueHelp>
-                        <format>txt</format>
-                        <description>Interface name</description>
-                      </valueHelp>
-                      <constraint>
-                        #include <include/constraint/interface-name.xml.i>
-                      </constraint>
-                    </properties>
-                  </leafNode>
+                  #include <include/generic-interface.xml.i>
                   <tagNode name="range">
                     <properties>
                       <help>Parameters setting ranges for assigning IPv6 addresses</help>
diff --git a/interface-definitions/service_ndp-proxy.xml.in b/interface-definitions/service_ndp-proxy.xml.in
index aabba3f4e..327ce89d5 100644
--- a/interface-definitions/service_ndp-proxy.xml.in
+++ b/interface-definitions/service_ndp-proxy.xml.in
@@ -111,17 +111,7 @@
                     </properties>
                     <defaultValue>static</defaultValue>
                   </leafNode>
-                  <leafNode name="interface">
-                    <properties>
-                      <help>Interface to forward Neighbor Solicitation message through. Required for "iface" mode</help>
-                      <completionHelp>
-                        <script>${vyos_completion_dir}/list_interfaces</script>
-                      </completionHelp>
-                      <constraint>
-                        #include <include/constraint/interface-name.xml.i>
-                      </constraint>
-                    </properties>
-                  </leafNode>
+                  #include <include/generic-interface.xml.i>
                 </children>
               </tagNode>
             </children>
-- 
cgit v1.2.3