From 38ae3032180a3d49253237232a0e3de8d2836e7c Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 29 Sep 2020 20:43:08 +0200
Subject: pppoe-server: T2936: move to get_config_dict()

For easier configuration read in (CLI) validation and also template rendering
it makes sense to drop the old, single implementation and move to the new,
generic get_config_dict() approach.

Recurring configuration parts like ip-pool, ipv6-pool and nameservers have
also been split our into individual templates which will be included through
Jinja2 - leading to a single-source of the template sections, too.
---
 .../include/accel-auth-mode.xml.i                  |  1 +
 .../include/accel-radius-additions.xml.i           |  8 ++++-
 interface-definitions/include/radius-server.xml.i  |  1 +
 interface-definitions/service_pppoe-server.xml.in  | 37 ++++++++++++++++------
 4 files changed, 37 insertions(+), 10 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/accel-auth-mode.xml.i b/interface-definitions/include/accel-auth-mode.xml.i
index e719112db..750c3117b 100644
--- a/interface-definitions/include/accel-auth-mode.xml.i
+++ b/interface-definitions/include/accel-auth-mode.xml.i
@@ -16,4 +16,5 @@
       <list>local radius</list>
     </completionHelp>
   </properties>
+  <defaultValue>local</defaultValue>
 </leafNode>
diff --git a/interface-definitions/include/accel-radius-additions.xml.i b/interface-definitions/include/accel-radius-additions.xml.i
index f4db51b97..43810625a 100644
--- a/interface-definitions/include/accel-radius-additions.xml.i
+++ b/interface-definitions/include/accel-radius-additions.xml.i
@@ -26,6 +26,7 @@
               <validator name="numeric" argument="--range 1-65535"/>
             </constraint>
           </properties>
+          <defaultValue>1813</defaultValue>
         </leafNode>
         <leafNode name="fail-time">
           <properties>
@@ -39,6 +40,7 @@
             </constraint>
             <constraintErrorMessage>Fail time must be between 0 and 600 seconds</constraintErrorMessage>
           </properties>
+          <defaultValue>0</defaultValue>
         </leafNode>
       </children>
     </tagNode>
@@ -54,6 +56,7 @@
         </constraint>
         <constraintErrorMessage>Timeout must be between 1 and 60 seconds</constraintErrorMessage>
       </properties>
+      <defaultValue>3</defaultValue>
     </leafNode>
     <leafNode name="acct-timeout">
       <properties>
@@ -67,6 +70,7 @@
         </constraint>
         <constraintErrorMessage>Timeout must be between 0 and 60 seconds</constraintErrorMessage>
       </properties>
+      <defaultValue>3</defaultValue>
     </leafNode>
     <leafNode name="max-try">
       <properties>
@@ -80,6 +84,7 @@
         </constraint>
         <constraintErrorMessage>Maximum tries must be between 1 and 20</constraintErrorMessage>
       </properties>
+      <defaultValue>3</defaultValue>
     </leafNode>
     <leafNode name="nas-identifier">
       <properties>
@@ -123,7 +128,7 @@
         </leafNode>
         <leafNode name="port">
           <properties>
-            <help>Port for Dynamic Authorization Extension server (DM/CoA)</help>
+            <help>Port for Dynamic Authorization Extension server (DM/CoA) (default: 1700)</help>
             <valueHelp>
               <format>number</format>
               <description>TCP port</description>
@@ -132,6 +137,7 @@
               <validator name="numeric" argument="--range 1-65535"/>
             </constraint>
           </properties>
+          <defaultValue>1700</defaultValue>
         </leafNode>
         <leafNode name="key">
           <properties>
diff --git a/interface-definitions/include/radius-server.xml.i b/interface-definitions/include/radius-server.xml.i
index 047728233..7c2ddff80 100644
--- a/interface-definitions/include/radius-server.xml.i
+++ b/interface-definitions/include/radius-server.xml.i
@@ -49,6 +49,7 @@
               <validator name="numeric" argument="--range 1-65535"/>
             </constraint>
           </properties>
+          <defaultValue>1812</defaultValue>
         </leafNode>
       </children>
     </tagNode>
diff --git a/interface-definitions/service_pppoe-server.xml.in b/interface-definitions/service_pppoe-server.xml.in
index eaaac0d4c..b38f692d8 100644
--- a/interface-definitions/service_pppoe-server.xml.in
+++ b/interface-definitions/service_pppoe-server.xml.in
@@ -29,12 +29,13 @@
               </constraint>
               <constraintErrorMessage>access-concentrator name limited to alphanumerical characters only (max. 100)</constraintErrorMessage>
             </properties>
+            <defaultValue>vyos-ac</defaultValue>
           </leafNode>
           <leafNode name="session-control">
             <properties>
               <help>control sessions count</help>
               <constraint>
