From 8e8c0b152e6ae98bb1ad0e479c20bae0fca7279a Mon Sep 17 00:00:00 2001
From: DmitriyEshenko <snooppy@mail.ua>
Date: Fri, 26 Jul 2019 20:32:43 +0000
Subject: T1546 fix syntax l2tp radius source-address and migrate other radius
 options

---
 interface-definitions/l2tp-server.xml | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/l2tp-server.xml b/interface-definitions/l2tp-server.xml
index 2d103aae0..797e5a812 100644
--- a/interface-definitions/l2tp-server.xml
+++ b/interface-definitions/l2tp-server.xml
@@ -417,13 +417,15 @@
                           </leafNode>
                         </children>
                       </tagNode>
-                    </children>
-                  </node>
-                  <node name="radius-settings">
-                    <properties>
-                      <help>RADIUS settings</help>
-                    </properties>
-                    <children>
+                      <leafNode name="source-address">
+                        <properties>
+                          <help>Local RADIUS client address from which packets are sent.</help>
+                          <valueHelp>
+                            <format>&lt;x.x.x.x&gt;</format>
+                            <description>Local RADIUS client address from which packets are sent</description>
+                          </valueHelp>
+                        </properties>
+                      </leafNode>
                       <leafNode name="timeout">
                         <properties>
                           <help>Timeout to wait response from server (seconds)</help>
@@ -444,11 +446,6 @@
                           <help>Value to send to RADIUS server in NAS-Identifier attribute and to be matched in DM/CoA requests.</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>
-                        </properties>
-                      </leafNode>
                       <node name="dae-server">
                         <properties>
                           <help>IPv4 address and port to bind Dynamic Authorization Extension server (DM/CoA)</help>
-- 
cgit v1.2.3