From 85349b54ab4de42f81d4c8c4dc84901d1313025f Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 6 Dec 2019 17:53:27 +0100
Subject: T1843: use include files for interface description

---
 .../include/interface-description.xml.i              |  9 +++++++++
 interface-definitions/include/vif-s.xml.i            | 20 ++------------------
 interface-definitions/include/vif.xml.i              | 10 +---------
 interface-definitions/interfaces-bonding.xml.in      | 10 +---------
 interface-definitions/interfaces-bridge.xml.in       | 10 +---------
 interface-definitions/interfaces-dummy.xml.in        | 10 +---------
 interface-definitions/interfaces-ethernet.xml.in     | 10 +---------
 interface-definitions/interfaces-geneve.xml.in       | 10 +---------
 interface-definitions/interfaces-loopback.xml.in     | 10 +---------
 interface-definitions/interfaces-openvpn.xml.in      |  6 +-----
 interface-definitions/interfaces-vxlan.xml.in        | 10 +---------
 interface-definitions/interfaces-wireguard.xml.in    | 10 +---------
 interface-definitions/interfaces-wireless.xml.in     | 10 +---------
 13 files changed, 22 insertions(+), 113 deletions(-)
 create mode 100644 interface-definitions/include/interface-description.xml.i

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/interface-description.xml.i b/interface-definitions/include/interface-description.xml.i
new file mode 100644
index 000000000..6356888da
--- /dev/null
+++ b/interface-definitions/include/interface-description.xml.i
@@ -0,0 +1,9 @@
+<leafNode name="description">
+  <properties>
+    <help>Interface description</help>
+    <constraint>
+      <regex>^.{1,256}$</regex>
+    </constraint>
+    <constraintErrorMessage>Interface description too long (limit 256 characters)</constraintErrorMessage>
+  </properties>
+</leafNode>
diff --git a/interface-definitions/include/vif-s.xml.i b/interface-definitions/include/vif-s.xml.i
index 51a68c859..ffb9de24a 100644
--- a/interface-definitions/include/vif-s.xml.i
+++ b/interface-definitions/include/vif-s.xml.i
@@ -8,15 +8,7 @@
   </properties>
   <children>
     #include <include/address-ipv4-ipv6-dhcp.xml.i>
-    <leafNode name="description">
-      <properties>
-        <help>Interface description</help>
-        <constraint>
-          <regex>^.{1,256}$</regex>
-        </constraint>
-        <constraintErrorMessage>Interface description too long (limit 256 characters)</constraintErrorMessage>
-      </properties>
-    </leafNode>
+    #include <include/interface-description.xml.i>
     #include <include/dhcp-dhcpv6-options.xml.i>
     <leafNode name="disable-link-detect">
       <properties>
@@ -85,15 +77,7 @@
       </properties>
       <children>
         #include <include/address-ipv4-ipv6-dhcp.xml.i>
-        <leafNode name="description">
-          <properties>
-            <help>Interface description</help>
-            <constraint>
-              <regex>^.{1,256}$</regex>
-            </constraint>
-            <constraintErrorMessage>Interface description too long (limit 256 characters)</constraintErrorMessage>
-          </properties>
-        </leafNode>
+        #include <include/interface-description.xml.i>
         #include <include/dhcp-dhcpv6-options.xml.i>
         <leafNode name="disable-link-detect">
           <properties>
diff --git a/interface-definitions/include/vif.xml.i b/interface-definitions/include/vif.xml.i
index 0cc3d3dc8..d9b5cfe34 100644
--- a/interface-definitions/include/vif.xml.i
+++ b/interface-definitions/include/vif.xml.i
@@ -12,15 +12,7 @@
   </properties>
   <children>
     #include <include/address-ipv4-ipv6-dhcp.xml.i>
-    <leafNode name="description">
-      <properties>
-        <help>Interface description</help>
-        <constraint>
-          <regex>^.{1,256}$</regex>
-        </constraint>
-        <constraintErrorMessage>Interface description too long (limit 256 characters)</constraintErrorMessage>
-      </properties>
-    </leafNode>
+    #include <include/interface-description.xml.i>
     #include <include/dhcp-dhcpv6-options.xml.i>
     <leafNode name="disable-link-detect">
       <properties>
