From 0588c120b8c2041b60e83effe15303af1e1cdbef Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 19 Apr 2020 10:51:34 +0200
Subject: {pppoe,ipoe}-server: T2324: T2314: migrate to common
 accel-name-server XML

---
 .../include/accel-name-server.xml.in                  | 18 ++++++++++++++++++
 interface-definitions/service_ipoe-server.xml.in      | 19 +------------------
 interface-definitions/service_pppoe-server.xml.in     | 19 +------------------
 interface-definitions/vpn_l2tp.xml.in                 | 19 +------------------
 4 files changed, 21 insertions(+), 54 deletions(-)
 create mode 100644 interface-definitions/include/accel-name-server.xml.in

diff --git a/interface-definitions/include/accel-name-server.xml.in b/interface-definitions/include/accel-name-server.xml.in
new file mode 100644
index 000000000..82ed6771d
--- /dev/null
+++ b/interface-definitions/include/accel-name-server.xml.in
@@ -0,0 +1,18 @@
+<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>
diff --git a/interface-definitions/service_ipoe-server.xml.in b/interface-definitions/service_ipoe-server.xml.in
index 52788092f..9ee5d5156 100644
--- a/interface-definitions/service_ipoe-server.xml.in
+++ b/interface-definitions/service_ipoe-server.xml.in
@@ -111,24 +111,7 @@
               </leafNode>
             </children>
           </tagNode>
-          <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 <include/accel-name-server.xml.in>
           #include <include/accel-client-ipv6-pool.xml.in>
           <node name="authentication">
             <properties>
diff --git a/interface-definitions/service_pppoe-server.xml.in b/interface-definitions/service_pppoe-server.xml.in
index edfa321a4..0eff18e5c 100644
--- a/interface-definitions/service_pppoe-server.xml.in
+++ b/interface-definitions/service_pppoe-server.xml.in
@@ -191,24 +191,7 @@
             </children>
           </node>
           #include <include/accel-client-ipv6-pool.xml.in>
-          <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 <include/accel-name-server.xml.in>
           <tagNode name="interface">
             <properties>
               <help>interface(s) to listen on</help>
diff --git a/interface-definitions/vpn_l2tp.xml.in b/interface-definitions/vpn_l2tp.xml.in
index d92817ca0..278f52ba6 100644
--- a/interface-definitions/vpn_l2tp.xml.in
+++ b/interface-definitions/vpn_l2tp.xml.in
@@ -36,24 +36,7 @@
                   </constraint>
                 </properties>
               </leafNode>
-              <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 <include/accel-name-server.xml.in>
               <node name="lns">
                 <properties>
                   <help>L2TP Network Server (LNS)</help>
-- 
cgit v1.2.3