From b509bbf0c0bf33f39e67f0aa8df481ef15d6bae9 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Thu, 18 Jun 2020 23:09:58 +0200
Subject: console-server: T2490: rename CLI to console-server

---
 .../service_console-server.xml.in                  | 90 ++++++++++++++++++++++
 interface-definitions/service_serial-proxy.xml.in  | 90 ----------------------
 2 files changed, 90 insertions(+), 90 deletions(-)
 create mode 100644 interface-definitions/service_console-server.xml.in
 delete mode 100644 interface-definitions/service_serial-proxy.xml.in

(limited to 'interface-definitions')

diff --git a/interface-definitions/service_console-server.xml.in b/interface-definitions/service_console-server.xml.in
new file mode 100644
index 000000000..679ea32a2
--- /dev/null
+++ b/interface-definitions/service_console-server.xml.in
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="service">
+    <children>
+      <node name="console-server" owner="${vyos_conf_scripts_dir}/service_console-server.py">
+        <properties>
+          <help>Serial Console Server</help>
+        </properties>
+        <children>
+          <tagNode name="device">
+            <properties>
+              <help>System serial interface name (ttyS or ttyUSB)</help>
+              <completionHelp>
+                <script>ls -1 /dev | grep ttyS</script>
+                <script>ls -1 /dev/serial/by-bus</script>
+              </completionHelp>
+              <valueHelp>
+                <format>ttySxxx</format>
+                <description>Regular serial interface</description>
+              </valueHelp>
+              <valueHelp>
+                <format>usbxbxpx</format>
+                <description>USB based serial interface</description>
+              </valueHelp>
+              <constraint>
+                <regex>^(ttyS\d+|usb\d+b.*p.*)$</regex>
+              </constraint>
+            </properties>
+            <children>
+              #include <include/interface-description.xml.i>
+              #include <include/port-number.xml.i>
+              <leafNode name="speed">
+                <properties>
+                  <help>Serial port baud rate</help>
+                  <completionHelp>
+                    <list>300 1200 2400 4800 9600 19200 38400 57600 115200</list>
+                  </completionHelp>
+                  <constraint>
+                    <regex>(300|1200|2400|4800|9600|19200|38400|57600|115200)</regex>
+                  </constraint>
+                </properties>
+              </leafNode>
+              <leafNode name="data-bits">
+                <properties>
+                  <help>Serial port data bits (default: 8)</help>
+                  <completionHelp>
+                    <list>7 8</list>
+                  </completionHelp>
+                  <constraint>
+                    <regex>(7|8)</regex>
+                  </constraint>
+                </properties>
+              </leafNode>
+              <leafNode name="stop-bits">
+                <properties>
+                  <help>Serial port stop bits (default: 1)</help>
+                  <completionHelp>
+                    <list>1 2</list>
+                  </completionHelp>
+                  <constraint>
+                    <regex>(1|2)</regex>
+                  </constraint>
+                </properties>
+              </leafNode>
+              <leafNode name="parity">
+                <properties>
+                  <help>Parity setting (default: none)</help>
+                  <completionHelp>
+                    <list>even odd none</list>
+                  </completionHelp>
+                  <constraint>
+                    <regex>(even|odd|none)</regex>
+                  </constraint>
+                </properties>
+              </leafNode>
+              <node name="ssh">
+                <properties>
+                  <help>SSH remote access to this console</help>
+                </properties>
+                <children>
+                  #include <include/port-number.xml.i>
+                </children>
+              </node>
+            </children>
+          </tagNode>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/interface-definitions/service_serial-proxy.xml.in b/interface-definitions/service_serial-proxy.xml.in
deleted file mode 100644
index 917af0122..000000000
--- a/interface-definitions/service_serial-proxy.xml.in
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0"?>
-<interfaceDefinition>
-  <node name="service">
-    <children>
-      <node name="serial-proxy" owner="${vyos_conf_scripts_dir}/service_serial-proxy.py">
-        <properties>
-          <help>Serial to Network</help>
-        </properties>
-        <children>
-          <tagNode name="device">
-            <properties>
-              <help>System serial interface name (ttyS or ttyUSB)</help>
-              <completionHelp>
-                <script>ls -1 /dev | grep ttyS</script>
-                <script>ls -1 /dev/serial/by-bus</script>
-              </completionHelp>
-              <valueHelp>
-                <format>ttySxxx</format>
-                <description>Regular serial interface</description>
-              </valueHelp>
-              <valueHelp>
-                <format>usbxbxpx</format>
-                <description>USB based serial interface</description>
-              </valueHelp>
-              <constraint>
-                <regex>^(ttyS\d+|usb\d+b.*p.*)$</regex>
-              </constraint>
-            </properties>
-            <children>
-              #include <include/interface-description.xml.i>
-              #include <include/port-number.xml.i>
-              <leafNode name="speed">
-                <properties>
-                  <help>Serial port baud rate</help>
-                  <completionHelp>
-                    <list>300 1200 2400 4800 9600 19200 38400 57600 115200</list>
-                  </completionHelp>
-                  <constraint>
-                    <regex>(300|1200|2400|4800|9600|19200|38400|57600|115200)</regex>
-                  </constraint>
-                </properties>
-              </leafNode>
-              <leafNode name="data-bits">
-                <properties>
-                  <help>Serial port data bits (default: 8)</help>
-                  <completionHelp>
-                    <list>7 8</list>
-                  </completionHelp>
-                  <constraint>
-                    <regex>(7|8)</regex>
-                  </constraint>
-                </properties>
-              </leafNode>
-              <leafNode name="stop-bits">
-                <properties>
-                  <help>Serial port stop bits (default: 1)</help>
-                  <completionHelp>
-                    <list>1 2</list>
-                  </completionHelp>
-                  <constraint>
-                    <regex>(1|2)</regex>
-                  </constraint>
-                </properties>
-              </leafNode>
-              <leafNode name="parity">
-                <properties>
-                  <help>Parity setting (default: none)</help>
-                  <completionHelp>
-                    <list>even odd none</list>
-                  </completionHelp>
-                  <constraint>
-                    <regex>(even|odd|none)</regex>
-                  </constraint>
-                </properties>
-              </leafNode>
-              <node name="ssh">
-                <properties>
-                  <help>SSH remote access to this console</help>
-                </properties>
-                <children>
-                  #include <include/port-number.xml.i>
-                </children>
-              </node>
-            </children>
-          </tagNode>
-        </children>
-      </node>
-    </children>
-  </node>
-</interfaceDefinition>
-- 
cgit v1.2.3