diff options
| author | Dmitry Tantsur <dtantsur@protonmail.com> | 2021-05-17 16:10:10 +0200 |
|---|---|---|
| committer | Dmitry Tantsur <dtantsur@protonmail.com> | 2021-05-17 16:43:34 +0200 |
| commit | e51404c8e709e0b8b1ee0430869a9dd7083cf048 (patch) | |
| tree | fa9fbdbe5dbadc33bdfb26d7f3713ebde4ba8ab5 /ironic/tests/unit/drivers/modules/test_image_utils.py | |
| parent | 2a73f5a84e06b370d0b04997cc0787497e111642 (diff) | |
| download | ironic-e51404c8e709e0b8b1ee0430869a9dd7083cf048.tar.gz | |
Clean up kernel_append_params for Redfish and iLO
Currently handling of kernel_append_params is very inconsistent. This
change applies a straightforward process:
1. instance_info[kernel_append_params]
2. driver_info[kernel_append_params]
3. [$driver]kernel_append_params
The existing ilo_kernel_append_params is declared but never implemented,
so it's removed without deprecation in favor of the new option.
Story: #2008902
Task: #42470
Task: #42471
Change-Id: I0fcd7c63a4bc41110eb7f4cd4031580ef98d9a19
Diffstat (limited to 'ironic/tests/unit/drivers/modules/test_image_utils.py')
| -rw-r--r-- | ironic/tests/unit/drivers/modules/test_image_utils.py | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/ironic/tests/unit/drivers/modules/test_image_utils.py b/ironic/tests/unit/drivers/modules/test_image_utils.py index c527c53dc..1e105a08f 100644 --- a/ironic/tests/unit/drivers/modules/test_image_utils.py +++ b/ironic/tests/unit/drivers/modules/test_image_utils.py @@ -553,6 +553,29 @@ class RedfishImageUtilsTestCase(db_base.DbTestCase): root_uuid='1be26c0b-03f2-4d2e-ae87-c02d7f33c123', base_iso='/path/to/baseiso', inject_files=None) + @mock.patch.object(image_utils.ImageHandler, 'publish_image', + autospec=True) + @mock.patch.object(images, 'create_boot_iso', autospec=True) + def test__prepare_iso_image_kernel_params_driver_info( + self, mock_create_boot_iso, mock_publish_image): + with task_manager.acquire(self.context, self.node.uuid, + shared=True) as task: + kernel_params = 'network-config=base64-cloudinit-blob' + + task.node.driver_info['kernel_append_params'] = kernel_params + + image_utils._prepare_iso_image( + task, 'http://kernel/img', 'http://ramdisk/img', + bootloader_href=None, root_uuid=task.node.uuid, + base_iso='/path/to/baseiso') + + mock_create_boot_iso.assert_called_once_with( + mock.ANY, mock.ANY, 'http://kernel/img', 'http://ramdisk/img', + boot_mode='bios', esp_image_href=None, + kernel_params=kernel_params, + root_uuid='1be26c0b-03f2-4d2e-ae87-c02d7f33c123', + base_iso='/path/to/baseiso', inject_files=None) + def test__prepare_iso_image_bootable_iso(self): with task_manager.acquire(self.context, self.node.uuid, shared=True) as task: |