Merge "Enables boot modes switching with Anaconda deploy for ilo driver"

3 files changed, 95 insertions, 0 deletions

diff --git a/ironic/drivers/modules/ilo/boot.py b/ironic/drivers/modules/ilo/boot.py
index e29852981..fe2cef02a 100644
--- a/ironic/drivers/modules/ilo/boot.py
+++ b/ironic/drivers/modules/ilo/boot.py
@@ -604,6 +604,12 @@ class IloPXEBoot(pxe.PXEBoot):
         else:
             # Volume boot in BIOS boot mode is handled using
             # PXE boot interface
+            boot_option = deploy_utils.get_boot_option(task.node)
+            if boot_option == "kickstart":
+                if task.node.provision_state in (states.DEPLOYING,
+                                                 states.RESCUING,
+                                                 states.CLEANING):
+                    prepare_node_for_deploy(task)
             super(IloPXEBoot, self).prepare_instance(task)
 
     @METRICS.timer('IloPXEBoot.clean_up_instance')
@@ -696,6 +702,12 @@ class IloiPXEBoot(ipxe.iPXEBoot):
         else:
             # Volume boot in BIOS boot mode is handled using
             # PXE boot interface
+            boot_option = deploy_utils.get_boot_option(task.node)
+            if boot_option == "kickstart":
+                if task.node.provision_state in (states.DEPLOYING,
+                                                 states.RESCUING,
+                                                 states.CLEANING):
+                    prepare_node_for_deploy(task)
             super(IloiPXEBoot, self).prepare_instance(task)
 
     @METRICS.timer('IloiPXEBoot.clean_up_instance')
diff --git a/ironic/tests/unit/drivers/modules/ilo/test_boot.py b/ironic/tests/unit/drivers/modules/ilo/test_boot.py
index 8aa6f78da..8ebaa14fa 100644
--- a/ironic/tests/unit/drivers/modules/ilo/test_boot.py
+++ b/ironic/tests/unit/drivers/modules/ilo/test_boot.py
@@ -1132,6 +1132,45 @@ class IloPXEBootTestCase(test_common.BaseIloTest):
             self.assertIsNone(task.node.driver_internal_info.get(
                               'ilo_uefi_iscsi_boot'))
 
