From 53d82ea2b1427ac4668cc1b38544219eae960b86 Mon Sep 17 00:00:00 2001
From: Viacheslav Hletenko <v.gletenko@vyos.io>
Date: Tue, 7 Feb 2023 08:45:38 +0000
Subject: T4971: PPPoE server add named ip pool and attr Framed-Pool

Add a new feature to allow to use named pools
Also it can be used with RADIUS attribute 'Framed-Pool'

set service pppoe-server client-ip-pool name POOL1 gateway-address '192.0.2.1'
set service pppoe-server client-ip-pool name POOL1 subnet '192.0.2.0/24'
---
 .../include/accel-ppp/client-ip-pool-name.xml.i        | 18 ++++++++++++++++++
 interface-definitions/service-ipoe-server.xml.in       | 17 +----------------
 interface-definitions/service-pppoe-server.xml.in      |  1 +
 3 files changed, 20 insertions(+), 16 deletions(-)
 create mode 100644 interface-definitions/include/accel-ppp/client-ip-pool-name.xml.i

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/accel-ppp/client-ip-pool-name.xml.i b/interface-definitions/include/accel-ppp/client-ip-pool-name.xml.i
new file mode 100644
index 000000000..654b6727e
--- /dev/null
+++ b/interface-definitions/include/accel-ppp/client-ip-pool-name.xml.i
@@ -0,0 +1,18 @@
+<!-- include start from accel-ppp/client-ip-pool-name.xml.i -->
+<tagNode name="name">
+  <properties>
+    <help>Pool name</help>
+    <valueHelp>
+      <format>txt</format>
+      <description>Name of IP pool</description>
+    </valueHelp>
+    <constraint>
+      <regex>[-_a-zA-Z0-9.]+</regex>
+    </constraint>
+  </properties>
+  <children>
+    #include <include/accel-ppp/gateway-address.xml.i>
+    #include <include/accel-ppp/client-ip-pool-subnet-single.xml.i>
+  </children>
+</tagNode>
+<!-- include end -->
diff --git a/interface-definitions/service-ipoe-server.xml.in b/interface-definitions/service-ipoe-server.xml.in
index d778f9de0..ca4929249 100644
--- a/interface-definitions/service-ipoe-server.xml.in
+++ b/interface-definitions/service-ipoe-server.xml.in
@@ -108,22 +108,7 @@
               <help>Client IP pools and gateway setting</help>
             </properties>
             <children>
-              <tagNode name="name">
-                <properties>
-                  <help>Pool name</help>
-                  <valueHelp>
-                    <format>txt</format>
-                    <description>Name of IP pool</description>
-                  </valueHelp>
-                  <constraint>
-                    <regex>[-_a-zA-Z0-9.]+</regex>
-                  </constraint>
-                </properties>
-                <children>
-                  #include <include/accel-ppp/gateway-address.xml.i>
-                  #include <include/accel-ppp/client-ip-pool-subnet-single.xml.i>
-                </children>
-              </tagNode>
+              #include <include/accel-ppp/client-ip-pool-name.xml.i>
             </children>
           </node>
           #include <include/accel-ppp/client-ipv6-pool.xml.i>
diff --git a/interface-definitions/service-pppoe-server.xml.in b/interface-definitions/service-pppoe-server.xml.in
index 68592b96b..7cec7fe30 100644
--- a/interface-definitions/service-pppoe-server.xml.in
+++ b/interface-definitions/service-pppoe-server.xml.in
@@ -56,6 +56,7 @@
             <children>
               #include <include/accel-ppp/client-ip-pool-start-stop.xml.i>
               #include <include/accel-ppp/client-ip-pool-subnet.xml.i>
+              #include <include/accel-ppp/client-ip-pool-name.xml.i>
             </children>
           </node>
           #include <include/accel-ppp/client-ipv6-pool.xml.i>
-- 
cgit v1.2.3