From 809f28f2b95a788d23db006a041955e7167a285d Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Sun, 2 Apr 2023 09:25:35 +0200
Subject: xml: re-use generic-description.xml.i building block whenever
 possible

Remove redundant XML CLI node definitions for the common description node by
referencing the common building block.
---
 interface-definitions/bcast-relay.xml.in        |  6 +-----
 interface-definitions/container.xml.in          |  6 +-----
 interface-definitions/load-balancing-wan.xml.in | 10 +---------
 interface-definitions/nat66.xml.in              | 12 ++----------
 interface-definitions/pki.xml.in                | 12 ++----------
 interface-definitions/service-webproxy.xml.in   | 12 ++----------
 interface-definitions/snmp.xml.in               | 10 +---------
 interface-definitions/vpn-l2tp.xml.in           |  6 +-----
 8 files changed, 11 insertions(+), 63 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/bcast-relay.xml.in b/interface-definitions/bcast-relay.xml.in
index aeaa5ab37..e2993f3f3 100644
--- a/interface-definitions/bcast-relay.xml.in
+++ b/interface-definitions/bcast-relay.xml.in
@@ -34,11 +34,7 @@
                   </constraint>
                 </properties>
               </leafNode>
-              <leafNode name="description">
-                <properties>
-                  <help>Description</help>
-                </properties>
-              </leafNode>
+              #include <include/generic-description.xml.i>
               #include <include/generic-interface-multi.xml.i>
               #include <include/port-number.xml.i>
             </children>
diff --git a/interface-definitions/container.xml.in b/interface-definitions/container.xml.in
index b09536a16..b52054dd0 100644
--- a/interface-definitions/container.xml.in
+++ b/interface-definitions/container.xml.in
@@ -348,11 +348,7 @@
           <constraintErrorMessage>Network name cannot be longer than 11 characters</constraintErrorMessage>
         </properties>
         <children>
-          <leafNode name="description">
-            <properties>
-              <help>Network description</help>
-            </properties>
-          </leafNode>
+          #include <include/generic-description.xml.i>
           <leafNode name="prefix">
             <properties>
               <help>Prefix which allocated to that network</help>
diff --git a/interface-definitions/load-balancing-wan.xml.in b/interface-definitions/load-balancing-wan.xml.in
index 2b812eb4d..c1d7e2c67 100644
--- a/interface-definitions/load-balancing-wan.xml.in
+++ b/interface-definitions/load-balancing-wan.xml.in
@@ -191,15 +191,7 @@
               </constraint>
             </properties>
             <children>
-              <leafNode name="description">
-                <properties>
-                  <help>Description for this rule</help>
-                  <valueHelp>
-                    <format>txt</format>
-                    <description>Description for this rule</description>
-                  </valueHelp>
-                </properties>
-              </leafNode>
+              #include <include/generic-description.xml.i>
               <node name="destination">
                 <properties>
                   <help>Destination</help>
diff --git a/interface-definitions/nat66.xml.in b/interface-definitions/nat66.xml.in
index 6ea611789..7a8970bdf 100644
--- a/interface-definitions/nat66.xml.in
+++ b/interface-definitions/nat66.xml.in
@@ -24,11 +24,7 @@
               <constraintErrorMessage>NAT66 rule number must be between 1 and 999999</constraintErrorMessage>
             </properties>
             <children>
-              <leafNode name="description">
-                <properties>
-                  <help>Rule description</help>
-                </properties>
-              </leafNode>
+              #include <include/generic-description.xml.i>
               <leafNode name="disable">
                 <properties>
                   <help>Disable NAT66 rule</help>
@@ -156,11 +152,7 @@
               <constraintErrorMessage>NAT66 rule number must be between 1 and 999999</constraintErrorMessage>
             </properties>
             <children>
-              <leafNode name="description">
-                <properties>
-                  <help>Rule description</help>
-                </properties>
-              </leafNode>
+              #include <include/generic-description.xml.i>
               <leafNode name="disable">
                 <properties>
                   <help>Disable NAT66 rule</help>
diff --git a/interface-definitions/pki.xml.in b/interface-definitions/pki.xml.in
index c4fde2c78..a13a357fd 100644
--- a/interface-definitions/pki.xml.in
+++ b/interface-definitions/pki.xml.in
@@ -16,11 +16,7 @@
               <help>CA certificate in PEM format</help>
             </properties>
           </leafNode>
-          <leafNode name="description">
-            <properties>
-              <help>Description</help>
-            </properties>
-          </leafNode>
+          #include <include/generic-description.xml.i>
           <node name="private">
             <properties>
               <help>CA private key in PEM format</help>
@@ -63,11 +59,7 @@
               <help>Certificate in PEM format</help>
             </properties>
           </leafNode>
-          <leafNode name="description">
-            <properties>
-              <help>Description</help>
-            </properties>
-          </leafNode>
+          #include <include/generic-description.xml.i>
           <node name="private">
             <properties>
               <help>Certificate private key</help>
diff --git a/interface-definitions/service-webproxy.xml.in b/interface-definitions/service-webproxy.xml.in
index a315aa2ef..b24997816 100644
--- a/interface-definitions/service-webproxy.xml.in
+++ b/interface-definitions/service-webproxy.xml.in
@@ -538,11 +538,7 @@
                           <multi/>
                         </properties>
                       </leafNode>
-                      <leafNode name="description">
-                        <properties>
-                          <help>Description for source-group</help>
-                        </properties>
-                      </leafNode>
+                      #include <include/generic-description.xml.i>
                       <leafNode name="domain">
                         <properties>
                           <help>Domain for source-group</help>
@@ -644,11 +640,7 @@
                           </leafNode>
                         </children>
                       </tagNode>
-                      <leafNode name="description">
-                        <properties>
-                          <help>Time-period description</help>
-                        </properties>
-                      </leafNode>
+                      #include <include/generic-description.xml.i>
                     </children>
                   </tagNode>
                 </children>
diff --git a/interface-definitions/snmp.xml.in b/interface-definitions/snmp.xml.in
index 592db7f4e..559e09388 100644
--- a/interface-definitions/snmp.xml.in
+++ b/interface-definitions/snmp.xml.in
@@ -78,15 +78,7 @@
               <constraintErrorMessage>Contact information is limited to 255 characters or less</constraintErrorMessage>
             </properties>
           </leafNode>
-          <leafNode name="description">
-            <properties>
-              <help>Description information</help>
-              <constraint>
-                <regex>.{1,255}</regex>
-              </constraint>
-              <constraintErrorMessage>Description is limited to 255 characters or less</constraintErrorMessage>
-            </properties>
-          </leafNode>
+          #include <include/generic-description.xml.i>
           <tagNode name="listen-address">
             <properties>
               <help>IP address to listen for incoming SNMP requests</help>
diff --git a/interface-definitions/vpn-l2tp.xml.in b/interface-definitions/vpn-l2tp.xml.in
index 0a92017bd..6b64c5f5d 100644
--- a/interface-definitions/vpn-l2tp.xml.in
+++ b/interface-definitions/vpn-l2tp.xml.in
@@ -124,11 +124,7 @@
                 </children>
               </node>
               #include <include/accel-ppp/client-ipv6-pool.xml.i>
-              <leafNode name="description">
-                <properties>
-                  <help>Description for L2TP remote-access settings</help>
-                </properties>
-              </leafNode>
+              #include <include/generic-description.xml.i>
               #include <include/dhcp-interface.xml.i>
               <leafNode name="idle">
                 <properties>
-- 
cgit v1.2.3