From b588e0784626ca42bf0da84a766213bda725305e Mon Sep 17 00:00:00 2001
From: aapostoliuk <a.apostoliuk@vyos.io>
Date: Fri, 5 Jan 2024 16:18:15 +0200
Subject: T5688: Changed 'range' to multi in 'client-ip-pool' for accell-ppp

Changed node 'range' to multi in 'client-ip-pool' for accell-ppp
services.
Added completionHelp to default-pool and next-pool.
Fixed verification in vpn l2tp config script.

(cherry picked from commit 4ffec67d04670192d9b722353cbaef04cb0ba129)
---
 interface-definitions/include/accel-ppp/client-ip-pool.xml.i | 4 ++++
 interface-definitions/include/accel-ppp/default-pool.xml.i   | 3 +++
 2 files changed, 7 insertions(+)

(limited to 'interface-definitions/include')

diff --git a/interface-definitions/include/accel-ppp/client-ip-pool.xml.i b/interface-definitions/include/accel-ppp/client-ip-pool.xml.i
index 71fe69f8d..b30a5ee01 100644
--- a/interface-definitions/include/accel-ppp/client-ip-pool.xml.i
+++ b/interface-definitions/include/accel-ppp/client-ip-pool.xml.i
@@ -27,11 +27,15 @@
           <validator name="ipv4-host"/>
           <validator name="ipv4-range-mask"  argument="-m 24 -r"/>
         </constraint>
+        <multi/>
       </properties>
     </leafNode>
     <leafNode name="next-pool">
       <properties>
         <help>Next pool name</help>
+        <completionHelp>
+          <path>${COMP_WORDS[@]:1:${#COMP_WORDS[@]}-4}</path>
+        </completionHelp>
         <valueHelp>
           <format>txt</format>
           <description>Name of IP pool</description>
diff --git a/interface-definitions/include/accel-ppp/default-pool.xml.i b/interface-definitions/include/accel-ppp/default-pool.xml.i
index a08b066b1..e06642c37 100644
--- a/interface-definitions/include/accel-ppp/default-pool.xml.i
+++ b/interface-definitions/include/accel-ppp/default-pool.xml.i
@@ -2,6 +2,9 @@
 <leafNode name="default-pool">
   <properties>
     <help>Default client IP pool name</help>
+    <completionHelp>
+      <path>${COMP_WORDS[@]:1:${#COMP_WORDS[@]}-3} client-ip-pool</path>
+    </completionHelp>
     <valueHelp>
       <format>txt</format>
       <description>Default IP pool</description>
-- 
cgit v1.2.3