From 93de3abe1368cab5ab8cd292689466d7af8e86bc Mon Sep 17 00:00:00 2001
From: Jamie Austin <jamiea@opusv.com.au>
Date: Thu, 20 Apr 2023 17:07:53 +1000
Subject: ocserv: T3896: refactor: change ocserv config-per-x node name

Changes the node name from config-per-x to identity-based-config, as a result the j2 templates and vpn_openeconnect.py has been refactored to update the node name when accessing it's child nodes.
---
 .../include/openconnect-config-per-x.xml.i         | 54 ----------------------
 .../openconnect-identity-based-config.xml.i        | 54 ++++++++++++++++++++++
 2 files changed, 54 insertions(+), 54 deletions(-)
 delete mode 100644 interface-definitions/include/openconnect-config-per-x.xml.i
 create mode 100644 interface-definitions/include/openconnect-identity-based-config.xml.i

(limited to 'interface-definitions/include')

diff --git a/interface-definitions/include/openconnect-config-per-x.xml.i b/interface-definitions/include/openconnect-config-per-x.xml.i
deleted file mode 100644
index c9b200249..000000000
--- a/interface-definitions/include/openconnect-config-per-x.xml.i
+++ /dev/null
@@ -1,54 +0,0 @@
-<!-- include start from openconnect-config-per-x.xml.i -->
-<node name="config-per-x">
-    <properties>
-        <help>Configures OpenConnect to search the configured directory for a config file matching the Group name or Username</help>
-    </properties>
-    <children>
-        <leafNode name="mode">
-            <properties>
-                <help>Configures OpenConnect to use config-per-group or config-per-user. Ignored if OpenConnect authentication group is configured.</help>
-                <valueHelp>
-                    <format>user</format>
-                    <description>OpenConnect config file loaded by matching file in configured directory to the users username</description>
-                </valueHelp>
-                <valueHelp>
-                    <format>group</format>
-                    <description>OpenConnect config file loaded by matching RADIUS class attribute in the RADIUS server response to a file in the configured directory</description>
-                </valueHelp>
-                <constraint>
-                    <regex>(user|group)</regex>
-                </constraint>
-                <constraintErrorMessage>Invalid mode. Must be one of: user, group</constraintErrorMessage>
-                <completionHelp>
-                    <list>user group</list>
-                </completionHelp>
-            </properties>
-        </leafNode>
-        <leafNode name="directory">
-            <properties>
-                <help>Directory to configure OpenConnect to use for matching username/group to config file</help>
-                <valueHelp>
-                    <format>filename</format>
-                    <description>Must be a child directory of /config/auth e.g. /config/auth/ocserv/config-per-user</description>
-                </valueHelp>
-                <constraint>
-                    <validator name="file-path" argument="--directory --parent-dir /config/auth --strict"/>
-                </constraint>
-            </properties>
-        </leafNode>
-        <leafNode name="default-config">
-            <properties>
-                <help>Default/fallback config to use when a file cannot be found in the configured directory that matches the username/group</help>
-                <valueHelp>
-                    <format>filename</format>
-                    <description>Child directory of /config/auth e.g. /config/auth/ocserv/defaults/user.conf</description>
-                </valueHelp>
-                <constraint>
-                    <validator name="file-path" argument="--file --parent-dir /config/auth --strict"/>
-                </constraint>
-            </properties>
-        </leafNode>
-        #include <include/generic-disable-node.xml.i>
-    </children>
-</node>
-<!-- include end -->
\ No newline at end of file
diff --git a/interface-definitions/include/openconnect-identity-based-config.xml.i b/interface-definitions/include/openconnect-identity-based-config.xml.i
new file mode 100644
index 000000000..dfc51936d
--- /dev/null
+++ b/interface-definitions/include/openconnect-identity-based-config.xml.i
@@ -0,0 +1,54 @@
+<!-- include start from openconnect-identity-based-config.xml.i -->
+<node name="identity-based-config">
+    <properties>
+        <help>Configures OpenConnect to search the configured directory for a config file matching the Group name or Username</help>
+    </properties>
+    <children>
+        <leafNode name="mode">
+            <properties>
+                <help>Configures OpenConnect to use config-per-group or config-per-user. Ignored if OpenConnect authentication group is configured.</help>
+                <valueHelp>
+                    <format>user</format>
+                    <description>OpenConnect config file loaded by matching file in configured directory to the users username</description>
+                </valueHelp>
+                <valueHelp>
+                    <format>group</format>
+                    <description>OpenConnect config file loaded by matching RADIUS class attribute in the RADIUS server response to a file in the configured directory</description>
+                </valueHelp>
+                <constraint>
+                    <regex>(user|group)</regex>
+                </constraint>
+                <constraintErrorMessage>Invalid mode. Must be one of: user, group</constraintErrorMessage>
+                <completionHelp>
+                    <list>user group</list>
+                </completionHelp>
+            </properties>
+        </leafNode>
+        <leafNode name="directory">
+            <properties>
+                <help>Directory to configure OpenConnect to use for matching username/group to config file</help>
+                <valueHelp>
+                    <format>filename</format>
+                    <description>Must be a child directory of /config/auth e.g. /config/auth/ocserv/config-per-user</description>
+                </valueHelp>
+                <constraint>
+                    <validator name="file-path" argument="--directory --parent-dir /config/auth --strict"/>
+                </constraint>
+            </properties>
+        </leafNode>
+        <leafNode name="default-config">
+            <properties>
+                <help>Default/fallback config to use when a file cannot be found in the configured directory that matches the username/group</help>
+                <valueHelp>
+                    <format>filename</format>
+                    <description>Child directory of /config/auth e.g. /config/auth/ocserv/defaults/user.conf</description>
+                </valueHelp>
+                <constraint>
+                    <validator name="file-path" argument="--file --parent-dir /config/auth --strict"/>
+                </constraint>
+            </properties>
+        </leafNode>
+        #include <include/generic-disable-node.xml.i>
+    </children>
+</node>
+<!-- include end -->
\ No newline at end of file
-- 
cgit v1.2.3