From 86e47301786da64a035156edd24ed2ec89918a49 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 20 Mar 2020 21:54:05 +0100
Subject: sstp: T2110: use uniform RADIUS CLI syntax

- migrate RADIUS configuration to a more uniform syntax accross the system
  - authentication radius-server x.x.x.x to authentication radius server x.x.x.x
  - authentication radius-settings to authentication radius
---
 interface-definitions/vpn-sstp.xml.in | 72 ++++++++++++++---------------------
 1 file changed, 29 insertions(+), 43 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/vpn-sstp.xml.in b/interface-definitions/vpn-sstp.xml.in
index e2d6aa75e..1508c3313 100644
--- a/interface-definitions/vpn-sstp.xml.in
+++ b/interface-definitions/vpn-sstp.xml.in
@@ -113,37 +113,23 @@
                     <multi />
                 </properties>
               </leafNode>
-              <tagNode name="radius-server">
-                <properties>
-                  <help>IP address of RADIUS server</help>
-                  <valueHelp>
-                    <format>ipv4</format>
-                      <description>IP address of RADIUS server</description>
-                  </valueHelp>
-                </properties>
-                <children>
-                  <leafNode name="secret">
-                    <properties>
-                      <help>Key for accessing the specified server</help>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="req-limit">
-                    <properties>
-                      <help>Maximum number of simultaneous requests to server (default: unlimited)</help>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="fail-time">
-                    <properties>
-                      <help>If server does not responds mark it as unavailable for this time (seconds)</help>
-                    </properties>
-                  </leafNode>
-                </children>
-              </tagNode>
-              <node name="radius-settings">
-                <properties>
-                  <help>RADIUS settings</help>
-                </properties>
+              #include <include/radius-server.xml.i>
+              <node name="radius">
                 <children>
+                  <tagNode name="server">
+                    <children>
+                      <leafNode name="req-limit">
+                        <properties>
+                          <help>Maximum number of simultaneous requests to server (default: unlimited)</help>
+                        </properties>
+                      </leafNode>
+                      <leafNode name="fail-time">
+                        <properties>
+                          <help>If server does not responds mark it as unavailable for this time (seconds)</help>
+                        </properties>
+                      </leafNode>
+                    </children>
+                  </tagNode>
                   <leafNode name="timeout">
                     <properties>
                       <help>Timeout to wait response from server (seconds)</help>
@@ -151,22 +137,22 @@
                   </leafNode>
                   <leafNode name="acct-timeout">
                     <properties>
-                      <help>Timeout to wait reply for Interim-Update packets. (default 3 seconds)</help>
+                      <help>Timeout for Interim-Update packets (default 3 seconds)</help>
                     </properties>
                   </leafNode>
                   <leafNode name="max-try">
                     <properties>
-                      <help>Maximum number of tries to send Access-Request/Accounting-Request queries</help>
+                      <help>Maximum tries for Access-Request/Accounting-Request queries</help>
                     </properties>
                   </leafNode>
                   <leafNode name="nas-identifier">
                     <properties>
-                      <help>Value to send to RADIUS server in NAS-Identifier attribute and to be matched in DM/CoA requests.</help>
+                      <help>NAS-Identifier attribute sent to RADIUS</help>
                     </properties>
                   </leafNode>
                   <leafNode name="nas-ip-address">
                     <properties>
-                      <help>Value to send to RADIUS server in NAS-IP-Address attribute and to be matched in DM/CoA requests. Also DM/CoA server will bind to that address.</help>
+                      <help>NAS-IP-Address attribute sent to RADIUS</help>
                        <constraint>
                         <validator name="ipv4-address"/>
                       </constraint>
@@ -175,14 +161,14 @@
                         <format>ipv4</format>
                         <description>NAS-IP-Address Attribute Value</description>
                       </valueHelp>
-                    </properties>
-                  </leafNode>
-                  <node name="dae-server">
+                     </properties>
+                   </leafNode>
+                  <node name="dynamic-author">
                     <properties>
-                      <help>IPv4 address and port to bind Dynamic Authorization Extension server (DM/CoA)</help>
+                      <help>Dynamic Authorization Extension/Change of Authorization server</help>
                     </properties>
                     <children>
-                      <leafNode name="ip-address">
+                      <leafNode name="server">
                         <properties>
                           <help>IP address for Dynamic Authorization Extension server (DM/CoA)</help>
                           <constraint>
@@ -207,7 +193,7 @@
                           </constraint>
                         </properties>
                       </leafNode>
-                      <leafNode name="secret">
+                      <leafNode name="key">
                         <properties>
                           <help>Secret for Dynamic Authorization Extension server (DM/CoA)</help>
                         </properties>
@@ -221,17 +207,17 @@
                     <children>
                       <leafNode name="attribute">
                         <properties>
-                          <help>Specifies which radius attribute contains rate information. (default is Filter-Id)</help>
+                          <help>Specifies RADIUS attribute containing rate information (default 'Filter-Id')</help>
                         </properties>
                       </leafNode>
                       <leafNode name="vendor">
                         <properties>
-                          <help>Specifies the vendor dictionary. (dictionary needs to be in /usr/share/accel-ppp/radius)</help>
+                          <help>Specifies vendor dictionary (needs to be in /usr/share/accel-ppp/radius)</help>
                         </properties>
                       </leafNode>
                       <leafNode name="enable">
                         <properties>
-                          <help>Enables Bandwidth shaping via RADIUS</help>
+                          <help>Enable RADIUS bandwidth shaping</help>
                           <valueless />
                         </properties>
                       </leafNode>
-- 
cgit v1.2.3