openstack/ironic
Code Issues Proposed changes

Merge "Update tests for Redfish BIOS apply_configuration"

Browse Source
This commit is contained in:
Zuul 2020-09-23 22:00:17 +00:00 committed by Gerrit Code Review
commit f6bfc7397c
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ironic/tests/unit/drivers/modules/redfish/test_bios.py
View File

@ -190,7 +190,6 @@ class RedfishBiosTestCase(db_base.DbTestCase):
if step == 'factory_reset': if step == 'factory_reset':
ret = task.driver.bios.factory_reset(task) ret = task.driver.bios.factory_reset(task)
if step == 'apply_configuration': if step == 'apply_configuration':
bios.apply_time_settings = None
bios.supported_apply_times = [] bios.supported_apply_times = []
ret = task.driver.bios.apply_configuration(task, data) ret = task.driver.bios.apply_configuration(task, data)
mock_get_system.assert_called_with(task.node) mock_get_system.assert_called_with(task.node)
@ -387,7 +386,7 @@ class RedfishBiosTestCase(db_base.DbTestCase):
@mock.patch.object(deploy_utils, 'build_agent_options', autospec=True) @mock.patch.object(deploy_utils, 'build_agent_options', autospec=True)
@mock.patch.object(redfish_utils, 'get_system', autospec=True) @mock.patch.object(redfish_utils, 'get_system', autospec=True)
@mock.patch.object(manager_utils, 'node_power_action', autospec=True) @mock.patch.object(manager_utils, 'node_power_action', autospec=True)
def test_apply_configuration_apply_time_settings(self, mock_power_action, def test_apply_configuration_apply_time_immediate(self, mock_power_action,
mock_get_system, mock_get_system,
mock_build_agent_options, mock_build_agent_options,
mock_prepare): mock_prepare):
@ -396,7 +395,6 @@ class RedfishBiosTestCase(db_base.DbTestCase):
with task_manager.acquire(self.context, self.node.uuid, with task_manager.acquire(self.context, self.node.uuid,
shared=False) as task: shared=False) as task:
bios = mock_get_system(task.node).bios bios = mock_get_system(task.node).bios
bios.apply_time_settings = mock.Mock()
bios.supported_apply_times = ['immediate'] bios.supported_apply_times = ['immediate']
task.driver.bios.apply_configuration(task, settings) task.driver.bios.apply_configuration(task, settings)
@ -419,7 +417,6 @@ class RedfishBiosTestCase(db_base.DbTestCase):
with task_manager.acquire(self.context, self.node.uuid, with task_manager.acquire(self.context, self.node.uuid,
shared=False) as task: shared=False) as task:
bios = mock_get_system(task.node).bios bios = mock_get_system(task.node).bios
bios.apply_time_settings = None
bios.supported_apply_times = [sushy.APPLY_TIME_ON_RESET] bios.supported_apply_times = [sushy.APPLY_TIME_ON_RESET]
task.driver.bios.apply_configuration(task, settings) task.driver.bios.apply_configuration(task, settings)
@ -427,3 +424,24 @@ class RedfishBiosTestCase(db_base.DbTestCase):
bios.set_attributes.assert_called_once_with( bios.set_attributes.assert_called_once_with(
{s['name']: s['value'] for s in settings}, {s['name']: s['value'] for s in settings},
apply_time=sushy.APPLY_TIME_ON_RESET) apply_time=sushy.APPLY_TIME_ON_RESET)
@mock.patch.object(redfish_boot.RedfishVirtualMediaBoot, 'prepare_ramdisk',
spec_set=True, autospec=True)
@mock.patch.object(deploy_utils, 'build_agent_options', autospec=True)
@mock.patch.object(redfish_utils, 'get_system', autospec=True)
@mock.patch.object(manager_utils, 'node_power_action', autospec=True)
def test_apply_configuration_no_supported_apply_times(
self, mock_power_action, mock_get_system, mock_build_agent_options,
mock_prepare):
settings = [{'name': 'ProcTurboMode', 'value': 'Disabled'},
{'name': 'NicBoot1', 'value': 'NetworkBoot'}]
with task_manager.acquire(self.context, self.node.uuid,
shared=False) as task:
bios = mock_get_system(task.node).bios
bios.supported_apply_times = None
task.driver.bios.apply_configuration(task, settings)
bios.set_attributes.assert_called_once_with(
{s['name']: s['value'] for s in settings},
apply_time=None)