From 688022de47c366cffbf14f0f3cda511cea585ebc Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Thu, 22 Jul 2021 22:52:47 +0200
Subject: xml: op-mode: move "show interfaces wireguard" to dedicated file

---
 .../show-interfaces-wireguard.xml.in               | 60 ++++++++++++++++++++++
 op-mode-definitions/wireguard.xml.in               | 53 -------------------
 2 files changed, 60 insertions(+), 53 deletions(-)
 create mode 100644 op-mode-definitions/show-interfaces-wireguard.xml.in

diff --git a/op-mode-definitions/show-interfaces-wireguard.xml.in b/op-mode-definitions/show-interfaces-wireguard.xml.in
new file mode 100644
index 000000000..be22bbf98
--- /dev/null
+++ b/op-mode-definitions/show-interfaces-wireguard.xml.in
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="show">
+    <children>
+      <node name="interfaces">
+        <children>
+          <tagNode name="wireguard">
+            <properties>
+              <help>Show Wireguard interface information</help>
+              <completionHelp>
+                <script>${vyos_completion_dir}/list_interfaces.py --type wireguard</script>
+              </completionHelp>
+            </properties>
+	        <command>sudo ${vyos_op_scripts_dir}/wireguard.py --showinterface "$4"</command>
+            <children>
+              <leafNode name="allowed-ips">
+                <properties>
+                  <help>Show all IP addresses allowed for the specified interface</help>
+                </properties>
+                <command>sudo wg show "$4" allowed-ips</command>
+              </leafNode>
+              <leafNode name="endpoints">
+                <properties>
+                  <help>Show all endpoints for the specified interface</help>
+                </properties>
+                <command>sudo wg show "$4" endpoints</command>
+              </leafNode>
+              <leafNode name="peers">
+                <properties>
+                  <help>Show all peer IDs for the specified interface</help>
+                </properties>
+                <command>sudo wg show "$4" peers</command>
+              </leafNode>
+              <leafNode name="summary">
+                <properties>
+                  <help>Shows current configuration and device information</help>
+                </properties>
+                <command>sudo wg show "$4"</command>
+              </leafNode>
+            </children>
+          </tagNode>
+          <node name="wireguard">
+            <properties>
+              <help>Show Wireguard interface information</help>
+            </properties>
+            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=wireguard --action=show-brief</command>
+            <children>
+              <leafNode name="detail">
+                <properties>
+                  <help>Show detailed Wireguard interface information</help>
+                </properties>
+                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=wireguard --action=show</command>
+              </leafNode>
+            </children>
+          </node>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/op-mode-definitions/wireguard.xml.in b/op-mode-definitions/wireguard.xml.in
index ac3daa3b8..04e200b32 100644
--- a/op-mode-definitions/wireguard.xml.in
+++ b/op-mode-definitions/wireguard.xml.in
@@ -93,59 +93,6 @@
           </node>
         </children>
       </node>
-      <node name="interfaces">
-        <children>
-          <tagNode name="wireguard">
-            <properties>
-              <help>Show Wireguard interface information</help>
-              <completionHelp>
-                <script>${vyos_completion_dir}/list_interfaces.py --type wireguard</script>
-              </completionHelp>
-            </properties>
-	        <command>sudo ${vyos_op_scripts_dir}/wireguard.py --showinterface "$4"</command>
-            <children>
-              <leafNode name="allowed-ips">
-                <properties>
-                  <help>Show all IP addresses allowed for the specified interface</help>
-                </properties>
-                <command>sudo wg show "$4" allowed-ips</command>
-              </leafNode>
-              <leafNode name="endpoints">
-                <properties>
-                  <help>Show all endpoints for the specified interface</help>
-                </properties>
-                <command>sudo wg show "$4" endpoints</command>
-              </leafNode>
-              <leafNode name="peers">
-                <properties>
-                  <help>Show all peer IDs for the specified interface</help>
-                </properties>
-                <command>sudo wg show "$4" peers</command>
-              </leafNode>
-              <leafNode name="summary">
-                <properties>
-                  <help>Shows current configuration and device information</help>
-                </properties>
-                <command>sudo wg show "$4"</command>
-              </leafNode>
-            </children>
-          </tagNode>
-          <node name="wireguard">
-            <properties>
-              <help>Show Wireguard interface information</help>
-            </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=wireguard --action=show-brief</command>
-            <children>
-              <leafNode name="detail">
-                <properties>
-                  <help>Show detailed Wireguard interface information</help>
-                </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=wireguard --action=show</command>
-              </leafNode>
-            </children>
-          </node>
-        </children>
-      </node>
     </children>
   </node>
   <node name="delete">
-- 
cgit v1.2.3