From 1cc5001e375589e3e29b6a215aad897b293a7faa Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Mon, 22 Jun 2020 17:50:40 +0200
Subject: xml: ssh: fix typo in service description

---
 interface-definitions/ssh.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/ssh.xml.in b/interface-definitions/ssh.xml.in
index de926a897..4e8cf28eb 100644
--- a/interface-definitions/ssh.xml.in
+++ b/interface-definitions/ssh.xml.in
@@ -5,7 +5,7 @@
     <children>
       <node name="ssh" owner="${vyos_conf_scripts_dir}/ssh.py">
         <properties>
-          <help>Secure SHell (SSH) protocol</help>
+          <help>Secure Shell (SSH)</help>
           <priority>500</priority>
         </properties>
         <children>
-- 
cgit v1.2.3


From 46f4aa47cc62ca05bef4e4cca614ed77065608e7 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Mon, 22 Jun 2020 22:34:06 +0200
Subject: console-server: T2588: migrate to defaults from XML interface
 definitions

---
 interface-definitions/service_console-server.xml.in | 3 +++
 src/conf_mode/service_console-server.py             | 9 ++-------
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/service_console-server.xml.in b/interface-definitions/service_console-server.xml.in
index 348d591dd..59a9fe237 100644
--- a/interface-definitions/service_console-server.xml.in
+++ b/interface-definitions/service_console-server.xml.in
@@ -50,6 +50,7 @@
                     <regex>(7|8)</regex>
                   </constraint>
                 </properties>
+                <defaultValue>8</defaultValue>
               </leafNode>
               <leafNode name="stop-bits">
                 <properties>
@@ -61,6 +62,7 @@
                     <regex>(1|2)</regex>
                   </constraint>
                 </properties>
+                <defaultValue>1</defaultValue>
               </leafNode>
               <leafNode name="parity">
                 <properties>
@@ -72,6 +74,7 @@
                     <regex>(even|odd|none)</regex>
                   </constraint>
                 </properties>
+                <defaultValue>none</defaultValue>
               </leafNode>
               <node name="ssh">
                 <properties>
diff --git a/src/conf_mode/service_console-server.py b/src/conf_mode/service_console-server.py
index 7f6967983..ace6b8ca4 100755
--- a/src/conf_mode/service_console-server.py
+++ b/src/conf_mode/service_console-server.py
@@ -22,17 +22,11 @@ from vyos.config import Config
 from vyos.configdict import dict_merge
 from vyos.template import render
 from vyos.util import call
+from vyos.xml import defaults
 from vyos import ConfigError
 
 config_file = r'/run/conserver/conserver.cf'
 
-# Default values are necessary until the implementation of T2588 is completed
-default_values = {
-    'data_bits': '8',
-    'parity': 'none',
-    'stop_bits': '1'
-}
-
 def get_config():
     conf = Config()
     base = ['service', 'console-server']
@@ -52,6 +46,7 @@ def get_config():
 
     # We have gathered the dict representation of the CLI, but there are default
     # options which we need to update into the dictionary retrived.
+    default_values = defaults(base + ['device'])
     for device in proxy['device'].keys():
         tmp = dict_merge(default_values, proxy['device'][device])
         proxy['device'][device] = tmp
-- 
cgit v1.2.3