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

Port VM functions to read_many

This commit is contained in:
Joshua Boniface 2023-12-11 03:34:36 -05:00
parent 032d3ebf18
commit 741dafb26b
1 changed files with 41 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
daemon-common/common.py
View File

@ -401,13 +401,23 @@ def getDomainTags(zkhandler, dom_uuid):
""" """
tags = list() tags = list()
for tag in zkhandler.children(("domain.meta.tags", dom_uuid)): all_tags = zkhandler.children(("domain.meta.tags", dom_uuid))
tag_type = zkhandler.read(("domain.meta.tags", dom_uuid, "tag.type", tag))
protected = bool( tag_reads = list()
strtobool( for tag in all_tags:
zkhandler.read(("domain.meta.tags", dom_uuid, "tag.protected", tag)) tag_reads += [
) ("domain.meta.tags", dom_uuid, "tag.type", tag),
) ("domain.meta.tags", dom_uuid, "tag.protected", tag),
]
all_tag_data = zkhandler.read_many(tag_reads)
for tidx, tag in enumerate(all_tags):
# Split the large list of return values by the IDX of this tag
# Each tag result is 2 fields long
pos_start = tidx * 2
pos_end = tidx * 2 + 2
tag_type, protected = tuple(all_tag_data[pos_start:pos_end])
protected = bool(strtobool(protected))
tags.append({"name": tag, "type": tag_type, "protected": protected}) tags.append({"name": tag, "type": tag_type, "protected": protected})
return tags return tags
@ -466,10 +476,25 @@ def getInformationFromXML(zkhandler, uuid):
Gather information about a VM from the Libvirt XML configuration in the Zookeper database Gather information about a VM from the Libvirt XML configuration in the Zookeper database
and return a dict() containing it. and return a dict() containing it.
""" """
domain_state = zkhandler.read(("domain.state", uuid)) (
domain_node = zkhandler.read(("domain.node", uuid)) domain_state,
domain_lastnode = zkhandler.read(("domain.last_node", uuid)) domain_node,
domain_failedreason = zkhandler.read(("domain.failed_reason", uuid)) domain_lastnode,
domain_failedreason,
domain_profile,
domain_vnc,
stats_data,
) = zkhandler.read_many(
[
("domain.state", uuid),
("domain.node", uuid),
("domain.last_node", uuid),
("domain.failed_reason", uuid),
("domain.profile", uuid),
("domain.console.vnc", uuid),
("domain.stats", uuid),
]
)
( (
domain_node_limit, domain_node_limit,
@ -477,19 +502,17 @@ def getInformationFromXML(zkhandler, uuid):
domain_node_autostart, domain_node_autostart,
domain_migration_method, domain_migration_method,
) = getDomainMetadata(zkhandler, uuid) ) = getDomainMetadata(zkhandler, uuid)
domain_tags = getDomainTags(zkhandler, uuid)
domain_profile = zkhandler.read(("domain.profile", uuid))
domain_vnc = zkhandler.read(("domain.console.vnc", uuid)) domain_tags = getDomainTags(zkhandler, uuid)
if domain_vnc: if domain_vnc:
domain_vnc_listen, domain_vnc_port = domain_vnc.split(":") domain_vnc_listen, domain_vnc_port = domain_vnc.split(":")
else: else:
domain_vnc_listen = "None" domain_vnc_listen = None
domain_vnc_port = "None" domain_vnc_port = None
parsed_xml = getDomainXML(zkhandler, uuid) parsed_xml = getDomainXML(zkhandler, uuid)
stats_data = zkhandler.read(("domain.stats", uuid))
if stats_data is not None: if stats_data is not None:
try: try:
stats_data = loads(stats_data) stats_data = loads(stats_data)
@ -506,6 +529,7 @@ def getInformationFromXML(zkhandler, uuid):
domain_vcpu, domain_vcpu,
domain_vcputopo, domain_vcputopo,
) = getDomainMainDetails(parsed_xml) ) = getDomainMainDetails(parsed_xml)
domain_networks = getDomainNetworks(parsed_xml, stats_data) domain_networks = getDomainNetworks(parsed_xml, stats_data)
( (