parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 111 Wiki Activity

Support VM list filtering by state

This commit is contained in:
Joshua Boniface 2019-03-20 11:31:54 -04:00
parent eec14ff177
commit 9f0d7c5bf8
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client-cli/pvc.py
View File

@ -579,13 +579,17 @@ def vm_info(domain, long_output):
)
@click.option(
'-t', '--target', 'target_node', default=None,
help='Limit list to specified node.'
help='Limit list to VMs on the specified node.'
)
@click.option(
'-s', '--state', 'target_state', default=None,
help='Limit list to VMs in the specified state.'
)
@click.option(
'-r', '--raw', 'raw', is_flag=True, default=False,
help='Display the raw list of VM names.'
help='Display the raw list of VM names only.'
)
def vm_list(target_node, limit, raw):
def vm_list(target_node, target_state, limit, raw):
"""
List all virtual machines in the cluster; optionally only match names matching regex LIMIT.
@ -593,7 +597,7 @@ def vm_list(target_node, limit, raw):
"""
zk_conn = pvc_common.startZKConnection(zk_host)
retcode, retmsg = pvc_vm.get_list(zk_conn, target_node, limit, raw)
retcode, retmsg = pvc_vm.get_list(zk_conn, target_node, target_state, limit, raw)
cleanup(retcode, retmsg, zk_conn)
###############################################################################

21
client-common/vm.py
View File

@ -494,11 +494,16 @@ def get_info(zk_conn, domain, long_output):
return True, ''
def get_list(zk_conn, node, limit, raw):
def get_list(zk_conn, node, state, limit, raw):
if node != None:
# Verify node is valid
common.verifyNode(zk_conn, node)
if state != None:
valid_states = [ 'start', 'restart', 'shutdown', 'stop', 'failed', 'migrate', 'unmigrate' ]
if not state in valid_states:
return False, 'VM state "{}" is not valid.'.format(state)
full_vm_list = zkhandler.listchildren(zk_conn, '/domains')
vm_list = []
vm_list_output = []
@ -529,35 +534,35 @@ def get_list(zk_conn, node, limit, raw):
# Check we don't match the limit
name = zkhandler.readdata(zk_conn, '/domains/{}'.format(vm))
vm_node[vm] = zkhandler.readdata(zk_conn, '/domains/{}/node'.format(vm))
vm_state[vm] = zkhandler.readdata(zk_conn, '/domains/{}/state'.format(vm))
# Handle limiting
if limit != None:
try:
if re.match(limit, vm) != None:
if node == None:
if node == None and state == None:
vm_list.append(vm)
else:
if vm_node[vm] == node:
if vm_node[vm] == node or vm_state[vm] == state:
vm_list.append(vm)
if re.match(limit, name) != None:
if node == None:
if node == None and state == None:
vm_list.append(vm)
else:
if vm_node[vm] == node:
if vm_node[vm] == node or vm_state[vm] == state:
vm_list.append(vm)
except Exception as e:
return False, 'Regex Error: {}'.format(e)
else:
# Check node to avoid unneeded ZK calls
if node == None:
if node == None and state == None:
vm_list.append(vm)
else:
if vm_node[vm] == node:
if vm_node[vm] == node or vm_state[vm] == state:
vm_list.append(vm)
# Gather information for printing
for vm in vm_list:
vm_state[vm] = zkhandler.readdata(zk_conn, '/domains/{}/state'.format(vm))
vm_lastnode = zkhandler.readdata(zk_conn, '/domains/{}/lastnode'.format(vm))
if vm_lastnode != '':
vm_migrated[vm] = 'from {}'.format(vm_lastnode)