-                <regex>(deny|disable)</regex>
+                <regex>^(deny|disable|replace)$</regex>
               </constraint>
               <constraintErrorMessage>Invalid value</constraintErrorMessage>
               <valueHelp>
@@ -45,10 +46,15 @@
                 <format>deny</format>
                 <description>Deny second session authorization</description>
               </valueHelp>
+              <valueHelp>
+                <format>replace</format>
+                <description>Terminate first session when second is authorized</description>
+              </valueHelp>
               <completionHelp>
-                <list>deny disable</list>
+                <list>deny disable replace</list>
               </completionHelp>
             </properties>
+            <defaultValue>replace</defaultValue>
           </leafNode>
           <node name="authentication">
             <properties>
@@ -68,6 +74,7 @@
                       <leafNode name="disable">
                         <properties>
                           <help>Option to disable a PPPoE Server user</help>
+                          <valueless/>
                         </properties>
                       </leafNode>
                       <leafNode name="password">
@@ -79,6 +86,7 @@
                         <properties>
                           <help>Static client IP address</help>
                         </properties>
+                        <defaultValue>*</defaultValue>
                       </leafNode>
                       <node name="rate-limit">
                         <properties>
@@ -182,7 +190,7 @@
                   <completionHelp>
                     <list>pap chap mschap mschap-v2</list>
                   </completionHelp>
-                  <multi />
+                  <multi/>
                 </properties>
               </leafNode>
             </children>
@@ -234,10 +242,10 @@
                 <properties>
                   <help>VLAN monitor for the automatic creation of vlans (user per vlan)</help>
                   <constraint>
-                        <validator name="numeric" argument="--range 1-4096"/>
-                      </constraint>
-                      <constraintErrorMessage>VLAN ID needs to be between 1 and 4096</constraintErrorMessage>
-                      <multi />
+                    <validator name="numeric" argument="--range 1-4096"/>
+                  </constraint>
+                  <constraintErrorMessage>VLAN ID needs to be between 1 and 4096</constraintErrorMessage>
+                  <multi/>
                 </properties>
               </leafNode>
               <leafNode name="vlan-range">
@@ -246,7 +254,7 @@
                   <constraint>
                     <regex>(409[0-6]|40[0-8][0-9]|[1-3][0-9]{3}|[1-9][0-9]{0,2})-(409[0-6]|40[0-8][0-9]|[1-3][0-9]{3}|[1-9][0-9]{0,2})</regex>
                   </constraint>
-                  <multi />
+                  <multi/>
                 </properties>
               </leafNode>
             </children>
@@ -263,9 +271,10 @@
             <properties>
               <help>Maximum Transmission Unit (MTU) - default 1492</help>
               <constraint>
-              <validator name="numeric" argument="--range 128-16384"/>
+                <validator name="numeric" argument="--range 128-16384"/>
               </constraint>
             </properties>
+            <defaultValue>1492</defaultValue>
           </leafNode>
           <node name="limits">
             <properties>
@@ -353,6 +362,7 @@
                     <regex>^(deny|prefer|require)$</regex>
                   </constraint>
                 </properties>
+                <defaultValue>prefer</defaultValue>
               </leafNode>
               <leafNode name="lcp-echo-interval">
                 <properties>
@@ -361,6 +371,7 @@
                     <validator name="numeric" argument="--positive"/>
                   </constraint>
                 </properties>
+                <defaultValue>30</defaultValue>
               </leafNode>
               <leafNode name="lcp-echo-failure">
                 <properties>
@@ -369,6 +380,7 @@
                     <validator name="numeric" argument="--positive"/>
                   </constraint>
                 </properties>
+                <defaultValue>3</defaultValue>
               </leafNode>
               <leafNode name="lcp-echo-timeout">
                 <properties>
@@ -377,6 +389,7 @@
                     <validator name="numeric" argument="--positive"/>
                   </constraint>
                 </properties>
+                <defaultValue>0</defaultValue>
               </leafNode>
               <leafNode name="ipv4">
                 <properties>
@@ -437,6 +450,9 @@
               <leafNode name="ipv6-intf-id">
                 <properties>
                   <help>Fixed or random interface identifier for IPv6</help>
+                  <completionHelp>
+                    <list>random</list>
+                  </completionHelp>
                   <valueHelp>
                     <format>random</format>
                     <description>Random interface identifier for IPv6</description>
@@ -450,6 +466,9 @@
               <leafNode name="ipv6-peer-intf-id">
                 <properties>
                   <help>Peer interface identifier for IPv6</help>
+                  <completionHelp>
+                    <list>random calling-sid ipv4</list>
+                  </completionHelp>
                   <valueHelp>
                     <format>x:x:x:x</format>
                     <description>Interface identifier for IPv6</description>
-- 
cgit v1.2.3