diff options
| author | Aija Jauntēva <aija.jaunteva@dell.com> | 2021-12-10 11:00:24 -0500 |
|---|---|---|
| committer | Aija Jauntēva <aija.jaunteva@dell.com> | 2021-12-20 09:10:49 +0000 |
| commit | ff375734b13cc37308c6ab0c9bfd1ead210f5d67 (patch) | |
| tree | 07c51d153ccdacb7fbca1d586e59e05f8b160f76 | |
| parent | 440549ada30d0b01b40371191cb3e9b8edd89335 (diff) | |
| download | ironic-ff375734b13cc37308c6ab0c9bfd1ead210f5d67.tar.gz | |
Fix redfish update_firmware for newer Sushy
`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
(cherry picked from commit 9076f185ca40e7629523b926ddf817da1ca6b4a8)
3 files changed, 8 insertions, 3 deletions
diff --git a/ironic/drivers/modules/redfish/management.py b/ironic/drivers/modules/redfish/management.py index c9fccfaf9..6e8031c26 100644 --- a/ironic/drivers/modules/redfish/management.py +++ b/ironic/drivers/modules/redfish/management.py @@ -811,7 +811,7 @@ class RedfishManagement(base.ManagementInterface): task_monitor = update_service.simple_update(firmware_url) 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 node.driver_internal_info = driver_internal_info diff --git a/ironic/tests/unit/drivers/modules/redfish/test_management.py b/ironic/tests/unit/drivers/modules/redfish/test_management.py index 76e20702e..72a355072 100644 --- a/ironic/tests/unit/drivers/modules/redfish/test_management.py +++ b/ironic/tests/unit/drivers/modules/redfish/test_management.py @@ -830,7 +830,7 @@ class RedfishManagementTestCase(db_base.DbTestCase): build_mock): build_mock.return_value = {'a': 'b'} 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.simple_update.return_value = mock_task_monitor mock_get_update_service.return_value = mock_update_service @@ -1342,7 +1342,7 @@ class RedfishManagementTestCase(db_base.DbTestCase): mock_node_power_action, mock_log): 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.simple_update.return_value = mock_task_monitor driver_internal_info = { diff --git a/releasenotes/notes/fix-redfish-firmware-upgrade-7ef2fcb6bfd74e67.yaml b/releasenotes/notes/fix-redfish-firmware-upgrade-7ef2fcb6bfd74e67.yaml new file mode 100644 index 000000000..be6227811 --- /dev/null +++ b/releasenotes/notes/fix-redfish-firmware-upgrade-7ef2fcb6bfd74e67.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Fixes ``redfish`` hardware type ``update_firmware`` cleaning step to work + with Sushy version 4.0.0 or greater. |