parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 15 Pull Requests Projects Releases 106 Wiki Activity

Add description parsing to VM info

This commit is contained in:
Joshua Boniface 2018-09-02 22:19:15 -04:00
parent 057a9716ae
commit 4dbb8c7eb2
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pvc.py
View File

@ -93,6 +93,7 @@ def stopZKConnection(zk_conn):
def getDomainMainDetails(parsed_xml): def getDomainMainDetails(parsed_xml):
# Get the information we want from it # Get the information we want from it
duuid = str(parsed_xml.uuid) duuid = str(parsed_xml.uuid)
ddescription = str(parsed_xml.description)
dname = str(parsed_xml.name) dname = str(parsed_xml.name)
dmemory = str(parsed_xml.memory) dmemory = str(parsed_xml.memory)
dmemory_unit = str(parsed_xml.memory.attrib['unit']) dmemory_unit = str(parsed_xml.memory.attrib['unit'])
@ -106,7 +107,7 @@ def getDomainMainDetails(parsed_xml):
except: except:
dvcputopo = 'N/A' dvcputopo = 'N/A'
return duuid, dname, dmemory, dvcpu, dvcputopo return duuid, dname, ddescription, dmemory, dvcpu, dvcputopo
# Get long-format details # Get long-format details
def getDomainExtraDetails(parsed_xml): def getDomainExtraDetails(parsed_xml):
@ -202,7 +203,7 @@ def getInformationFromNode(zk_conn, node_name, long_output):
for domain in node_running_domains: for domain in node_running_domains:
try: try:
parsed_xml = getDomainXML(zk_conn, domain) parsed_xml = getDomainXML(zk_conn, domain)
duuid, dname, dmemory, dvcpu, dvcputopo = getDomainMainDetails(parsed_xml) duuid, dname, ddescription, dmemory, dvcpu, dvcputopo = getDomainMainDetails(parsed_xml)
node_mem_allocated += int(dmemory) node_mem_allocated += int(dmemory)
except AttributeError: except AttributeError:
click.echo('Error: Domain {} does not exist.'.format(domain)) click.echo('Error: Domain {} does not exist.'.format(domain))
@ -264,7 +265,7 @@ def getInformationFromXML(zk_conn, uuid, long_output):
try: try:
parsed_xml = getDomainXML(zk_conn, uuid) parsed_xml = getDomainXML(zk_conn, uuid)
duuid, dname, dmemory, dvcpu, dvcputopo = getDomainMainDetails(parsed_xml) duuid, dname, ddescription, dmemory, dvcpu, dvcputopo = getDomainMainDetails(parsed_xml)
except AttributeError: except AttributeError:
click.echo('Error: Domain {} does not exist.'.format(domain)) click.echo('Error: Domain {} does not exist.'.format(domain))
@ -282,6 +283,7 @@ def getInformationFromXML(zk_conn, uuid, long_output):
# Basic information # Basic information
ainformation.append('{}UUID:{} {}'.format(ansiiprint.purple(), ansiiprint.end(), duuid)) ainformation.append('{}UUID:{} {}'.format(ansiiprint.purple(), ansiiprint.end(), duuid))
ainformation.append('{}Name:{} {}'.format(ansiiprint.purple(), ansiiprint.end(), dname)) ainformation.append('{}Name:{} {}'.format(ansiiprint.purple(), ansiiprint.end(), dname))
ainformation.append('{}Description:{} {}'.format(ansiiprint.purple(), ansiiprint.end(), ddescription))
ainformation.append('{}Memory (MiB):{} {}'.format(ansiiprint.purple(), ansiiprint.end(), dmemory)) ainformation.append('{}Memory (MiB):{} {}'.format(ansiiprint.purple(), ansiiprint.end(), dmemory))
ainformation.append('{}vCPUs:{} {}'.format(ansiiprint.purple(), ansiiprint.end(), dvcpu)) ainformation.append('{}vCPUs:{} {}'.format(ansiiprint.purple(), ansiiprint.end(), dvcpu))
ainformation.append('{}Topology (S/C/T):{} {}'.format(ansiiprint.purple(), ansiiprint.end(), dvcputopo)) ainformation.append('{}Topology (S/C/T):{} {}'.format(ansiiprint.purple(), ansiiprint.end(), dvcputopo))
@ -1490,6 +1492,7 @@ def get_vm_list(hypervisor, limit):
vm_migrated = {} vm_migrated = {}
vm_uuid = {} vm_uuid = {}
vm_name = {} vm_name = {}
vm_description = {}
vm_memory = {} vm_memory = {}
vm_vcpu = {} vm_vcpu = {}
@ -1523,7 +1526,7 @@ def get_vm_list(hypervisor, limit):
try: 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_description[vm], vm_memory[vm], vm_vcpu[vm], vm_vcputopo = getDomainMainDetails(vm_xml)
except AttributeError: except AttributeError:
click.echo('Error: Domain {} does not exist.'.format(domain)) click.echo('Error: Domain {} does not exist.'.format(domain))