openstack/ironic
Code Issues Proposed changes

Merge "BIOS Settings: Add BIOS caching"

Browse Source
This commit is contained in:
Zuul 2018-05-13 16:22:59 +00:00 committed by Gerrit Code Review
commit ef4c32f26f
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ironic/conductor/manager.py
View File

@ -1183,6 +1183,17 @@ class ConductorManager(base_manager.BaseConductorManager):
node.driver_internal_info = info node.driver_internal_info = info
node.save() node.save()
# Do caching of bios settings if supported by driver,
# this will be called for both manual and automated cleaning.
# TODO(zshi) remove this check when classic drivers are removed
if getattr(task.driver, 'bios', None):
try:
task.driver.bios.cache_bios_settings(task)
except Exception as e:
msg = (_('Caching of bios settings failed on node %(node)s.')
% {'node': node.uuid})
LOG.exception(msg)
# Allow the deploy driver to set up the ramdisk again (necessary for # Allow the deploy driver to set up the ramdisk again (necessary for
# IPA cleaning) # IPA cleaning)
try: try:

28
ironic/tests/unit/conductor/test_manager.py
View File

@ -2420,6 +2420,34 @@ class DoNodeCleanTestCase(mgr_utils.ServiceSetUpMixin, db_base.DbTestCase):
def test__do_node_clean_manual_network_validate_fail(self, mock_validate): def test__do_node_clean_manual_network_validate_fail(self, mock_validate):
self.__do_node_clean_validate_fail(mock_validate, clean_steps=[]) self.__do_node_clean_validate_fail(mock_validate, clean_steps=[])
@mock.patch('ironic.drivers.modules.network.flat.FlatNetwork.validate')
@mock.patch('ironic.drivers.modules.fake.FakeBIOS.cache_bios_settings')
def test__do_node_clean_cache_bios(self, mock_bios, mock_validate,
clean_steps=None):
tgt_prov_state = states.MANAGEABLE if clean_steps else states.AVAILABLE
node = obj_utils.create_test_node(
self.context, driver='fake',
provision_state=states.CLEANING,
target_provision_state=tgt_prov_state)
with task_manager.acquire(
self.context, node.uuid, shared=False) as task:
self.service._do_node_clean(task, clean_steps=clean_steps)
node.refresh()
self.assertFalse(mock_bios.called)
if clean_steps:
self.assertEqual(states.CLEANFAIL, node.provision_state)
self.assertEqual(tgt_prov_state, node.target_provision_state)
else:
self.assertEqual(states.AVAILABLE, node.provision_state)
self.assertEqual(states.NOSTATE, node.target_provision_state)
mock_validate.assert_called_once_with(task)
def test__do_node_clean_manual_cache_bios(self):
self.test__do_node_clean_cache_bios(clean_steps=[self.deploy_raid])
def test__do_node_clean_automated_cache_bios(self):
self.test__do_node_clean_cache_bios()
@mock.patch('ironic.drivers.modules.fake.FakePower.validate') @mock.patch('ironic.drivers.modules.fake.FakePower.validate')
def test__do_node_clean_automated_disabled(self, mock_validate): def test__do_node_clean_automated_disabled(self, mock_validate):
self.config(automated_clean=False, group='conductor') self.config(automated_clean=False, group='conductor')