saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

virt.capabilities refactoring

Browse source 
Extract the libvirt-handling code from virt.capabilities into a
virt._capabilities function accepting an opened libvirt connection.
This allows reusing the code in other functions with easy connection
handling.
This commit is contained in:
Cédric Bosdonnat 2020-04-02 15:05:29 +02:00 • committed by Daniel Wozniak
parent 5ec45b7771
commit 261d2ef7bf
1 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
salt/modules/virt.py
View file

@ -4359,6 +4359,20 @@ def _parse_caps_host(host):
return result
def _capabilities(conn):
"""
Return the hypervisor connection capabilities.
:param conn: opened libvirt connection to use
"""
caps = ElementTree.fromstring(conn.getCapabilities())
return {
"host": _parse_caps_host(caps.find("host")),
"guests": [_parse_caps_guest(guest) for guest in caps.findall("guest")],
}
def capabilities(**kwargs):
"""
Return the hypervisor connection capabilities.
@ -4376,13 +4390,13 @@ def capabilities(**kwargs):
salt '*' virt.capabilities
"""
conn = __get_conn(**kwargs)
caps = ElementTree.fromstring(conn.getCapabilities())
conn.close()
return {
"host": _parse_caps_host(caps.find("host")),
"guests": [_parse_caps_guest(guest) for guest in caps.findall("guest")],
}
try:
caps = _capabilities(conn)
except libvirt.libvirtError as err:
raise CommandExecutionError(str(err))
finally:
conn.close()
return caps
def _parse_caps_enum(node):