T1264 - host_name.py improvements

- checks if a variable exists to avoid setting None on defined defaults

1 files changed, 9 insertions, 5 deletions

diff --git a/src/conf_mode/host_name.py b/src/conf_mode/host_name.py
index 27e2d9170..b0972a8f1 100755
--- a/src/conf_mode/host_name.py
+++ b/src/conf_mode/host_name.py
@@ -110,17 +110,21 @@ def get_config():
   conf = Config()
   hosts = copy.deepcopy(default_config_data)
 
-  hosts['hostname'] = conf.return_value("system host-name")
-  hosts['domain_name'] = conf.return_value("system domain-name")
+  if conf.exists("system host-name"):
+    hosts['hostname'] = conf.return_value("system host-name")
 
-  if hosts['domain_name']:
+  if conf.exists("system domain-name"):
+    hosts['domain_name'] = conf.return_value("system domain-name")
     hosts['domain_search'].append(hosts['domain_name'])
 
   for search in conf.return_values("system domain-search domain"):
     hosts['domain_search'].append(search)
 
-  hosts['nameserver'] = conf.return_values("system name-server")
-  hosts['no_dhcp_ns'] = conf.exists('system disable-dhcp-nameservers')
+  if conf.exists("system name-server"):
+    hosts['nameserver'] = conf.return_values("system name-server")
+
+  if conf.exists("system disable-dhcp-nameservers"):
+    hosts['no_dhcp_ns'] = conf.exists('system disable-dhcp-nameservers')
 
   ## system static-host-mapping
   hosts['static_host_mapping'] = { 'hostnames'  : {}}