From e7e81746e6ad01ce644cd7b584233464f91d9380 Mon Sep 17 00:00:00 2001
From: Viacheslav Hletenko <v.gletenko@vyos.io>
Date: Sun, 12 Feb 2023 18:34:49 +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'
---
 interface-definitions/service_ipoe-server.xml.in  | 14 +-------------
 interface-definitions/service_pppoe-server.xml.in |  1 +
 2 files changed, 2 insertions(+), 13 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/service_ipoe-server.xml.in b/interface-definitions/service_ipoe-server.xml.in
index b9279793c..d81ec99f9 100644
--- a/interface-definitions/service_ipoe-server.xml.in
+++ b/interface-definitions/service_ipoe-server.xml.in
@@ -117,19 +117,7 @@
               <help>Client IP pools and gateway setting</help>
             </properties>
             <children>
-              <tagNode name="name">
-                <properties>
-                  <help>Pool name</help>
-                  <constraint>
-                    <regex>[-_a-zA-Z0-9]+</regex>
-                  </constraint>
-                  <constraintErrorMessage>Client IP pool is limited to alphanumerical characters and can contain hyphen and underscores</constraintErrorMessage>
-                </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 ba053ea75..a00125752 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