From 6a2e75dbe4003c6987c6932296e68c486ff7b380 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 10 Apr 2020 19:32:24 +0200
Subject: vpn: l2tp: T2264: combine IPv4/IPv6 name-server CLI syntax

There is no reason to distinguish between an IPv4 and IPv6 name-server node
on the CLI - this can be done in the underlaying Python scripts.
---
 interface-definitions/vpn-l2tp.xml.in | 46 ++++++++---------------------------
 1 file changed, 10 insertions(+), 36 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/vpn-l2tp.xml.in b/interface-definitions/vpn-l2tp.xml.in
index dcbb5f3ed..0bd592746 100644
--- a/interface-definitions/vpn-l2tp.xml.in
+++ b/interface-definitions/vpn-l2tp.xml.in
@@ -36,48 +36,22 @@
                   </constraint>
                 </properties>
               </leafNode>
-              <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>
-              <leafNode name="dnsv6-servers">
-                <properties>
-                  <help>IPv6 Domain Name Service (DNS) server</help>
+                  <help>Domain Name Server (DNS) propagated to client</help>
                   <valueHelp>
-                  <format>ipv6</format>
-                    <description>IPv6 DNS address</description>
+                    <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 />
+                  <multi/>
                 </properties>
               </leafNode>
               <node name="lns">
-- 
cgit v1.2.3