From dd833b361dd773ed461b4db3efe335d9ecfdb479 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 4 Oct 2020 12:28:36 +0200
Subject: l2tp: pptp: sstp: pppoe-server: T2953: use common include for
 client-ip-pool

---
 .../include/accel-client-ip-pool-start-stop.xml.i     | 18 ++++++++++++++++++
 .../include/accel-client-ip-pool-subnet.xml.i         | 16 ++++++++++++++++
 .../include/accel-client-subnet.xml.i                 | 16 ----------------
 interface-definitions/service_pppoe-server.xml.in     | 19 ++-----------------
 interface-definitions/vpn_l2tp.xml.in                 | 19 ++-----------------
 interface-definitions/vpn_pptp.xml.in                 | 17 +----------------
 interface-definitions/vpn_sstp.xml.in                 |  2 +-
 7 files changed, 40 insertions(+), 67 deletions(-)
 create mode 100644 interface-definitions/include/accel-client-ip-pool-start-stop.xml.i
 create mode 100644 interface-definitions/include/accel-client-ip-pool-subnet.xml.i
 delete mode 100644 interface-definitions/include/accel-client-subnet.xml.i

diff --git a/interface-definitions/include/accel-client-ip-pool-start-stop.xml.i b/interface-definitions/include/accel-client-ip-pool-start-stop.xml.i
new file mode 100644
index 000000000..a92c315f1
--- /dev/null
+++ b/interface-definitions/include/accel-client-ip-pool-start-stop.xml.i
@@ -0,0 +1,18 @@
+<!-- included start from accel-client-ip-pool-start-stop.xml.i -->
+<leafNode name="start">
+  <properties>
+    <help>First IP address in the pool</help>
+    <constraint>
+      <validator name="ipv4-address"/>
+    </constraint>
+  </properties>
+</leafNode>
+<leafNode name="stop">
+  <properties>
+    <help>Last IP address in the pool</help>
+    <constraint>
+      <validator name="ipv4-address"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/accel-client-ip-pool-subnet.xml.i b/interface-definitions/include/accel-client-ip-pool-subnet.xml.i
new file mode 100644
index 000000000..8e9ca0e92
--- /dev/null
+++ b/interface-definitions/include/accel-client-ip-pool-subnet.xml.i
@@ -0,0 +1,16 @@
+<!-- included start from accel-client-ip-pool-subnet.xml.i -->
+<leafNode name="subnet">
+  <properties>
+    <help>Client IP subnet (CIDR notation)</help>
+    <valueHelp>
+      <format>ipv4net</format>
+      <description>IPv4 address and prefix length</description>
+    </valueHelp>
+    <constraint>
+      <validator name="ipv4-prefix"/>
+    </constraint>
+    <constraintErrorMessage>Not a valid CIDR formatted prefix</constraintErrorMessage>
+    <multi />
+  </properties>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/accel-client-subnet.xml.i b/interface-definitions/include/accel-client-subnet.xml.i
deleted file mode 100644
index e6dd5534c..000000000
--- a/interface-definitions/include/accel-client-subnet.xml.i
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- included start from accel-client-subnet.xml.i -->
-<leafNode name="subnet">
-  <properties>
-    <help>Client IP subnet (CIDR notation)</help>
-    <valueHelp>
-      <format>ipv4net</format>
-      <description>IPv4 address and prefix length</description>
-    </valueHelp>
-    <constraint>
-      <validator name="ipv4-prefix"/>
-    </constraint>
-    <constraintErrorMessage>Not a valid CIDR formatted prefix</constraintErrorMessage>
-    <multi />
-  </properties>
-</leafNode>
-<!-- included end -->
diff --git a/interface-definitions/service_pppoe-server.xml.in b/interface-definitions/service_pppoe-server.xml.in
index 78bbda089..c6a3c18a6 100644
--- a/interface-definitions/service_pppoe-server.xml.in
+++ b/interface-definitions/service_pppoe-server.xml.in
@@ -60,23 +60,8 @@
               <help>Pool of client IP addresses (must be within a /24)</help>
             </properties>
             <children>
-              <leafNode name="start">
-                <properties>
-                  <help>First IP address in the pool</help>
-                  <constraint>
-                    <validator name="ipv4-address"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-              <leafNode name="stop">
-                <properties>
-                  <help>Last IP address in the pool</help>
-                  <constraint>
-                    <validator name="ipv4-address"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-              #include <include/accel-client-subnet.xml.i>
+              #include <include/accel-client-ip-pool-start-stop.xml.i>
+              #include <include/accel-client-ip-pool-subnet.xml.i>
             </children>
           </node>
           #include <include/accel-client-ipv6-pool.xml.i>
diff --git a/interface-definitions/vpn_l2tp.xml.in b/interface-definitions/vpn_l2tp.xml.in
index d7ad9777f..dcac92326 100644
--- a/interface-definitions/vpn_l2tp.xml.in
+++ b/interface-definitions/vpn_l2tp.xml.in
@@ -164,23 +164,8 @@
                   <help>Pool of client IP addresses (must be within a /24)</help>
                 </properties>
                 <children>
-                  <leafNode name="start">
-                    <properties>
-                      <help>First IP address in the pool (will be used as gateway address)</help>
-                      <constraint>
-                        <validator name="ipv4-address"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="stop">
-                    <properties>
-                      <help>Last IP address in the pool</help>
-                      <constraint>
-                        <validator name="ipv4-address"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                  #include <include/accel-client-subnet.xml.i>
+                  #include <include/accel-client-ip-pool-start-stop.xml.i>
+                  #include <include/accel-client-ip-pool-subnet.xml.i>
                 </children>
               </node>
               #include <include/accel-client-ipv6-pool.xml.i>
diff --git a/interface-definitions/vpn_pptp.xml.in b/interface-definitions/vpn_pptp.xml.in
index 83e71347b..466fbf36d 100644
--- a/interface-definitions/vpn_pptp.xml.in
+++ b/interface-definitions/vpn_pptp.xml.in
@@ -47,22 +47,7 @@
                   <help>Pool of client IP addresses (must be within a /24)</help>
                 </properties>
                 <children>
-                  <leafNode name="start">
-                    <properties>
-                      <help>First IP address in the pool (will be used as gateway address)</help>
-                      <constraint>
-                        <validator name="ipv4-address"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="stop">
-                    <properties>
-                      <help>Last IP address in the pool</help>
-                      <constraint>
-                        <validator name="ipv4-address"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
+                  #include <include/accel-client-ip-pool-start-stop.xml.i>
                 </children>
               </node>
               #include <include/accel-gateway-address.xml.i>
diff --git a/interface-definitions/vpn_sstp.xml.in b/interface-definitions/vpn_sstp.xml.in
index 38c8c0fb8..77b1c1ec1 100644
--- a/interface-definitions/vpn_sstp.xml.in
+++ b/interface-definitions/vpn_sstp.xml.in
@@ -33,7 +33,7 @@
               <help>Client IP pools and gateway setting</help>
             </properties>
             <children>
-              #include <include/accel-client-subnet.xml.i>
+              #include <include/accel-client-ip-pool-subnet.xml.i>
             </children>
           </node>
           #include <include/accel-client-ipv6-pool.xml.i>
-- 
cgit v1.2.3