From bc71e8dcfbe0ae8b27c13dbb3ce8358726ef9585 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 19 Sep 2021 11:31:01 +0200
Subject: xml: dhcp-server: move building blocks to dhcp subdirectory

(cherry picked from commit 59e5b5eb4c0507f9d3831483152a748b58560bfd)
---
 interface-definitions/dhcp-server.xml.in                     | 10 +++++-----
 interface-definitions/dhcpv6-server.xml.in                   |  4 ++--
 interface-definitions/include/dhcp-domain-name.xml.i         | 11 -----------
 interface-definitions/include/dhcp-ping-check.xml.i          |  8 --------
 .../include/dhcp-server-domain-search.xml.i                  | 12 ------------
 interface-definitions/include/dhcp/domain-name.xml.i         | 11 +++++++++++
 interface-definitions/include/dhcp/domain-search.xml.i       | 12 ++++++++++++
 interface-definitions/include/dhcp/ping-check.xml.i          |  8 ++++++++
 interface-definitions/include/generic-description.xml.i      | 11 +++++++++++
 9 files changed, 49 insertions(+), 38 deletions(-)
 delete mode 100644 interface-definitions/include/dhcp-domain-name.xml.i
 delete mode 100644 interface-definitions/include/dhcp-ping-check.xml.i
 delete mode 100644 interface-definitions/include/dhcp-server-domain-search.xml.i
 create mode 100644 interface-definitions/include/dhcp/domain-name.xml.i
 create mode 100644 interface-definitions/include/dhcp/domain-search.xml.i
 create mode 100644 interface-definitions/include/dhcp/ping-check.xml.i
 create mode 100644 interface-definitions/include/generic-description.xml.i

diff --git a/interface-definitions/dhcp-server.xml.in b/interface-definitions/dhcp-server.xml.in
index 3a2c05698..2707ce96d 100644
--- a/interface-definitions/dhcp-server.xml.in
+++ b/interface-definitions/dhcp-server.xml.in
@@ -102,8 +102,8 @@
                   <valueless/>
                 </properties>
               </leafNode>
-              #include <include/dhcp-ping-check.xml.i>
-              #include <include/dhcp-domain-name.xml.i>
+              #include <include/dhcp/domain-name.xml.i>
+              #include <include/dhcp/ping-check.xml.i>
               #include <include/name-server-ipv4.xml.i>
               #include <include/generic-description.xml.i>
               #include <include/generic-disable-node.xml.i>
@@ -166,8 +166,8 @@
                     </properties>
                   </leafNode>
                   #include <include/name-server-ipv4.xml.i>
-                  #include <include/dhcp-domain-name.xml.i>
-                  #include <include/dhcp-server-domain-search.xml.i>
+                  #include <include/dhcp/domain-name.xml.i>
+                  #include <include/dhcp/domain-search.xml.i>
                   <leafNode name="enable-failover">
                     <properties>
                       <help>Enable DHCP failover support for this subnet</help>
@@ -220,7 +220,7 @@
                       <multi/>
                     </properties>
                   </leafNode>
-                  #include <include/dhcp-ping-check.xml.i>
+                  #include <include/dhcp/ping-check.xml.i>
                   <leafNode name="pop-server">
                     <properties>
                       <help>IP address of POP3 server</help>
diff --git a/interface-definitions/dhcpv6-server.xml.in b/interface-definitions/dhcpv6-server.xml.in
index 18aa53fb8..fb96571f5 100644
--- a/interface-definitions/dhcpv6-server.xml.in
+++ b/interface-definitions/dhcpv6-server.xml.in
@@ -58,7 +58,7 @@
                       </constraint>
                     </properties>
                   </leafNode>
-                  #include <include/dhcp-server-domain-search.xml.i>
+                  #include <include/dhcp/domain-search.xml.i>
                   #include <include/name-server-ipv6.xml.i>
                 </children>
               </node>
@@ -127,7 +127,7 @@
                       </tagNode>
                     </children>
                   </node>
-                  #include <include/dhcp-server-domain-search.xml.i>
+                  #include <include/dhcp/domain-search.xml.i>
                   <node name="lease-time">
                     <properties>
                       <help>Parameters relating to the lease time</help>
