From fcb2253153bef0df4845cb0c42155fc11965e284 Mon Sep 17 00:00:00 2001
From: Viacheslav Hletenko <v.gletenko@vyos.io>
Date: Wed, 10 Aug 2022 21:01:03 +0000
Subject: l2tp: T4603: Add RADIUS nas-ip-address option

Add l2tp authentication radius nas-ip-address option
which will be sent in NAS-IP-Address Radius attribute
---
 .../include/accel-ppp/radius-additions.xml.i               | 13 +------------
 interface-definitions/include/radius-nas-ip-address.xml.i  | 14 ++++++++++++++
 interface-definitions/vpn-l2tp.xml.in                      |  1 +
 3 files changed, 16 insertions(+), 12 deletions(-)
 create mode 100644 interface-definitions/include/radius-nas-ip-address.xml.i

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/accel-ppp/radius-additions.xml.i b/interface-definitions/include/accel-ppp/radius-additions.xml.i
index 441c9dda5..15ff5165f 100644
--- a/interface-definitions/include/accel-ppp/radius-additions.xml.i
+++ b/interface-definitions/include/accel-ppp/radius-additions.xml.i
@@ -89,18 +89,7 @@
       <defaultValue>3</defaultValue>
     </leafNode>
     #include <include/radius-nas-identifier.xml.i>
-    <leafNode name="nas-ip-address">
-      <properties>
-        <help>NAS-IP-Address attribute sent to RADIUS</help>
-         <constraint>
-          <validator name="ipv4-address"/>
-        </constraint>
-        <valueHelp>
-          <format>ipv4</format>
-          <description>NAS-IP-Address attribute</description>
-        </valueHelp>
-       </properties>
-     </leafNode>
+    #include <include/radius-nas-ip-address.xml.i>
     <leafNode name="preallocate-vif">
       <properties>
         <help>Enable attribute NAS-Port-Id in Access-Request</help>
diff --git a/interface-definitions/include/radius-nas-ip-address.xml.i b/interface-definitions/include/radius-nas-ip-address.xml.i
new file mode 100644
index 000000000..8d0a3fd6a
--- /dev/null
+++ b/interface-definitions/include/radius-nas-ip-address.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from radius-nas-ip-address.xml.i -->
+<leafNode name="nas-ip-address">
+  <properties>
+    <help>NAS-IP-Address attribute sent to RADIUS</help>
+    <constraint>
+      <validator name="ipv4-address"/>
+    </constraint>
+    <valueHelp>
+      <format>ipv4</format>
+      <description>NAS-IP-Address attribute</description>
+    </valueHelp>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/vpn-l2tp.xml.in b/interface-definitions/vpn-l2tp.xml.in
index f734283e7..fd70a76dc 100644
--- a/interface-definitions/vpn-l2tp.xml.in
+++ b/interface-definitions/vpn-l2tp.xml.in
@@ -215,6 +215,7 @@
                         </properties>
                       </leafNode>
                       #include <include/radius-nas-identifier.xml.i>
+                      #include <include/radius-nas-ip-address.xml.i>
                       <node name="dae-server">
                         <properties>
                           <help>IPv4 address and port to bind Dynamic Authorization Extension server (DM/CoA)</help>
-- 
cgit v1.2.3