From ff54df9b8bf8cfc8824865c6e7e551e90fe2b151 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 19 Jun 2020 16:39:27 +0200
Subject: op-mode: console-server: T2490: rename "connect console-server" to
 "connect console"

---
 op-mode-definitions/connect-disconnect.xml  |  9 ---------
 op-mode-definitions/show-console-server.xml | 13 +++++++++++++
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/op-mode-definitions/connect-disconnect.xml b/op-mode-definitions/connect-disconnect.xml
index 69afe6db0..f0fcef5da 100644
--- a/op-mode-definitions/connect-disconnect.xml
+++ b/op-mode-definitions/connect-disconnect.xml
@@ -15,15 +15,6 @@
         </properties>
         <command>sudo ${vyos_op_scripts_dir}/connect_disconnect.py --connect "$3"</command>
       </tagNode>
-      <tagNode name="console-server">
-        <properties>
-          <help>Connect to port of serial console server</help>
-          <completionHelp>
-            <path>service console-server device</path>
-          </completionHelp>
-        </properties>
-        <command>/usr/bin/console "$3"</command>
-      </tagNode>
     </children>
   </node>
   <node name="disconnect">
diff --git a/op-mode-definitions/show-console-server.xml b/op-mode-definitions/show-console-server.xml
index 77a7f3376..e47b6cfaa 100644
--- a/op-mode-definitions/show-console-server.xml
+++ b/op-mode-definitions/show-console-server.xml
@@ -1,5 +1,18 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
+  <node name="connect">
+    <children>
+      <tagNode name="console">
+        <properties>
+          <help>Connect to device attached to serial console server</help>
+          <completionHelp>
+            <path>service console-server device</path>
+          </completionHelp>
+        </properties>
+        <command>/usr/bin/console "$3"</command>
+      </tagNode>
+    </children>
+  </node>
   <node name="show">
     <children>
       <node name="log">
-- 
cgit v1.2.3