diff --git a/interface-definitions/include/dhcp-domain-name.xml.i b/interface-definitions/include/dhcp-domain-name.xml.i
deleted file mode 100644
index eb95596da..000000000
--- a/interface-definitions/include/dhcp-domain-name.xml.i
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- include start from dhcp-domain-name.xml.i -->
-<leafNode name="domain-name">
-  <properties>
-    <help>Client Domain Name</help>
-    <constraint>
-      <validator name="fqdn"/>
-    </constraint>
-    <constraintErrorMessage>Invalid domain name (RFC 1123 section 2).\nMay only contain letters, numbers and .-_</constraintErrorMessage>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/dhcp-ping-check.xml.i b/interface-definitions/include/dhcp-ping-check.xml.i
deleted file mode 100644
index 0b2a1214a..000000000
--- a/interface-definitions/include/dhcp-ping-check.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from dhcp-ping-check.xml.i -->
-<leafNode name="ping-check">
-  <properties>
-    <help>Sends ICMP Echo request to the address being assigned</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/dhcp-server-domain-search.xml.i b/interface-definitions/include/dhcp-server-domain-search.xml.i
deleted file mode 100644
index 4fc55097b..000000000
--- a/interface-definitions/include/dhcp-server-domain-search.xml.i
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- include start from dhcp-server-domain-search.xml.i -->
-<leafNode name="domain-search">
-  <properties>
-    <help>Client Domain Name search list</help>
-    <constraint>
-      <validator name="fqdn"/>
-    </constraint>
-     <constraintErrorMessage>Invalid domain name (RFC 1123 section 2).\nMay only contain letters, numbers, period, and underscore.</constraintErrorMessage>
-    <multi/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/dhcp/domain-name.xml.i b/interface-definitions/include/dhcp/domain-name.xml.i
new file mode 100644
index 000000000..410e27d29
--- /dev/null
+++ b/interface-definitions/include/dhcp/domain-name.xml.i
@@ -0,0 +1,11 @@
+<!-- include start from dhcp/domain-name.xml.i -->
+<leafNode name="domain-name">
+  <properties>
+    <help>Client Domain Name</help>
+    <constraint>
+      <validator name="fqdn"/>
+    </constraint>
+    <constraintErrorMessage>Invalid domain name (RFC 1123 section 2).\nMay only contain letters, numbers and .-_</constraintErrorMessage>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/dhcp/domain-search.xml.i b/interface-definitions/include/dhcp/domain-search.xml.i
new file mode 100644
index 000000000..bcc8fcd12
--- /dev/null
+++ b/interface-definitions/include/dhcp/domain-search.xml.i
@@ -0,0 +1,12 @@
+<!-- include start from dhcp/domain-search.xml.i -->
+<leafNode name="domain-search">
+  <properties>
+    <help>Client Domain Name search list</help>
+    <constraint>
+      <validator name="fqdn"/>
+    </constraint>
+     <constraintErrorMessage>Invalid domain name (RFC 1123 section 2).\nMay only contain letters, numbers, period, and underscore.</constraintErrorMessage>
+    <multi/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/dhcp/ping-check.xml.i b/interface-definitions/include/dhcp/ping-check.xml.i
new file mode 100644
index 000000000..a506f68e4
--- /dev/null
+++ b/interface-definitions/include/dhcp/ping-check.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from dhcp/ping-check.xml.i -->
+<leafNode name="ping-check">
+  <properties>
+    <help>Sends ICMP Echo request to the address being assigned</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/generic-description.xml.i b/interface-definitions/include/generic-description.xml.i
new file mode 100644
index 000000000..03fc564e6
--- /dev/null
+++ b/interface-definitions/include/generic-description.xml.i
@@ -0,0 +1,11 @@
+<!-- include start from generic-description.xml.i -->
+<leafNode name="description">
+  <properties>
+    <help>Description</help>
+    <valueHelp>
+      <format>txt</format>
+      <description>Description</description>
+    </valueHelp>
+  </properties>
+</leafNode>
+<!-- include end -->
-- 
cgit v1.2.3