From e2f9f4f4e8b2e961a58d935d09798ddb4e1e0460 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 18 Sep 2021 21:48:53 +0200
Subject: dhcp-server: T3838: rename dns-server to name-server node

IPv4 DHCP uses "dns-server" to specify one or more name-servers for a given
pool. In order to use the same CLI syntax this should be renamed to name-server,
which is already the case for DHCPv6.
---
 .../include/accel-ppp/name-server.xml.i              | 20 --------------------
 .../include/name-server-ipv4-ipv6.xml.i              | 20 ++++++++++++++++++++
 interface-definitions/include/name-server-ipv4.xml.i | 15 +++++++++++++++
 interface-definitions/include/name-server-ipv6.xml.i | 15 +++++++++++++++
 4 files changed, 50 insertions(+), 20 deletions(-)
 delete mode 100644 interface-definitions/include/accel-ppp/name-server.xml.i
 create mode 100644 interface-definitions/include/name-server-ipv4-ipv6.xml.i
 create mode 100644 interface-definitions/include/name-server-ipv4.xml.i
 create mode 100644 interface-definitions/include/name-server-ipv6.xml.i

(limited to 'interface-definitions/include')

diff --git a/interface-definitions/include/accel-ppp/name-server.xml.i b/interface-definitions/include/accel-ppp/name-server.xml.i
deleted file mode 100644
index e744b384f..000000000
--- a/interface-definitions/include/accel-ppp/name-server.xml.i
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- include start from accel-ppp/name-server.xml.i -->
-<leafNode name="name-server">
-  <properties>
-    <help>Domain Name Server (DNS) propagated to client</help>
-    <valueHelp>
-      <format>ipv4</format>
-      <description>Domain Name Server (DNS) IPv4 address</description>
-    </valueHelp>
-    <valueHelp>
-      <format>ipv6</format>
-      <description>Domain Name Server (DNS) IPv6 address</description>
-    </valueHelp>
-    <constraint>
-      <validator name="ipv4-address"/>
-      <validator name="ipv6-address"/>
-    </constraint>
-    <multi/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/name-server-ipv4-ipv6.xml.i b/interface-definitions/include/name-server-ipv4-ipv6.xml.i
new file mode 100644
index 000000000..14973234b
--- /dev/null
+++ b/interface-definitions/include/name-server-ipv4-ipv6.xml.i
@@ -0,0 +1,20 @@
+<!-- include start from name-server-ipv4-ipv6.xml.i -->
+<leafNode name="name-server">
+  <properties>
+    <help>Domain Name Servers (DNS) addresses</help>
+    <valueHelp>
+      <format>ipv4</format>
+      <description>Domain Name Server (DNS) IPv4 address</description>
+    </valueHelp>
+    <valueHelp>
+      <format>ipv6</format>
+      <description>Domain Name Server (DNS) IPv6 address</description>
+    </valueHelp>
+    <constraint>
+      <validator name="ipv4-address"/>
+      <validator name="ipv6-address"/>
+    </constraint>
+    <multi/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/name-server-ipv4.xml.i b/interface-definitions/include/name-server-ipv4.xml.i
new file mode 100644
index 000000000..0cf884e03
--- /dev/null
+++ b/interface-definitions/include/name-server-ipv4.xml.i
@@ -0,0 +1,15 @@
+<!-- include start from name-server-ipv4.xml.i -->
+<leafNode name="name-server">
+  <properties>
+    <help>Domain Name Servers (DNS) addresses</help>
+    <valueHelp>
+      <format>ipv4</format>
+      <description>Domain Name Server (DNS) IPv4 address</description>
+    </valueHelp>
+    <constraint>
+      <validator name="ipv4-address"/>
+    </constraint>
+    <multi/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/name-server-ipv6.xml.i b/interface-definitions/include/name-server-ipv6.xml.i
new file mode 100644
index 000000000..d4517c4c6
--- /dev/null
+++ b/interface-definitions/include/name-server-ipv6.xml.i
@@ -0,0 +1,15 @@
+<!-- include start from name-server-ipv6.xml.i -->
+<leafNode name="name-server">
+  <properties>
+    <help>Domain Name Servers (DNS) addresses</help>
+    <valueHelp>
+      <format>ipv6</format>
+      <description>Domain Name Server (DNS) IPv6 address</description>
+    </valueHelp>
+    <constraint>
+      <validator name="ipv6-address"/>
+    </constraint>
+    <multi/>
+  </properties>
+</leafNode>
+<!-- include end -->
-- 
cgit v1.2.3