diff options
Diffstat (limited to 'ironic')
| -rw-r--r-- | ironic/conf/drac.py | 9 | ||||
| -rw-r--r-- | ironic/drivers/modules/drac/management.py | 27 | ||||
| -rw-r--r-- | ironic/tests/unit/drivers/modules/drac/test_management.py | 42 |
3 files changed, 76 insertions, 2 deletions
diff --git a/ironic/conf/drac.py b/ironic/conf/drac.py index f132574be..7696bb03f 100644 --- a/ironic/conf/drac.py +++ b/ironic/conf/drac.py @@ -21,7 +21,14 @@ opts = [ min=1, help=_('Interval (in seconds) between periodic RAID job status ' 'checks to determine whether the asynchronous RAID ' - 'configuration was successfully finished or not.')) + 'configuration was successfully finished or not.')), + cfg.IntOpt('boot_device_job_status_timeout', + default=30, + min=1, + help=_('Maximum amount of time (in seconds) to wait for ' + 'the boot device configuration job to transition ' + 'to the correct state to allow a reboot or power ' + 'on to complete.')) ] diff --git a/ironic/drivers/modules/drac/management.py b/ironic/drivers/modules/drac/management.py index eded50bf6..a4c1a8faf 100644 --- a/ironic/drivers/modules/drac/management.py +++ b/ironic/drivers/modules/drac/management.py @@ -20,6 +20,8 @@ DRAC management interface """ +import time + from ironic_lib import metrics_utils from oslo_log import log as logging from oslo_utils import importutils @@ -28,10 +30,12 @@ from ironic.common import boot_devices from ironic.common import exception from ironic.common.i18n import _ from ironic.conductor import task_manager +from ironic.conf import CONF from ironic.drivers import base from ironic.drivers.modules.drac import common as drac_common from ironic.drivers.modules.drac import job as drac_job + drac_exceptions = importutils.try_import('dracclient.exceptions') LOG = logging.getLogger(__name__) @@ -246,7 +250,28 @@ def set_boot_device(node, device, persistent=False): "'%(device)s' for node %(node_id)s.") % {'device': device, 'node_id': node.uuid}) - client.commit_pending_bios_changes() + job_id = client.commit_pending_bios_changes() + job_entry = client.get_job(job_id) + + timeout = CONF.drac.boot_device_job_status_timeout + end_time = time.time() + timeout + + LOG.debug('Waiting for BIOS configuration job %{job_id}s ' + 'to be scheduled for node %{node}s', + {'job_id': job_id, + 'node': node.uuid}) + + while job_entry.status != "Scheduled": + if time.time() >= end_time: + raise exception.DracOperationError( + error=_( + 'Timed out waiting BIOS configuration for job ' + '%(job)s to reach Scheduled state. Job is still ' + 'in %(status)s state.') % + {'job': job_id, 'status': job_entry.status}) + time.sleep(3) + job_entry = client.get_job(job_id) + except drac_exceptions.BaseClientException as exc: LOG.error('DRAC driver failed to change boot device order for ' 'node %(node_uuid)s. Reason: %(error)s.', diff --git a/ironic/tests/unit/drivers/modules/drac/test_management.py b/ironic/tests/unit/drivers/modules/drac/test_management.py index 84a752c6b..e1f7df093 100644 --- a/ironic/tests/unit/drivers/modules/drac/test_management.py +++ b/ironic/tests/unit/drivers/modules/drac/test_management.py @@ -257,6 +257,10 @@ class DracManagementInternalMethodsTestCase(test_utils.BaseDracTest): mock_client = mock.Mock() mock_get_drac_client.return_value = mock_client mock_client.list_boot_devices.return_value = self.boot_devices['IPL'] + mock_job = mock.Mock() + mock_job.status = "Scheduled" + mock_client.get_job.return_value = mock_job + boot_device = {'boot_device': ironic.common.boot_devices.DISK, 'persistent': True} mock__get_boot_device.return_value = boot_device @@ -315,6 +319,10 @@ class DracManagementInternalMethodsTestCase(test_utils.BaseDracTest): mock_client = mock.Mock() mock_get_drac_client.return_value = mock_client mock_client.list_boot_devices.return_value = self.boot_devices['UEFI'] + + mock_job = mock.Mock() + mock_job.status = "Scheduled" + mock_client.get_job.return_value = mock_job boot_device = {'boot_device': ironic.common.boot_devices.PXE, 'persistent': False} mock__get_boot_device.return_value = boot_device @@ -445,6 +453,40 @@ class DracManagementInternalMethodsTestCase(test_utils.BaseDracTest): self.assertEqual(0, mock_client.set_bios_settings.call_count) self.assertEqual(0, mock_client.commit_pending_bios_changes.call_count) + @mock.patch('time.time') + @mock.patch('time.sleep') + @mock.patch.object(drac_mgmt, '_get_next_persistent_boot_mode', + spec_set=True, autospec=True) + @mock.patch.object(drac_mgmt, '_get_boot_device', spec_set=True, + autospec=True) + @mock.patch.object(drac_job, 'validate_job_queue', spec_set=True, + autospec=True) + def test_set_boot_device_job_not_scheduled( + self, + mock_validate_job_queue, + mock__get_boot_device, + mock__get_next_persistent_boot_mode, + mock_sleep, + mock_time, + mock_get_drac_client): + mock_client = mock.Mock() + mock_get_drac_client.return_value = mock_client + mock_client.list_boot_devices.return_value = self.boot_devices['IPL'] + mock_job = mock.Mock() + mock_job.status = "New" + mock_client.get_job.return_value = mock_job + mock_time.side_effect = [10, 50] + + boot_device = {'boot_device': ironic.common.boot_devices.DISK, + 'persistent': True} + mock__get_boot_device.return_value = boot_device + mock__get_next_persistent_boot_mode.return_value = 'IPL' + + self.assertRaises(exception.DracOperationError, + drac_mgmt.set_boot_device, self.node, + ironic.common.boot_devices.PXE, + persistent=True) + @mock.patch.object(drac_common, 'get_drac_client', spec_set=True, autospec=True) |