openstack
/
nova
Code Issues Proposed changes

Merge "Always delete NVRAM files when deleting instances"

This commit is contained in:
Zuul 2024-04-04 22:14:14 +00:00 committed by Gerrit Code Review
parent fcda90460f 406d590a36
commit 1bca24aeb0
4 changed files with 17 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
nova/tests/unit/virt/libvirt/test_driver.py
View File

@ -5407,13 +5407,6 @@ class LibvirtConnTestCase(test.NoDBTestCase,
'/usr/share/OVMF/OVMF_VARS.fd', cfg.os_nvram_template)
self.assertFalse(cfg.os_loader_secure)
def test_check_uefi_support_aarch64(self):
self.mock_uname.return_value = fakelibvirt.os_uname(
'Linux', '', '5.4.0-0-generic', '', fields.Architecture.AARCH64)
drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True)
image_meta = objects.ImageMeta.from_dict(self.test_image_meta)
self.assertTrue(drvr._check_uefi_support(image_meta))
def test_get_guest_config_with_block_device(self):
drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True)
@ -17990,7 +17983,7 @@ class LibvirtConnTestCase(test.NoDBTestCase,
self.assertEqual(2, mock_domain.ID.call_count)
mock_domain.destroy.assert_called_once_with()
mock_domain.undefineFlags.assert_called_once_with(1)
mock_domain.undefineFlags.assert_called_once_with(5)
mock_domain.undefine.assert_called_once_with()
mock_save.assert_called_once_with()
@ -18012,7 +18005,7 @@ class LibvirtConnTestCase(test.NoDBTestCase,
self.assertEqual(1, mock_domain.ID.call_count)
mock_domain.destroy.assert_called_once_with()
mock_domain.undefineFlags.assert_called_once_with(1)
mock_domain.undefineFlags.assert_called_once_with(5)
mock_domain.hasManagedSaveImage.assert_has_calls([mock.call(0)])
mock_domain.managedSaveRemove.assert_called_once_with(0)
mock_domain.undefine.assert_called_once_with()
@ -18037,7 +18030,7 @@ class LibvirtConnTestCase(test.NoDBTestCase,
self.assertEqual(1, mock_domain.ID.call_count)
mock_domain.destroy.assert_called_once_with()
mock_domain.undefineFlags.assert_called_once_with(1)
mock_domain.undefineFlags.assert_called_once_with(5)
mock_domain.hasManagedSaveImage.assert_has_calls([mock.call(0)])
mock_domain.undefine.assert_called_once_with()
mock_save.assert_called_once_with()
@ -18063,10 +18056,10 @@ class LibvirtConnTestCase(test.NoDBTestCase,
self.assertEqual(1, mock_domain.ID.call_count)
mock_domain.destroy.assert_called_once_with()
# NVRAM flag should not called only host support uefi
mock_domain.undefineFlags.assert_called_once_with(
fakelibvirt.VIR_DOMAIN_UNDEFINE_MANAGED_SAVE
)
mock_domain.undefineFlags.assert_has_calls([mock.call(
fakelibvirt.VIR_DOMAIN_UNDEFINE_MANAGED_SAVE |
fakelibvirt.VIR_DOMAIN_UNDEFINE_NVRAM
)])
mock_domain.undefine.assert_not_called()
mock_save.assert_called_once_with()
@ -18091,8 +18084,6 @@ class LibvirtConnTestCase(test.NoDBTestCase,
self.assertEqual(1, mock_domain.ID.call_count)
mock_domain.destroy.assert_called_once_with()
# undefineFlags should now be called with 5 as uefi supported
# by both host and guest
mock_domain.undefineFlags.assert_has_calls([mock.call(
fakelibvirt.VIR_DOMAIN_UNDEFINE_MANAGED_SAVE |
fakelibvirt.VIR_DOMAIN_UNDEFINE_NVRAM
@ -21031,7 +21022,7 @@ class LibvirtConnTestCase(test.NoDBTestCase,
resize_to = 1
expected_resize_to = resize_to * units.Gi
drvr._swap_volume(mock_guest, 'vdb', mock_conf, resize_to, None)
drvr._swap_volume(mock_guest, 'vdb', mock_conf, resize_to)
# Assert that virDomainBlockCopy is called
mock_dev.copy.assert_called_once_with(
@ -21071,7 +21062,7 @@ class LibvirtConnTestCase(test.NoDBTestCase,
# Assert that exception.VolumeRebaseFailed is raised
self.assertRaises(exception.VolumeRebaseFailed, drvr._swap_volume,
mock_guest, 'vdb', mock_conf, 0, None)
mock_guest, 'vdb', mock_conf, 0)
# Assert that virDomainBlockCopy is called
mock_dev.copy.assert_called_once_with(
@ -21090,9 +21081,6 @@ class LibvirtConnTestCase(test.NoDBTestCase,
swap_volume, disconnect_volume):
conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI())
instance = objects.Instance(**self.test_instance)
image_meta = objects.ImageMeta.from_dict(self.test_image_meta)
hw_firmware_type = image_meta.properties.get(
'hw_firmware_type')
old_connection_info = {'driver_volume_type': 'fake',
'serial': 'old-volume-id',
'data': {'device_path': '/fake-old-volume',
@ -21125,8 +21113,7 @@ class LibvirtConnTestCase(test.NoDBTestCase,
connect_volume.assert_called_once_with(self.context,
new_connection_info, instance)
swap_volume.assert_called_once_with(guest, 'vdb',
conf, 1, hw_firmware_type)
swap_volume.assert_called_once_with(guest, 'vdb', conf, 1)
disconnect_volume.assert_called_once_with(self.context,
old_connection_info,
instance)

5
nova/tests/unit/virt/libvirt/test_guest.py
View File

@ -134,11 +134,6 @@ class GuestTestCase(test.NoDBTestCase):
def test_delete_configuration(self):
self.guest.delete_configuration()
self.domain.undefineFlags.assert_called_once_with(
fakelibvirt.VIR_DOMAIN_UNDEFINE_MANAGED_SAVE)
def test_delete_configuration_with_nvram(self):
self.guest.delete_configuration(support_uefi=True)
self.domain.undefineFlags.assert_called_once_with(
fakelibvirt.VIR_DOMAIN_UNDEFINE_MANAGED_SAVE |
fakelibvirt.VIR_DOMAIN_UNDEFINE_NVRAM)

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

@ -1587,10 +1587,7 @@ class LibvirtDriver(driver.ComputeDriver):
try:
guest = self._host.get_guest(instance)
try:
hw_firmware_type = instance.image_meta.properties.get(
'hw_firmware_type')
support_uefi = self._check_uefi_support(hw_firmware_type)
guest.delete_configuration(support_uefi)
guest.delete_configuration()
except libvirt.libvirtError as e:
with excutils.save_and_reraise_exception() as ctxt:
errcode = e.get_error_code()
@ -2297,7 +2294,7 @@ class LibvirtDriver(driver.ComputeDriver):
self._disconnect_volume(context, connection_info, instance,
encryption=encryption)
def _swap_volume(self, guest, disk_dev, conf, resize_to, hw_firmware_type):
def _swap_volume(self, guest, disk_dev, conf, resize_to):
"""Swap existing disk with a new block device.
Call virDomainBlockRebase or virDomainBlockCopy with Libvirt >= 6.0.0
@ -2307,7 +2304,6 @@ class LibvirtDriver(driver.ComputeDriver):
:param: disk_dev: Device within the domain that is being swapped
:param: conf: LibvirtConfigGuestDisk object representing the new volume
:param: resize_to: Size of the dst volume, 0 if the same as the src
:param: hw_firmware_type: fields.FirmwareType if set in the imagemeta
"""
dev = guest.get_block_device(disk_dev)
@ -2328,8 +2324,7 @@ class LibvirtDriver(driver.ComputeDriver):
# undefine it. If any part of this block fails, the domain is
# re-defined regardless.
if guest.has_persistent_configuration():
support_uefi = self._check_uefi_support(hw_firmware_type)
guest.delete_configuration(support_uefi)
guest.delete_configuration()
try:
dev.copy(conf.to_xml(), reuse_ext=True)
@ -2394,12 +2389,9 @@ class LibvirtDriver(driver.ComputeDriver):
self._connect_volume(context, new_connection_info, instance)
conf = self._get_volume_config(
instance, new_connection_info, disk_info)
hw_firmware_type = instance.image_meta.properties.get(
'hw_firmware_type')
try:
self._swap_volume(guest, disk_dev, conf,
resize_to, hw_firmware_type)
self._swap_volume(guest, disk_dev, conf, resize_to)
except exception.VolumeRebaseFailed:
with excutils.save_and_reraise_exception():
self._disconnect_volume(context, new_connection_info, instance)
@ -3463,10 +3455,7 @@ class LibvirtDriver(driver.ComputeDriver):
# If any part of this block fails, the domain is
# re-defined regardless.
if guest.has_persistent_configuration():
hw_firmware_type = image_meta.properties.get(
'hw_firmware_type')
support_uefi = self._check_uefi_support(hw_firmware_type)
guest.delete_configuration(support_uefi)
guest.delete_configuration()
# NOTE (rmk): Establish a temporary mirror of our root disk and
# issue an abort once we have a complete copy.
@ -6796,13 +6785,6 @@ class LibvirtDriver(driver.ComputeDriver):
return flavor
return instance.flavor
def _check_uefi_support(self, hw_firmware_type):
caps = self._host.get_capabilities()
return self._host.supports_uefi and (
hw_firmware_type == fields.FirmwareType.UEFI or
caps.host.cpu.arch == fields.Architecture.AARCH64
)
def _check_secure_boot_support(
self,
arch: str,

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

@ -295,12 +295,11 @@ class Guest(object):
yield VCPUInfo(
id=vcpu[0], cpu=vcpu[3], state=vcpu[1], time=vcpu[2])
def delete_configuration(self, support_uefi=False):
def delete_configuration(self):
"""Undefines a domain from hypervisor."""
try:
flags = libvirt.VIR_DOMAIN_UNDEFINE_MANAGED_SAVE
if support_uefi:
flags |= libvirt.VIR_DOMAIN_UNDEFINE_NVRAM
flags |= libvirt.VIR_DOMAIN_UNDEFINE_NVRAM
self._domain.undefineFlags(flags)
except libvirt.libvirtError:
LOG.debug("Error from libvirt during undefineFlags for guest "