From cc0a277e76d5567fc294e6847186c4be28921bf7 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 8 Mar 2020 16:06:53 +0100
Subject: radius: T2110: provide uniform XML include file for server
 configuration

---
 interface-definitions/include/radius-server.xml.i | 69 ++++++++++++++++++++++
 interface-definitions/system-login.xml.in         | 70 +----------------------
 2 files changed, 70 insertions(+), 69 deletions(-)
 create mode 100644 interface-definitions/include/radius-server.xml.i

diff --git a/interface-definitions/include/radius-server.xml.i b/interface-definitions/include/radius-server.xml.i
new file mode 100644
index 000000000..9d0633801
--- /dev/null
+++ b/interface-definitions/include/radius-server.xml.i
@@ -0,0 +1,69 @@
+<node name="radius">
+  <properties>
+    <help>RADIUS based user authentication</help>
+  </properties>
+  <children>
+    <leafNode name="source-address">
+      <properties>
+        <help>RADIUS client source address</help>
+        <valueHelp>
+          <format>ipv4</format>
+          <description>TFTP IPv4 listen address</description>
+        </valueHelp>
+        <constraint>
+          <validator name="ipv4-address"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <tagNode name="server">
+      <properties>
+        <help>RADIUS server configuration</help>
+        <valueHelp>
+          <format>ipv4</format>
+          <description>RADIUS server IPv4 address</description>
+        </valueHelp>
+        <constraint>
+          <validator name="ipv4-address"/>
+        </constraint>
+      </properties>
+      <children>
+        <leafNode name="disable">
+          <properties>
+            <help>Temporary disable this server</help>
+            <valueless/>
+          </properties>
+        </leafNode>
+        <leafNode name="key">
+          <properties>
+            <help>Shared secret key</help>
+          </properties>
+        </leafNode>
+        <leafNode name="port">
+          <properties>
+            <help>Authentication port</help>
+            <valueHelp>
+              <format>1-65535</format>
+              <description>Numeric IP port (default: 1812)</description>
+            </valueHelp>
+            <constraint>
+              <validator name="numeric" argument="--range 1-65535"/>
+            </constraint>
+          </properties>
+        </leafNode>
+        <leafNode name="timeout">
+          <properties>
+            <help>Session timeout</help>
+            <valueHelp>
+              <format>1-30</format>
+              <description>Session timeout in seconds (default: 2)</description>
+            </valueHelp>
+            <constraint>
+              <validator name="numeric" argument="--range 1-30"/>
+            </constraint>
+            <constraintErrorMessage>Timeout must be between 1 and 30 seconds</constraintErrorMessage>
+          </properties>
+        </leafNode>
+      </children>
+    </tagNode>
+  </children>
+</node>
diff --git a/interface-definitions/system-login.xml.in b/interface-definitions/system-login.xml.in
index 3ed85b8d3..1d217caba 100644
--- a/interface-definitions/system-login.xml.in
+++ b/interface-definitions/system-login.xml.in
@@ -110,75 +110,7 @@
               </leafNode>
             </children>
           </tagNode>
-          <node name="radius">
-            <properties>
-              <help>RADIUS based user authentication</help>
-            </properties>
-            <children>
-              <leafNode name="source-address">
-                <properties>
-                  <help>RADIUS client source address</help>
-                  <valueHelp>
-                    <format>ipv4</format>
-                    <description>TFTP IPv4 listen address</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="ipv4-address"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-              <tagNode name="server">
-                <properties>
-                  <help>RADIUS server configuration</help>
-                  <valueHelp>
-                    <format>ipv4</format>
-                    <description>RADIUS server IPv4 address</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="ipv4-address"/>
-                  </constraint>
-                </properties>
-                <children>
-                  <leafNode name="disable">
-                    <properties>
-                      <help>Temporary disable this server</help>
-                      <valueless/>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="key">
-                    <properties>
-                      <help>Shared secret key</help>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="port">
-                    <properties>
-                      <help>Authentication port</help>
-                      <valueHelp>
-                        <format>1-65535</format>
-                        <description>Numeric IP port (default: 1812)</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 1-65535"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="timeout">
-                    <properties>
-                      <help>Session timeout</help>
-                      <valueHelp>
-                        <format>1-30</format>
-                        <description>Session timeout in seconds (default: 2)</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 1-30"/>
-                      </constraint>
-                      <constraintErrorMessage>Timeout must be between 1 and 30 seconds</constraintErrorMessage>
-                    </properties>
-                  </leafNode>
-                </children>
-              </tagNode>
-            </children>
-          </node>
+          #include <include/radius-server.xml.i>
         </children>
       </node>
     </children>
-- 
cgit v1.2.3