From ee63d76964e3129e372e5c3fd8bc5bf028fc3874 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 18 Apr 2020 11:57:49 +0200
Subject: pppoe-server: T2314: migrate IPv4/IPv6 name-servers to common node

Instead of having "dns-server server-1|server-2" nodes and the same for IPv6
all DNS nameservers are migrated to a common name-servers node.
---
 interface-definitions/service_pppoe-server.xml.in | 121 +++++-----------------
 1 file changed, 27 insertions(+), 94 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/service_pppoe-server.xml.in b/interface-definitions/service_pppoe-server.xml.in
index 39f4093a7..dced54b64 100644
--- a/interface-definitions/service_pppoe-server.xml.in
+++ b/interface-definitions/service_pppoe-server.xml.in
@@ -283,81 +283,24 @@
               </leafNode>
             </children>
           </node>
-          <node name="dns-servers">
+          <leafNode name="name-server">
             <properties>
-              <help>IPv4 Domain Name Service (DNS) server</help>
-            </properties>
-            <children>
-            <leafNode name="server-1">
-              <properties>
-                <help>Primary DNS server</help>
-                <valueHelp>
-                  <format>ipv4</format>
-                  <description>IPv4 address</description>
-                </valueHelp>
-                <constraint>
-                  <validator name="ipv4-address"/>
-                </constraint>
-              </properties>
-            </leafNode>
-            <leafNode name="server-2">
-              <properties>
-                <help>Secondary DNS server</help>
-                <valueHelp>
-                  <format>ipv4</format>
-                  <description>IPv4 address</description>
-                </valueHelp>
-                <constraint>
-                  <validator name="ipv4-address"/>
-                </constraint>
-              </properties>
-            </leafNode>
-            </children>
-          </node>
-           <node name="dnsv6-servers">
-            <properties>
-              <help>IPv6 Domain Name Service (DNS) server</help>
+              <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>
-            <children>
-              <leafNode name="server-1">
-                <properties>
-                  <valueHelp>
-                    <format>ipv6</format>
-                    <description>IPv6 address</description>
-                  </valueHelp>
-                  <help>Primary DNS server</help>
-                  <constraint>
-                    <validator name="ipv6-address"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-              <leafNode name="server-2">
-                <properties>
-                  <valueHelp>
-                    <format>ipv6</format>
-                    <description>IPv6 address</description>
-                  </valueHelp>
-                  <help>Secondary DNS server</help>
-                  <constraint>
-                    <validator name="ipv6-address"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-              <leafNode name="server-3">
-                <properties>
-                  <valueHelp>
-                    <format>ipv6</format>
-                  <description>IPv6 address</description>
-                  </valueHelp>
-                  <help>Tertiary DNS server</help>
-                  <constraint>
-                    <validator name="ipv6-address"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-            </children>
-          </node>
-
+          </leafNode>
           <tagNode name="interface">
             <properties>
               <help>interface(s) to listen on</help>
@@ -439,29 +382,19 @@
               <multi/>
             </properties>
           </leafNode>
-          <node name="wins-servers">
+          <leafNode name="wins-server">
             <properties>
-              <help>Windows Internet Name Service (WINS) server settings</help>
+              <help>Windows Internet Name Service (WINS) servers propagated to client</help>
+              <valueHelp>
+                <format>ipv4</format>
+                <description>Domain Name Server (DNS) IPv4 address</description>
+              </valueHelp>
+              <constraint>
+                <validator name="ipv4-address"/>
+              </constraint>
+              <multi/>
             </properties>
-            <children>
-              <leafNode name="server-1">
-                <properties>
-                  <help>Primary WINS server</help>
-                  <constraint>
-                    <validator name="ipv4-address"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-              <leafNode name="server-2">
-                <properties>
-                  <help>Secondary WINS server</help>
-                  <constraint>
-                    <validator name="ipv4-address"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-            </children>
-          </node>
+          </leafNode>
           <node name="ppp-options">
             <properties>
               <help>Advanced protocol options</help>
-- 
cgit v1.2.3