diff --git a/interface-definitions/interfaces-bonding.xml.in b/interface-definitions/interfaces-bonding.xml.in
index b43e7c489..6a82ddd91 100644
--- a/interface-definitions/interfaces-bonding.xml.in
+++ b/interface-definitions/interfaces-bonding.xml.in
@@ -49,15 +49,7 @@
               </leafNode>
             </children>
           </node>
-          <leafNode name="description">
-            <properties>
-              <help>Interface description</help>
-              <constraint>
-                <regex>^.{1,256}$</regex>
-              </constraint>
-              <constraintErrorMessage>Interface description too long (limit 256 characters)</constraintErrorMessage>
-            </properties>
-          </leafNode>
+          #include <include/interface-description.xml.i>
           #include <include/dhcp-dhcpv6-options.xml.i>
           <leafNode name="disable-link-detect">
             <properties>
diff --git a/interface-definitions/interfaces-bridge.xml.in b/interface-definitions/interfaces-bridge.xml.in
index 154f47686..8bac2f244 100644
--- a/interface-definitions/interfaces-bridge.xml.in
+++ b/interface-definitions/interfaces-bridge.xml.in
@@ -33,15 +33,7 @@
               </constraint>
             </properties>
           </leafNode>
-          <leafNode name="description">
-            <properties>
-              <help>Interface description</help>
-              <constraint>
-                <regex>^.{1,256}$</regex>
-              </constraint>
-              <constraintErrorMessage>Interface description too long (limit 256 characters)</constraintErrorMessage>
-            </properties>
-          </leafNode>
+          #include <include/interface-description.xml.i>
           #include <include/dhcp-dhcpv6-options.xml.i>
           <leafNode name="disable-link-detect">
             <properties>
diff --git a/interface-definitions/interfaces-dummy.xml.in b/interface-definitions/interfaces-dummy.xml.in
index dfbbb8b36..db1afd803 100644
--- a/interface-definitions/interfaces-dummy.xml.in
+++ b/interface-definitions/interfaces-dummy.xml.in
@@ -17,15 +17,7 @@
         </properties>
         <children>
           #include <include/address-ipv4-ipv6.xml.i>
-          <leafNode name="description">
-            <properties>
-              <help>Interface description</help>
-              <constraint>
-                <regex>^.{1,256}$</regex>
-              </constraint>
-              <constraintErrorMessage>Interface description too long (limit 256 characters)</constraintErrorMessage>
-            </properties>
-          </leafNode>
+          #include <include/interface-description.xml.i>
           <leafNode name="disable">
             <properties>
               <help>Disable interface</help>
diff --git a/interface-definitions/interfaces-ethernet.xml.in b/interface-definitions/interfaces-ethernet.xml.in
index 37836dbc0..293c147d8 100644
--- a/interface-definitions/interfaces-ethernet.xml.in
+++ b/interface-definitions/interfaces-ethernet.xml.in
@@ -21,15 +21,7 @@
         </properties>
         <children>
           #include <include/address-ipv4-ipv6-dhcp.xml.i>
-          <leafNode name="description">
-            <properties>
-              <help>Interface description</help>
-              <constraint>
-                <regex>^.{1,256}$</regex>
-              </constraint>
-              <constraintErrorMessage>Interface description too long (limit 256 characters)</constraintErrorMessage>
-            </properties>
-          </leafNode>
+          #include <include/interface-description.xml.i>
           #include <include/dhcp-dhcpv6-options.xml.i>
           <leafNode name="disable-flow-control">
             <properties>
diff --git a/interface-definitions/interfaces-geneve.xml.in b/interface-definitions/interfaces-geneve.xml.in
index 28e3d6aa6..3fbafd2ec 100644
--- a/interface-definitions/interfaces-geneve.xml.in
+++ b/interface-definitions/interfaces-geneve.xml.in
@@ -17,15 +17,7 @@
         </properties>
         <children>
           #include <include/address-ipv4-ipv6.xml.i>
-          <leafNode name="description">
-            <properties>
-              <help>Interface description</help>
-              <constraint>
-                <regex>^.{1,256}$</regex>
-              </constraint>
-              <constraintErrorMessage>Interface description too long (limit 256 characters)</constraintErrorMessage>
-            </properties>
-          </leafNode>
+          #include <include/interface-description.xml.i>
           <leafNode name="disable">
             <properties>
               <help>Disable interface</help>
