From 5366f9c9ce9850cdf3fddbf0c2947994a0c7eef6 Mon Sep 17 00:00:00 2001
From: Kim Hagen <kim@sentrium.io>
Date: Fri, 3 Sep 2021 06:00:07 -0500
Subject: do not use capitals in opmode rename t0 to drift add subnemu for 2fa
 to make it more readable

---
 op-mode-definitions/openvpn.xml.in | 39 ++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

(limited to 'op-mode-definitions')

diff --git a/op-mode-definitions/openvpn.xml.in b/op-mode-definitions/openvpn.xml.in
index 6549976c5..068d5d8fb 100644
--- a/op-mode-definitions/openvpn.xml.in
+++ b/op-mode-definitions/openvpn.xml.in
@@ -63,24 +63,31 @@
                   </completionHelp>
                 </properties>
                 <children>
-                  <leafNode name="2fa-secret">
+                  <node name="2fa">
                     <properties>
-                      <help>Show 2fa authentication secret</help>
+                      <help>Show 2fa information</help>
                     </properties>
-                    <command>${vyos_op_scripts_dir}/show_openvpn_2fa.py --user="$6" --intf="$4" --action=secret</command>
-                  </leafNode>
-                  <leafNode name="2fa-uri">
-                    <properties>
-                      <help>Show 2fa otpauth uri</help>
-                    </properties>
-                    <command>${vyos_op_scripts_dir}/show_openvpn_2fa.py --user="$6" --intf="$4" --action=uri</command>
-                  </leafNode>
-                  <leafNode name="2fa-QRcode">
-                    <properties>
-                      <help>Show 2fa QR code</help>
-                    </properties>
-                    <command>${vyos_op_scripts_dir}/show_openvpn_2fa.py --user="$6" --intf="$4" --action=qrcode</command>
-                  </leafNode>
+                    <children>
+                      <leafNode name="secret">
+                        <properties>
+                          <help>Show 2fa authentication secret</help>
+                        </properties>
+                        <command>${vyos_op_scripts_dir}/show_openvpn_2fa.py --user="$6" --intf="$4" --action=secret</command>
+                      </leafNode>
+                      <leafNode name="uri">
+                        <properties>
+                          <help>Show 2fa otpauth uri</help>
+                        </properties>
+                        <command>${vyos_op_scripts_dir}/show_openvpn_2fa.py --user="$6" --intf="$4" --action=uri</command>
+                      </leafNode>
+                      <leafNode name="qrcode">
+                        <properties>
+                          <help>Show 2fa QR code</help>
+                        </properties>
+                        <command>${vyos_op_scripts_dir}/show_openvpn_2fa.py --user="$6" --intf="$4" --action=qrcode</command>
+                      </leafNode>
+                    </children>
+                  </node>
                 </children>
               </tagNode>
               <leafNode name="brief">
-- 
cgit v1.2.3