From 8cc20fbcfba5f75f2e61720f2624c4b0a794ebd3 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Sun, 5 Jan 2020 13:42:23 -0500 Subject: [PATCH] Properly handle empty node limit --- client-common/vm.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client-common/vm.py b/client-common/vm.py index 9b58e7ce..ad1a6597 100644 --- a/client-common/vm.py +++ b/client-common/vm.py @@ -439,8 +439,8 @@ def move_vm(zk_conn, domain, target_node): return False, 'ERROR: Specified node "{}" is invalid.'.format(target_node) # Check if node is within the limit - node_limit = zkhandler.readdata(zk_conn, '/domains/{}/node_limit'.format(dom_uuid)).split(',') - if node_limit and target_node not in node_limit: + node_limit = zkhandler.readdata(zk_conn, '/domains/{}/node_limit'.format(dom_uuid)) + if node_limit and target_node not in node_limit.split(','): return False, 'ERROR: Specified node "{}" is not in the allowed list of nodes for VM "{}".'.format(target_node, domain) # Verify if node is current node @@ -500,8 +500,8 @@ def migrate_vm(zk_conn, domain, target_node, force_migrate, is_cli=False): return False, 'ERROR: Specified node "{}" is invalid.'.format(target_node) # Check if node is within the limit - node_limit = zkhandler.readdata(zk_conn, '/domains/{}/node_limit'.format(dom_uuid)).split(',') - if node_limit and target_node not in node_limit: + node_limit = zkhandler.readdata(zk_conn, '/domains/{}/node_limit'.format(dom_uuid)) + if node_limit and target_node not in node_limit.split(','): return False, 'ERROR: Specified node "{}" is not in the allowed list of nodes for VM "{}".'.format(target_node, domain) # Verify if node is current node