+    @mock.patch.object(ilo_boot, 'prepare_node_for_deploy', spec_set=True,
+                       autospec=True)
+    @mock.patch.object(deploy_utils, 'get_boot_option', autospec=True)
+    @mock.patch.object(deploy_utils, 'is_iscsi_boot',
+                       spec_set=True, autospec=True)
+    @mock.patch.object(boot_mode_utils, 'get_boot_mode_for_deploy',
+                       spec_set=True, autospec=True)
+    @mock.patch.object(ilo_common, 'update_boot_mode', spec_set=True,
+                       autospec=True)
+    @mock.patch.object(pxe.PXEBoot, 'prepare_instance', spec_set=True,
+                       autospec=True)
+    def _test_prepare_instance_anaconda(self, pxe_prepare_instance_mock,
+                                        update_boot_mode_mock,
+                                        get_boot_mode_mock,
+                                        is_iscsi_boot_mock,
+                                        mock_get_boot_opt,
+                                        mock_prep_node_fr_deploy, prov_state):
+        with task_manager.acquire(self.context, self.node.uuid,
+                                  shared=False) as task:
+            task.node.provision_state = prov_state
+            mock_get_boot_opt.return_value = 'kickstart'
+            is_iscsi_boot_mock.return_value = False
+            get_boot_mode_mock.return_value = 'uefi'
+            task.driver.boot.prepare_instance(task)
+            update_boot_mode_mock.assert_called_once_with(task)
+            pxe_prepare_instance_mock.assert_called_once_with(mock.ANY, task)
+            self.assertIsNone(task.node.driver_internal_info.get(
+                              'ilo_uefi_iscsi_boot'))
+            mock_prep_node_fr_deploy.assert_called_once_with(task)
+
+    def test_prepare_instance_anaconda_deploying(self):
+        self._test_prepare_instance_anaconda(prov_state=states.DEPLOYING)
+
+    def test_prepare_instance_anaconda_rescuing(self):
+        self._test_prepare_instance_anaconda(prov_state=states.RESCUING)
+
+    def test_prepare_instance_anaconda_cleaning(self):
+        self._test_prepare_instance_anaconda(prov_state=states.CLEANING)
+
     @mock.patch.object(deploy_utils, 'is_iscsi_boot',
                        spec_set=True, autospec=True)
     @mock.patch.object(boot_mode_utils, 'get_boot_mode_for_deploy',
@@ -1299,6 +1338,45 @@ class IloiPXEBootTestCase(test_common.BaseIloTest):
             self.assertIsNone(task.node.driver_internal_info.get(
                               'ilo_uefi_iscsi_boot'))
 
+    @mock.patch.object(ilo_boot, 'prepare_node_for_deploy', spec_set=True,
+                       autospec=True)
+    @mock.patch.object(deploy_utils, 'get_boot_option', autospec=True)
+    @mock.patch.object(deploy_utils, 'is_iscsi_boot',
+                       spec_set=True, autospec=True)
+    @mock.patch.object(boot_mode_utils, 'get_boot_mode_for_deploy',
+                       spec_set=True, autospec=True)
+    @mock.patch.object(ilo_common, 'update_boot_mode', spec_set=True,
+                       autospec=True)
+    @mock.patch.object(ipxe.iPXEBoot, 'prepare_instance', spec_set=True,
+                       autospec=True)
+    def _test_prepare_instance_anaconda(self, pxe_prepare_instance_mock,
+                                        update_boot_mode_mock,
+                                        get_boot_mode_mock,
+                                        is_iscsi_boot_mock,
+                                        mock_get_boot_opt,
+                                        mock_prep_node_fr_deploy, prov_state):
+        with task_manager.acquire(self.context, self.node.uuid,
+                                  shared=False) as task:
+            task.node.provision_state = prov_state
+            mock_get_boot_opt.return_value = 'kickstart'
+            is_iscsi_boot_mock.return_value = False
+            get_boot_mode_mock.return_value = 'uefi'
+            task.driver.boot.prepare_instance(task)
+            update_boot_mode_mock.assert_called_once_with(task)
+            pxe_prepare_instance_mock.assert_called_once_with(mock.ANY, task)
+            self.assertIsNone(task.node.driver_internal_info.get(
+                              'ilo_uefi_iscsi_boot'))
+            mock_prep_node_fr_deploy.assert_called_once_with(task)
+
+    def test_prepare_instance_anaconda_deploying(self):
+        self._test_prepare_instance_anaconda(prov_state=states.DEPLOYING)
+
+    def test_prepare_instance_anaconda_rescuing(self):
+        self._test_prepare_instance_anaconda(prov_state=states.RESCUING)
+
+    def test_prepare_instance_anaconda_cleaning(self):
+        self._test_prepare_instance_anaconda(prov_state=states.CLEANING)
+
     @mock.patch.object(deploy_utils, 'is_iscsi_boot',
                        spec_set=True, autospec=True)
     @mock.patch.object(boot_mode_utils, 'get_boot_mode_for_deploy',
diff --git a/releasenotes/notes/fix_boot_mode_switch_with_anaconda_deploy_with_ilo_drivers-16637adb62f0ed2f.yaml b/releasenotes/notes/fix_boot_mode_switch_with_anaconda_deploy_with_ilo_drivers-16637adb62f0ed2f.yaml
new file mode 100644
index 000000000..c3096be79
--- /dev/null
+++ b/releasenotes/notes/fix_boot_mode_switch_with_anaconda_deploy_with_ilo_drivers-16637adb62f0ed2f.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Enables boot mode switching during anaconda deploy for ``ilo``
+    and ``ilo5`` hardware types.