From f7b1017559f4a511b116a5acd4705a15caf97865 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 5 Sep 2021 17:56:28 +0200
Subject: name-server: T3804: merge "system name-servers-dhcp" into "system
 name-server"

We have "set system name-server <ipv4|ipv6>" to specify a name-server IP
address we wan't to use. We also have "set system name-servers-dhcp <interface>"
which does the same, but the name-server in question is retrieved via DHCP.

Both CLI nodes are combined under "set system name-server <ipv4|ipv6|interface>"
to keep things as they are in real life - we need a name-server.

(cherry picked from commit 2ecf7a9f9cbe9359457bd23b4a0c45f3763123c7)
---
 interface-definitions/dns-domain-name.xml.in | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/dns-domain-name.xml.in b/interface-definitions/dns-domain-name.xml.in
index ff632e1d1..2b1644609 100644
--- a/interface-definitions/dns-domain-name.xml.in
+++ b/interface-definitions/dns-domain-name.xml.in
@@ -1,37 +1,34 @@
 <?xml version="1.0"?>
-<!-- host-name configuration -->
 <interfaceDefinition>
   <node name="system">
     <children>
       <leafNode name="name-server" owner="${vyos_conf_scripts_dir}/host_name.py">
         <properties>
-          <help>Domain Name Servers (DNS) used by the system (resolv.conf)</help>
+          <help>System Domain Name Servers (DNS)</help>
           <priority>400</priority>
+          <completionHelp>
+            <script>${vyos_completion_dir}/list_interfaces.py</script>
+          </completionHelp>
           <valueHelp>
             <format>ipv4</format>
-            <description>Domain Name Server (DNS) address</description>
+            <description>Domain Name Server IPv4 address</description>
           </valueHelp>
           <valueHelp>
             <format>ipv6</format>
-            <description>Domain Name Server (DNS) address</description>
+            <description>Domain Name Server IPv6 address</description>
+          </valueHelp>
+          <valueHelp>
+            <format>txt</format>
+            <description>Use Domain Name Server from DHCP interface</description>
           </valueHelp>
           <multi/>
           <constraint>
             <validator name="ipv4-address"/>
             <validator name="ipv6-address"/>
+            <validator name="interface-name"/>
           </constraint>
         </properties>
       </leafNode>
-      <leafNode name="name-servers-dhcp" owner="${vyos_conf_scripts_dir}/host_name.py">
-        <properties>
-          <help>Interfaces whose DHCP client nameservers will be used by the system (resolv.conf)</help>
-          <priority>400</priority>
-          <completionHelp>
-            <script>${vyos_completion_dir}/list_interfaces.py</script>
-          </completionHelp>
-          <multi/>
-        </properties>
-      </leafNode>
       <leafNode name="host-name" owner="${vyos_conf_scripts_dir}/host_name.py">
         <properties>
           <help>System host name (default: vyos)</help>
-- 
cgit v1.2.3