diff options
| author | Zuul <zuul@review.openstack.org> | 2019-02-01 12:09:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-02-01 12:09:21 +0000 |
| commit | 69baaca23d63ba5df959aa8337f30643ad807573 (patch) | |
| tree | bc75eec18d5dbb9080cd9a1a5044d81b108a41bc /ironic/tests/unit/drivers/modules/test_ipxe.py | |
| parent | 5bb519c4afb5495a4bf41e7811bd71f72a19daef (diff) | |
| parent | 2aaa6744ca80692ac2edd4193f5b117c004d60d3 (diff) | |
| download | ironic-69baaca23d63ba5df959aa8337f30643ad807573.tar.gz | |
Merge "Fix test for 'force_persistent_boot_device' (i)PXE driver_info option"
Diffstat (limited to 'ironic/tests/unit/drivers/modules/test_ipxe.py')
| -rw-r--r-- | ironic/tests/unit/drivers/modules/test_ipxe.py | 40 |
1 files changed, 19 insertions, 21 deletions
diff --git a/ironic/tests/unit/drivers/modules/test_ipxe.py b/ironic/tests/unit/drivers/modules/test_ipxe.py index c351b9a12..2a556c6d6 100644 --- a/ironic/tests/unit/drivers/modules/test_ipxe.py +++ b/ironic/tests/unit/drivers/modules/test_ipxe.py @@ -233,7 +233,8 @@ class iPXEBootTestCase(db_base.DbTestCase): ipxe_use_swift=False, whole_disk_image=False, mode='deploy', - node_boot_mode=None): + node_boot_mode=None, + persistent=False): mock_build_pxe.return_value = {} kernel_label = '%s_kernel' % mode ramdisk_label = '%s_ramdisk' % mode @@ -267,7 +268,7 @@ class iPXEBootTestCase(db_base.DbTestCase): get_boot_mode_mock.assert_called_once_with(task) set_boot_device_mock.assert_called_once_with(task, boot_devices.PXE, - persistent=False) + persistent=persistent) if ipxe_use_swift: if whole_disk_image: self.assertFalse(mock_cache_r_k.called) @@ -307,6 +308,22 @@ class iPXEBootTestCase(db_base.DbTestCase): self.node.save() self._test_prepare_ramdisk() + def test_prepare_ramdisk_force_persistent_boot_device_enabled(self): + self.node.provision_state = states.DEPLOYING + driver_info = self.node.driver_info + driver_info['force_persistent_boot_device'] = True + self.node.driver_info = driver_info + self.node.save() + self._test_prepare_ramdisk(persistent=True) + + def test_prepare_ramdisk_force_persistent_boot_device_disabled(self): + self.node.provision_state = states.DEPLOYING + driver_info = self.node.driver_info + driver_info['force_persistent_boot_device'] = False + self.node.driver_info = driver_info + self.node.save() + self._test_prepare_ramdisk() + def test_prepare_ramdisk_rescue(self): self.node.provision_state = states.RESCUING self.node.save() @@ -739,25 +756,6 @@ class iPXEBootTestCase(db_base.DbTestCase): @mock.patch.object(manager_utils, 'node_set_boot_device', autospec=True) @mock.patch.object(pxe_utils, 'clean_up_pxe_config', autospec=True) - def test_is_force_persistent_boot_device_enabled( - self, clean_up_pxe_config_mock, set_boot_device_mock): - with task_manager.acquire(self.context, self.node.uuid) as task: - instance_info = task.node.instance_info - instance_info['capabilities'] = {'boot_option': 'local'} - task.node.instance_info = instance_info - task.node.save() - task.driver.boot.prepare_instance(task) - clean_up_pxe_config_mock.assert_called_once_with( - task, ipxe_enabled=True) - driver_info = task.node.driver_info - driver_info['force_persistent _boot_device'] = True - task.node.driver_info = driver_info - set_boot_device_mock.assert_called_once_with(task, - boot_devices.DISK, - persistent=True) - - @mock.patch.object(manager_utils, 'node_set_boot_device', autospec=True) - @mock.patch.object(pxe_utils, 'clean_up_pxe_config', autospec=True) def test_prepare_instance_localboot_active(self, clean_up_pxe_config_mock, set_boot_device_mock): self.node.provision_state = states.ACTIVE |