openstack/nova
Code Issues Proposed changes

Merge "hardware: Fix image_meta.id within get_mem_encryption_constraint"

Browse Source
This commit is contained in:
Zuul
2024-07-16 04:39:35 +00:00
committed by Gerrit Code Review
parent c6d8c6972d e6f8bf5ff5
commit e82854dc8c
2 changed files with 72 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
nova/tests/unit/virt/test_hardware.py
View File

@@ -5503,6 +5503,16 @@ class MemEncryptionRequestedWithInvalidMachineTypeTestCase(
enc_image_prop,
image_props, error_data)
def _test_encrypted_memory_support_pc_image_id(self, image_meta,
error_data):
extra_specs = {'hw:mem_encryption': True}
flavor = objects.Flavor(name=self.flavor_name,
extra_specs=extra_specs)
exc = self.assertRaises(self.expected_exception,
hw.get_mem_encryption_constraint,
flavor, image_meta)
self.assertEqual(self.expected_error % error_data, str(exc))
def test_flavor_requires_encrypted_memory_support_pc(self):
for extra_spec in ('1', 'true', 'True'):
self._test_encrypted_memory_support_pc(extra_spec, None)
@@ -5517,6 +5527,31 @@ class MemEncryptionRequestedWithInvalidMachineTypeTestCase(
self._test_encrypted_memory_support_pc(
extra_spec, image_prop)
def test_encrypted_memory_support_pc_no_image_id(self):
image_props = {'hw_mem_encryption': True,
'hw_firmware_type': 'uefi',
'hw_machine_type': 'pc'}
image_meta = fake_image_obj(
{'name': self.image_name}, {}, image_props)
error_data = {'image_id': '<no-id>',
'image_name': self.image_name,
'mtype': 'pc'}
self._test_encrypted_memory_support_pc_image_id(image_meta,
error_data)
def test_encrypted_memory_support_pc_has_image_id(self):
image_props = {'hw_mem_encryption': True,
'hw_firmware_type': 'uefi',
'hw_machine_type': 'pc'}
image_meta = fake_image_obj(
{'id': self.image_id, 'name': self.image_name},
{}, image_props)
error_data = {'image_id': self.image_id,
'image_name': self.image_name,
'mtype': 'pc'}
self._test_encrypted_memory_support_pc_image_id(image_meta,
error_data)
class MemEncryptionRequiredTestCase(test.NoDBTestCase):
flavor_name = "m1.faketiny"
@@ -5593,6 +5628,34 @@ class MemEncryptionRequiredTestCase(test.NoDBTestCase):
hw.get_mem_encryption_constraint, flavor,
image_meta)
@mock.patch.object(hw, 'LOG')
def test_encrypted_memory_support_no_id_for_volume(self, mock_log):
extra_specs = {'hw:mem_encryption': True}
flavor = objects.Flavor(name=self.flavor_name,
extra_specs=extra_specs)
image_props = {'hw_mem_encryption': True,
'hw_firmware_type': 'uefi'}
image_meta = objects.ImageMeta.from_dict({
'min_disk': 0,
'min_ram': 0,
'properties': image_props,
'size': 0,
'status': 'active'})
self.assertTrue(hw.get_mem_encryption_constraint(flavor,
image_meta))
requesters = "hw:mem_encryption extra spec in %s flavor and " \
"hw_mem_encryption property of image %s" % \
(self.flavor_name, '<no-id>')
# Confirm that it can handle the situation that there is
# no image_id when booting from volume. We set it to
# '<no-id>' that we can detect later.
mock_log.debug.assert_has_calls([
mock.call("Memory encryption requested by %s", requesters)
])
class PCINUMAAffinityPolicyTest(test.NoDBTestCase):