From fb29ce11678a3522fdc559d2ad7f1cbc70abe026 Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Thu, 17 Oct 2019 10:31:19 -0400 Subject: [PATCH] Improve autoselection setup --- client-common/common.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/client-common/common.py b/client-common/common.py index a3f453c8..d6c6618f 100644 --- a/client-common/common.py +++ b/client-common/common.py @@ -166,15 +166,21 @@ def getInformationFromXML(zk_conn, uuid): try: domain_node_limit = zkhandler.readdata(zk_conn, '/domains/{}/node_limit'.format(uuid)) - domain_node_selector = zkhandler.readdata(zk_conn, '/domains/{}/node_selector'.format(uuid)) - domain_node_autostart = zkhandler.readdata(zk_conn, '/domains/{}/node_autostart'.format(uuid)) except: domain_node_limit = None + try + domain_node_selector = zkhandler.readdata(zk_conn, '/domains/{}/node_selector'.format(uuid)) + except: domain_node_selector = None + try: + domain_node_autostart = zkhandler.readdata(zk_conn, '/domains/{}/node_autostart'.format(uuid)) + except: domain_node_autostart = None if not domain_node_limit: domain_node_limit = 'False' + if not domain_node_autostart: + domain_node_autostart = 'False' parsed_xml = getDomainXML(zk_conn, uuid)