summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-10-04 12:28:36 +0200
committerChristian Poessinger <christian@poessinger.com>2020-10-04 12:28:36 +0200
commitdd833b361dd773ed461b4db3efe335d9ecfdb479 (patch)
treed9bbf0c38547f7de4043285bfc5daec8ac3a2d1b
parentf4e9248d2a24fc4fd0cdc7089aed0193d7a2884f (diff)
downloadvyos-1x-dd833b361dd773ed461b4db3efe335d9ecfdb479.tar.gz
vyos-1x-dd833b361dd773ed461b4db3efe335d9ecfdb479.zip
l2tp: pptp: sstp: pppoe-server: T2953: use common include for client-ip-pool
-rw-r--r--interface-definitions/include/accel-client-ip-pool-start-stop.xml.i18
-rw-r--r--interface-definitions/include/accel-client-ip-pool-subnet.xml.i (renamed from interface-definitions/include/accel-client-subnet.xml.i)2
-rw-r--r--interface-definitions/service_pppoe-server.xml.in19
-rw-r--r--interface-definitions/vpn_l2tp.xml.in19
-rw-r--r--interface-definitions/vpn_pptp.xml.in17
-rw-r--r--interface-definitions/vpn_sstp.xml.in2
6 files changed, 25 insertions, 52 deletions
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-subnet.xml.i b/interface-definitions/include/accel-client-ip-pool-subnet.xml.i
index e6dd5534c..8e9ca0e92 100644
--- a/interface-definitions/include/accel-client-subnet.xml.i
+++ b/interface-definitions/include/accel-client-ip-pool-subnet.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from accel-client-subnet.xml.i -->
+<!-- included start from accel-client-ip-pool-subnet.xml.i -->
<leafNode name="subnet">
<properties>
<help>Client IP subnet (CIDR notation)</help>
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>