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

Ignore and print about AttributeErrors from invalid domains 

Addresses #16 pending longterm fix
This commit is contained in:
Joshua Boniface 2018-08-20 12:03:53 -04:00
parent 37906fdd25
commit cffb9cff5c
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pvc.py
View File

@ -200,8 +200,11 @@ def getInformationFromNode(zk_conn, node_name, long_output):
node_running_domains = zk_conn.get('/nodes/{}/runningdomains'.format(node_name))[0].decode('ascii').split() node_running_domains = zk_conn.get('/nodes/{}/runningdomains'.format(node_name))[0].decode('ascii').split()
node_mem_allocated = 0 node_mem_allocated = 0
for domain in node_running_domains: for domain in node_running_domains:
try:
parsed_xml = getDomainXML(zk_conn, domain) parsed_xml = getDomainXML(zk_conn, domain)
duuid, dname, dmemory, dvcpu, dvcputopo = getDomainMainDetails(parsed_xml) duuid, dname, dmemory, dvcpu, dvcputopo = getDomainMainDetails(parsed_xml)
except AttributeError:
click.echo('Error: Domain {} does not exist.'.format(domain))
node_mem_allocated += int(dmemory) node_mem_allocated += int(dmemory)
if node_daemon_state == 'run': if node_daemon_state == 'run':
@ -259,9 +262,12 @@ def getInformationFromXML(zk_conn, uuid, long_output):
if dlasthypervisor == '': if dlasthypervisor == '':
dlasthypervisor = 'N/A' dlasthypervisor = 'N/A'
try:
parsed_xml = getDomainXML(zk_conn, uuid) parsed_xml = getDomainXML(zk_conn, uuid)
duuid, dname, dmemory, dvcpu, dvcputopo = getDomainMainDetails(parsed_xml) duuid, dname, dmemory, dvcpu, dvcputopo = getDomainMainDetails(parsed_xml)
except AttributeError:
click.echo('Error: Domain {} does not exist.'.format(domain))
if long_output == True: if long_output == True:
dtype, darch, dmachine, dconsole, demulator = getDomainExtraDetails(parsed_xml) dtype, darch, dmachine, dconsole, demulator = getDomainExtraDetails(parsed_xml)
dfeatures = getDomainCPUFeatures(parsed_xml) dfeatures = getDomainCPUFeatures(parsed_xml)
@ -691,8 +697,11 @@ def node_list(limit):
node_running_domains[node_name] = zk_conn.get('/nodes/{}/runningdomains'.format(node_name))[0].decode('ascii').split() node_running_domains[node_name] = zk_conn.get('/nodes/{}/runningdomains'.format(node_name))[0].decode('ascii').split()
node_mem_allocated[node_name] = 0 node_mem_allocated[node_name] = 0
for domain in node_running_domains[node_name]: for domain in node_running_domains[node_name]:
try:
parsed_xml = getDomainXML(zk_conn, domain) parsed_xml = getDomainXML(zk_conn, domain)
duuid, dname, dmemory, dvcpu, dvcputopo = getDomainMainDetails(parsed_xml) duuid, dname, dmemory, dvcpu, dvcputopo = getDomainMainDetails(parsed_xml)
except AttributeError:
click.echo('Error: Domain {} does not exist.'.format(domain))
node_mem_allocated[node_name] += int(dmemory) node_mem_allocated[node_name] += int(dmemory)
# Determine optimal column widths # Determine optimal column widths
@ -1504,8 +1513,11 @@ def get_vm_list(hypervisor, limit):
else: else:
vm_migrated[vm] = 'no' vm_migrated[vm] = 'no'
try:
vm_xml = getDomainXML(zk_conn, vm) vm_xml = getDomainXML(zk_conn, vm)
vm_uuid[vm], vm_name[vm], vm_memory[vm], vm_vcpu[vm], vm_vcputopo = getDomainMainDetails(vm_xml) vm_uuid[vm], vm_name[vm], vm_memory[vm], vm_vcpu[vm], vm_vcputopo = getDomainMainDetails(vm_xml)
except AttributeError:
click.echo('Error: Domain {} does not exist.'.format(domain))
# Determine optimal column widths # Determine optimal column widths
# Dynamic columns: node_name, hypervisor, migrated # Dynamic columns: node_name, hypervisor, migrated