From a68c9238111c6caee78bb28f8054b8f0cfa0e374 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Thu, 24 Feb 2022 22:47:12 +0100
Subject: scripts: T4269: node.def generator should automatically add default
 values

Since introducing the XML <defaultValue> node it was common, but redundant,
practice to also add a help string indicating which value would be used as
default if the node is unset.

This makes no sense b/c it's duplicated code/value/characters and prone to
error. The node.def scripts should be extended to automatically render the
appropriate default value into the CLI help string.

For e.g. SSH the current PoC renders:

$ cat templates-cfg/service/ssh/port/node.def
  multi:
  type: txt
  help: Port for SSH service (default: 22)
  val_help: u32:1-65535; Numeric IP port
  ...

Not all subsystems are already migrated to get_config_dict() and make use of
the defaults() call - those subsystems need to be migrated, first before the new
default is added to the CLI help.
---
 interface-definitions/vpn_l2tp.xml.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'interface-definitions/vpn_l2tp.xml.in')

diff --git a/interface-definitions/vpn_l2tp.xml.in b/interface-definitions/vpn_l2tp.xml.in
index 6a88756a7..9ca7b1fad 100644
--- a/interface-definitions/vpn_l2tp.xml.in
+++ b/interface-definitions/vpn_l2tp.xml.in
@@ -88,7 +88,7 @@
                       <help>IKE lifetime</help>
                       <valueHelp>
                         <format>u32:30-86400</format>
-                        <description>IKE lifetime in seconds (default 3600)</description>
+                        <description>IKE lifetime in seconds</description>
                       </valueHelp>
                       <constraint>
                         <validator name="numeric" argument="--range 30-86400"/>
@@ -101,7 +101,7 @@
                       <help>ESP lifetime</help>
                       <valueHelp>
                         <format>u32:30-86400</format>
-                        <description>IKE lifetime in seconds (default 3600)</description>
+                        <description>IKE lifetime in seconds</description>
                       </valueHelp>
                       <constraint>
                         <validator name="numeric" argument="--range 30-86400"/>
@@ -135,7 +135,7 @@
                   <help>PPP idle timeout</help>
                   <valueHelp>
                     <format>u32:30-86400</format>
-                    <description>PPP idle timeout in seconds (default 1800)</description>
+                    <description>PPP idle timeout in seconds</description>
                   </valueHelp>
                     <constraint>
                       <validator name="numeric" argument="--range 30-86400"/>
@@ -206,7 +206,7 @@
                       </leafNode>
                       <leafNode name="acct-timeout">
                         <properties>
-                          <help>Timeout to wait reply for Interim-Update packets. (default 3 seconds)</help>
+                          <help>Timeout to wait reply for Interim-Update packets</help>
                         </properties>
                       </leafNode>
                       <leafNode name="max-try">
@@ -244,7 +244,7 @@
                         <children>
                           <leafNode name="attribute">
                             <properties>
-                              <help>Specifies which radius attribute contains rate information. (default is Filter-Id)</help>
+                              <help>Specifies which radius attribute contains rate information</help>
                             </properties>
                           </leafNode>
                           <leafNode name="vendor">
-- 
cgit v1.2.3