From ed361a8254073505c1183bc884aa2bcb6ff0b76c Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Wed, 14 Jul 2021 21:40:52 +0200
Subject: xml: provide common "dhcp-interface" include block

---
 interface-definitions/include/dhcp-interface.xml.i      | 15 +++++++++++++++
 interface-definitions/include/static/static-route.xml.i | 16 +---------------
 interface-definitions/interfaces-tunnel.xml.in          | 16 +---------------
 interface-definitions/vpn_ipsec.xml.in                  |  9 +--------
 interface-definitions/vpn_l2tp.xml.in                   |  6 +-----
 5 files changed, 19 insertions(+), 43 deletions(-)
 create mode 100644 interface-definitions/include/dhcp-interface.xml.i

diff --git a/interface-definitions/include/dhcp-interface.xml.i b/interface-definitions/include/dhcp-interface.xml.i
new file mode 100644
index 000000000..939b45f15
--- /dev/null
+++ b/interface-definitions/include/dhcp-interface.xml.i
@@ -0,0 +1,15 @@
+    <leafNode name="dhcp-interface">
+      <properties>
+        <help>DHCP interface supplying next-hop IP address</help>
+        <completionHelp>
+          <script>${vyos_completion_dir}/list_interfaces.py</script>
+        </completionHelp>
+        <valueHelp>
+          <format>txt</format>
+          <description>DHCP interface name</description>
+        </valueHelp>
+        <constraint>
+          <validator name="interface-name"/>
+        </constraint>
+      </properties>
+    </leafNode>
diff --git a/interface-definitions/include/static/static-route.xml.i b/interface-definitions/include/static/static-route.xml.i
index 254ea3163..21babc015 100644
--- a/interface-definitions/include/static/static-route.xml.i
+++ b/interface-definitions/include/static/static-route.xml.i
@@ -31,21 +31,7 @@
         </leafNode>
       </children>
     </node>
-    <leafNode name="dhcp-interface">
-      <properties>
-        <help>DHCP interface supplying next-hop IP address</help>
-        <completionHelp>
-          <script>${vyos_completion_dir}/list_interfaces.py</script>
-        </completionHelp>
-        <valueHelp>
-          <format>txt</format>
-          <description>DHCP interface name</description>
-        </valueHelp>
-        <constraint>
-          <validator name="interface-name"/>
-        </constraint>
-      </properties>
-    </leafNode>
+    #include <include/dhcp-interface.xml.i>
     <tagNode name="interface">
       <properties>
         <help>Next-hop IPv4 router interface</help>
diff --git a/interface-definitions/interfaces-tunnel.xml.in b/interface-definitions/interfaces-tunnel.xml.in
index 56f8ea79c..6851c0354 100644
--- a/interface-definitions/interfaces-tunnel.xml.in
+++ b/interface-definitions/interfaces-tunnel.xml.in
@@ -61,21 +61,7 @@
               </constraint>
             </properties>
           </leafNode>
-          <leafNode name="dhcp-interface">
-            <properties>
-              <help>dhcp interface</help>
-              <valueHelp>
-                <format>interface</format>
-                <description>DHCP interface that supplies the local IP address for this tunnel</description>
-              </valueHelp>
-              <completionHelp>
-                <script>${vyos_completion_dir}/list_interfaces.py</script>
-              </completionHelp>
-              <constraint>
-                <regex>^(en|eth|br|bond|gnv|vxlan|wg|tun)[0-9]+$</regex>
-              </constraint>
-            </properties>
-          </leafNode>
+          #include <include/dhcp-interface.xml.i>
           <leafNode name="encapsulation">
             <properties>
               <help>Encapsulation of this tunnel interface</help>
diff --git a/interface-definitions/vpn_ipsec.xml.in b/interface-definitions/vpn_ipsec.xml.in
index 147f351f2..af0826c63 100644
--- a/interface-definitions/vpn_ipsec.xml.in
+++ b/interface-definitions/vpn_ipsec.xml.in
@@ -1001,14 +1001,7 @@
                     </properties>
                   </leafNode>
                   #include <include/generic-description.xml.i>
-                  <leafNode name="dhcp-interface">
-                    <properties>
-                      <help>DHCP interface to listen on</help>
-                      <completionHelp>
-                        <script>${vyos_completion_dir}/list_interfaces.py</script>
-                      </completionHelp>
-                    </properties>
-                  </leafNode>
+                  #include <include/dhcp-interface.xml.i>
                   <leafNode name="force-encapsulation">
                     <properties>
                       <help>Force UDP Encapsulation for ESP Payloads</help>
diff --git a/interface-definitions/vpn_l2tp.xml.in b/interface-definitions/vpn_l2tp.xml.in
index d9680c5db..f3f5cadcd 100644
--- a/interface-definitions/vpn_l2tp.xml.in
+++ b/interface-definitions/vpn_l2tp.xml.in
@@ -124,11 +124,7 @@
                   <help>Description for L2TP remote-access settings</help>
                 </properties>
               </leafNode>
-              <leafNode name="dhcp-interface">
-                <properties>
-                  <help>DHCP interface to listen on</help>
-                </properties>
-              </leafNode>
+              #include <include/dhcp-interface.xml.i>
               <leafNode name="idle">
                 <properties>
                   <help>PPP idle timeout</help>
-- 
cgit v1.2.3