diff --git a/interface-definitions/interfaces-loopback.xml.in b/interface-definitions/interfaces-loopback.xml.in
index 0f1e4097a..007a0f189 100644
--- a/interface-definitions/interfaces-loopback.xml.in
+++ b/interface-definitions/interfaces-loopback.xml.in
@@ -17,15 +17,7 @@
         </properties>
         <children>
           #include <include/address-ipv4-ipv6.xml.i>
-          <leafNode name="description">
-            <properties>
-              <help>Interface description</help>
-              <constraint>
-                <regex>^.{1,256}$</regex>
-              </constraint>
-              <constraintErrorMessage>Interface description too long (limit 256 characters)</constraintErrorMessage>
-            </properties>
-          </leafNode>
+          #include <include/interface-description.xml.i>
         </children>
       </tagNode>
     </children>
diff --git a/interface-definitions/interfaces-openvpn.xml.in b/interface-definitions/interfaces-openvpn.xml.in
index ca97ad4ec..d08dba78a 100644
--- a/interface-definitions/interfaces-openvpn.xml.in
+++ b/interface-definitions/interfaces-openvpn.xml.in
@@ -33,11 +33,7 @@
               </leafNode>
             </children>
           </node>
-          <leafNode name="description">
-            <properties>
-              <help>Description</help>
-            </properties>
-          </leafNode>
+          #include <include/interface-description.xml.i>
           <leafNode name="device-type">
             <properties>
               <help>OpenVPN interface device-type</help>
diff --git a/interface-definitions/interfaces-vxlan.xml.in b/interface-definitions/interfaces-vxlan.xml.in
index 070bfb87b..9434c2f5a 100644
--- a/interface-definitions/interfaces-vxlan.xml.in
+++ b/interface-definitions/interfaces-vxlan.xml.in
@@ -17,15 +17,7 @@
         </properties>
         <children>
           #include <include/address-ipv4-ipv6.xml.i>
-          <leafNode name="description">
-            <properties>
-              <help>Interface description</help>
-              <constraint>
-                <regex>^.{1,256}$</regex>
-              </constraint>
-              <constraintErrorMessage>Interface description too long (limit 256 characters)</constraintErrorMessage>
-            </properties>
-          </leafNode>
+          #include <include/interface-description.xml.i>
           <leafNode name="disable">
             <properties>
               <help>Disable interface</help>
diff --git a/interface-definitions/interfaces-wireguard.xml.in b/interface-definitions/interfaces-wireguard.xml.in
index b6bc3e6e8..ef0b643bb 100644
--- a/interface-definitions/interfaces-wireguard.xml.in
+++ b/interface-definitions/interfaces-wireguard.xml.in
@@ -18,15 +18,7 @@
         </properties>
         <children>
           #include <include/address-ipv4-ipv6.xml.i>
-          <leafNode name="description">
-            <properties>
-              <help>description</help>
-              <constraint>
-                <regex>^.{1,100}$</regex>
-              </constraint>
-              <constraintErrorMessage>interface description is too long (limit 100 characters)</constraintErrorMessage>
-            </properties>
-          </leafNode>
+          #include <include/interface-description.xml.i>
           <leafNode name="disable">
             <properties>
               <help>disables interface</help>
diff --git a/interface-definitions/interfaces-wireless.xml.in b/interface-definitions/interfaces-wireless.xml.in
index b45774890..65ad14228 100644
--- a/interface-definitions/interfaces-wireless.xml.in
+++ b/interface-definitions/interfaces-wireless.xml.in
@@ -445,15 +445,7 @@
               </constraint>
             </properties>
           </leafNode>
-          <leafNode name="description">
-            <properties>
-              <help>Interface description</help>
-              <constraint>
-                <regex>.{1,256}$</regex>
-              </constraint>
-              <constraintErrorMessage>Interface description too long (limit 256 characters)</constraintErrorMessage>
-            </properties>
-          </leafNode>
+          #include <include/interface-description.xml.i>
           #include <include/dhcp-dhcpv6-options.xml.i>
           <leafNode name="disable-broadcast-ssid">
             <properties>
-- 
cgit v1.2.3