openstack
/
ironic
Code Issues Proposed changes

Merge "Use driver_internal_info methods for redfish driver"

This commit is contained in:
Zuul 2022-01-11 10:13:18 +00:00 committed by Gerrit Code Review
parent a346ee4d7f 7047eb8db9
commit a27a267d6d
3 changed files with 18 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ironic/drivers/modules/redfish/bios.py
View File

@ -338,9 +338,8 @@ class RedfishBIOS(base.BIOSInterface):
:param task: a TaskManager instance containing the node to act on. :param task: a TaskManager instance containing the node to act on.
""" """
info = task.node.driver_internal_info task.node.set_driver_internal_info(
info['post_factory_reset_reboot_requested'] = True 'post_factory_reset_reboot_requested', True)
task.node.driver_internal_info = info
task.node.save() task.node.save()
deploy_utils.set_async_step_flags(task.node, reboot=True, deploy_utils.set_async_step_flags(task.node, reboot=True,
skip_current_step=False) skip_current_step=False)
@ -351,10 +350,9 @@ class RedfishBIOS(base.BIOSInterface):
:param task: a TaskManager instance containing the node to act on. :param task: a TaskManager instance containing the node to act on.
:param attributes: the requested BIOS attributes to update. :param attributes: the requested BIOS attributes to update.
""" """
info = task.node.driver_internal_info task.node.set_driver_internal_info('post_config_reboot_requested',
info['post_config_reboot_requested'] = True True)
info['requested_bios_attrs'] = attributes task.node.set_driver_internal_info('requested_bios_attrs', attributes)
task.node.driver_internal_info = info
task.node.save() task.node.save()
deploy_utils.set_async_step_flags(task.node, reboot=True, deploy_utils.set_async_step_flags(task.node, reboot=True,
skip_current_step=False) skip_current_step=False)
@ -364,12 +362,11 @@ class RedfishBIOS(base.BIOSInterface):
:param task: a TaskManager instance containing the node to act on. :param task: a TaskManager instance containing the node to act on.
""" """
info = task.node.driver_internal_info node = task.node
info.pop('post_config_reboot_requested', None) node.del_driver_internal_info('post_config_reboot_requested')
info.pop('post_factory_reset_reboot_requested', None) node.del_driver_internal_info('post_factory_reset_reboot_requested')
info.pop('requested_bios_attrs', None) node.del_driver_internal_info('requested_bios_attrs')
task.node.driver_internal_info = info node.save()
task.node.save()
def _set_step_failed(self, task, attrs_not_updated): def _set_step_failed(self, task, attrs_not_updated):
"""Fail the cleaning or deployment step and log the error. """Fail the cleaning or deployment step and log the error.

14
ironic/drivers/modules/redfish/management.py
View File

@ -806,10 +806,9 @@ class RedfishManagement(base.ManagementInterface):
task_monitor = update_service.simple_update(firmware_url) task_monitor = update_service.simple_update(firmware_url)
driver_internal_info = node.driver_internal_info
firmware_update['task_monitor'] = task_monitor.task_monitor_uri firmware_update['task_monitor'] = task_monitor.task_monitor_uri
driver_internal_info['firmware_updates'] = firmware_updates node.set_driver_internal_info('firmware_updates',
node.driver_internal_info = driver_internal_info firmware_updates)
def _continue_firmware_updates(self, task, update_service, def _continue_firmware_updates(self, task, update_service,
firmware_updates): firmware_updates):
@ -838,9 +837,8 @@ class RedfishManagement(base.ManagementInterface):
'firmware_image': firmware_update['url'], 'firmware_image': firmware_update['url'],
'node': node.uuid}) 'node': node.uuid})
driver_internal_info = node.driver_internal_info node.set_driver_internal_info('firmware_updates',
driver_internal_info['firmware_updates'] = firmware_updates firmware_updates)
node.driver_internal_info = driver_internal_info
node.save() node.save()
return return
@ -866,9 +864,7 @@ class RedfishManagement(base.ManagementInterface):
:param node: the node to clear the firmware updates from :param node: the node to clear the firmware updates from
""" """
driver_internal_info = node.driver_internal_info node.del_driver_internal_info('firmware_updates')
driver_internal_info.pop('firmware_updates', None)
node.driver_internal_info = driver_internal_info
node.save() node.save()
@METRICS.timer('RedfishManagement._query_firmware_update_failed') @METRICS.timer('RedfishManagement._query_firmware_update_failed')

12
ironic/drivers/modules/redfish/raid.py
View File

@ -841,9 +841,7 @@ class RedfishRAID(base.RAIDInterface):
reboot_required = True reboot_required = True
raid_configs.append(raid_config) raid_configs.append(raid_config)
driver_internal_info = node.driver_internal_info node.set_driver_internal_info('raid_configs', raid_configs)
driver_internal_info['raid_configs'] = raid_configs
node.driver_internal_info = driver_internal_info
return_state = None return_state = None
deploy_utils.set_async_step_flags( deploy_utils.set_async_step_flags(
@ -914,9 +912,7 @@ class RedfishRAID(base.RAIDInterface):
reboot_required = True reboot_required = True
raid_configs.append(raid_config) raid_configs.append(raid_config)
driver_internal_info = node.driver_internal_info node.set_driver_internal_info('raid_configs', raid_configs)
driver_internal_info['raid_configs'] = raid_configs
node.driver_internal_info = driver_internal_info
return_state = None return_state = None
deploy_utils.set_async_step_flags( deploy_utils.set_async_step_flags(
@ -1007,9 +1003,7 @@ class RedfishRAID(base.RAIDInterface):
:param node: the node to clear the RAID configs from :param node: the node to clear the RAID configs from
""" """
driver_internal_info = node.driver_internal_info node.del_driver_internal_info('raid_configs')
driver_internal_info.pop('raid_configs', None)
node.driver_internal_info = driver_internal_info
node.save() node.save()
@METRICS.timer('RedfishRAID._query_raid_config_failed') @METRICS.timer('RedfishRAID._query_raid_config_failed')