From 05df2a5f021f0c7aab7c06db645d210858b6e98d Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 17 Sep 2022 22:28:34 +0200
Subject: ipoe: T4678: T4703: rewrite to get_config_dict()

In addition to the rewrite to make use of get_config_dict() the CLI is
slightly adjusted as specified in T4703.

* Rename vlan-id and vlan-range to simply vlan
* Rename network-mode to simply mode
* Re-use existing common Jinja2 template for Accel-PPP which are shared
  with PPPoE and SSTP server.
* Retrieve default values via defaultValue XML node
---
 .../include/accel-ppp/client-ipv6-pool.xml.i       | 26 +++++++++++-----------
 interface-definitions/include/accel-ppp/vlan.xml.i |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'interface-definitions/include')

diff --git a/interface-definitions/include/accel-ppp/client-ipv6-pool.xml.i b/interface-definitions/include/accel-ppp/client-ipv6-pool.xml.i
index 01cf0e040..774741a5e 100644
--- a/interface-definitions/include/accel-ppp/client-ipv6-pool.xml.i
+++ b/interface-definitions/include/accel-ppp/client-ipv6-pool.xml.i
@@ -16,19 +16,19 @@
         </constraint>
       </properties>
       <children>
-          <leafNode name="mask">
-            <properties>
-              <help>Prefix length used for individual client</help>
-              <valueHelp>
-                <format>u32:48-128</format>
-                <description>Client prefix length</description>
-              </valueHelp>
-              <constraint>
-                <validator name="numeric" argument="--range 48-128"/>
-              </constraint>
-            </properties>
-            <defaultValue>64</defaultValue>
-          </leafNode>
+        <leafNode name="mask">
+          <properties>
+            <help>Prefix length used for individual client</help>
+            <valueHelp>
+              <format>u32:48-128</format>
+              <description>Client prefix length</description>
+            </valueHelp>
+            <constraint>
+              <validator name="numeric" argument="--range 48-128"/>
+            </constraint>
+          </properties>
+          <defaultValue>64</defaultValue>
+        </leafNode>
       </children>
     </tagNode>
     <tagNode name="delegate">
diff --git a/interface-definitions/include/accel-ppp/vlan.xml.i b/interface-definitions/include/accel-ppp/vlan.xml.i
index 7df711d4b..9a00df214 100644
--- a/interface-definitions/include/accel-ppp/vlan.xml.i
+++ b/interface-definitions/include/accel-ppp/vlan.xml.i
@@ -4,7 +4,7 @@
     <help>VLAN monitor for automatic creation of VLAN interfaces</help>
     <valueHelp>
       <format>u32:1-4094</format>
-      <description>VLAN for automatic creation </description>
+      <description>VLAN for automatic creation</description>
     </valueHelp>
     <valueHelp>
       <format>start-end</format>
-- 
cgit v1.2.3