openstack/ironic
Code Issues Proposed changes

Fix redfish update_firmware for newer Sushy

Browse Source 
`TaskMonitor.task_monitor` is deprecated and was removed from sushy
at Ie48fab19199c0c2f3455d2212d50460a29685eed. Somehow missed to
update it for `redfish` firmware upgrade steps previously.

Change-Id: Iced8e921335995e1e084d6e632c6e81d3fc9249f
This commit is contained in:
Aija Jauntēva 2021-12-10 11:00:24 -05:00
parent cdc3b9538f
commit 9076f185ca
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -807,7 +807,7 @@ 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 driver_internal_info = node.driver_internal_info
firmware_update['task_monitor'] = task_monitor.task_monitor firmware_update['task_monitor'] = task_monitor.task_monitor_uri
driver_internal_info['firmware_updates'] = firmware_updates driver_internal_info['firmware_updates'] = firmware_updates
node.driver_internal_info = driver_internal_info node.driver_internal_info = driver_internal_info

4
ironic/tests/unit/drivers/modules/redfish/test_management.py
View File

@ -830,7 +830,7 @@ class RedfishManagementTestCase(db_base.DbTestCase):
build_mock): build_mock):
build_mock.return_value = {'a': 'b'} build_mock.return_value = {'a': 'b'}
mock_task_monitor = mock.Mock() mock_task_monitor = mock.Mock()
mock_task_monitor.task_monitor = '/task/123' mock_task_monitor.task_monitor_uri = '/task/123'
mock_update_service = mock.Mock() mock_update_service = mock.Mock()
mock_update_service.simple_update.return_value = mock_task_monitor mock_update_service.simple_update.return_value = mock_task_monitor
mock_get_update_service.return_value = mock_update_service mock_get_update_service.return_value = mock_update_service
@ -1204,7 +1204,7 @@ class RedfishManagementTestCase(db_base.DbTestCase):
mock_node_power_action, mock_node_power_action,
mock_log): mock_log):
mock_task_monitor = mock.Mock() mock_task_monitor = mock.Mock()
mock_task_monitor.task_monitor = '/task/987' mock_task_monitor.task_monitor_uri = '/task/987'
mock_update_service = mock.Mock() mock_update_service = mock.Mock()
mock_update_service.simple_update.return_value = mock_task_monitor mock_update_service.simple_update.return_value = mock_task_monitor
driver_internal_info = { driver_internal_info = {

5
releasenotes/notes/fix-redfish-firmware-upgrade-7ef2fcb6bfd74e67.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
Fixes ``redfish`` hardware type ``update_firmware`` cleaning step to work
with Sushy version 4.0.0 or greater.