openstack/nova
Code Issues Proposed changes

Merge "Follow up type hints for a634103"

Browse Source
This commit is contained in:
Zuul 2021-04-21 13:02:15 +00:00 committed by Gerrit Code Review
commit 3e88f99ed4
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
nova/virt/libvirt/guest.py
View File

@ -231,13 +231,16 @@ class Guest(object):
return interfaces return interfaces
def get_interface_by_cfg(self, cfg, from_persistent_config=False): def get_interface_by_cfg(
self,
cfg: vconfig.LibvirtConfigGuestDevice,
from_persistent_config: bool = False
) -> ty.Optional[vconfig.LibvirtConfigGuestDevice]:
"""Lookup a full LibvirtConfigGuestDevice with """Lookup a full LibvirtConfigGuestDevice with
LibvirtConfigGuesDevice generated LibvirtConfigGuesDevice generated
by nova.virt.libvirt.vif.get_config. by nova.virt.libvirt.vif.get_config.
:param cfg: config object that represents the guest interface. :param cfg: config object that represents the guest interface.
:type cfg: a subtype of LibvirtConfigGuestDevice object
:param from_persistent_config: query the device from the persistent :param from_persistent_config: query the device from the persistent
domain instead of the live domain configuration domain instead of the live domain configuration
:returns: nova.virt.libvirt.config.LibvirtConfigGuestDevice instance :returns: nova.virt.libvirt.config.LibvirtConfigGuestDevice instance
@ -255,6 +258,7 @@ class Guest(object):
# equality check based on available information on nova side # equality check based on available information on nova side
if cfg == interface: if cfg == interface:
return interface return interface
return None
def get_vcpus_info(self): def get_vcpus_info(self):
"""Returns virtual cpus information of guest. """Returns virtual cpus information of guest.
@ -341,10 +345,18 @@ class Guest(object):
config.parse_str(self._domain.XMLDesc(0)) config.parse_str(self._domain.XMLDesc(0))
return config return config
def get_disk(self, device, from_persistent_config=False): def get_disk(
self,
device: str,
from_persistent_config: bool = False
) -> ty.Optional[vconfig.LibvirtConfigGuestDisk]:
"""Returns the disk mounted at device """Returns the disk mounted at device
:returns LivirtConfigGuestDisk: mounted at device or None :param device: the name of either the source or the target device
:param from_persistent_config: query the device from the persistent
domain (i.e. inactive XML configuration that'll be used on next
start of the domain) instead of the live domain configuration
:returns LibvirtConfigGuestDisk: mounted at device or None
""" """
flags = 0 flags = 0
if from_persistent_config: if from_persistent_config:
@ -367,6 +379,8 @@ class Guest(object):
conf.parse_dom(node) conf.parse_dom(node)
return conf return conf
return None
def get_all_disks(self): def get_all_disks(self):
"""Returns all the disks for a guest """Returns all the disks for a guest
@ -375,7 +389,11 @@ class Guest(object):
return self.get_all_devices(vconfig.LibvirtConfigGuestDisk) return self.get_all_devices(vconfig.LibvirtConfigGuestDisk)
def get_all_devices(self, devtype=None, from_persistent_config=False): def get_all_devices(
self,
devtype: vconfig.LibvirtConfigGuestDevice = None,
from_persistent_config: bool = False
) -> ty.List[vconfig.LibvirtConfigGuestDevice]:
"""Returns all devices for a guest """Returns all devices for a guest
:param devtype: a LibvirtConfigGuestDevice subclass class :param devtype: a LibvirtConfigGuestDevice subclass class