summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ironic/drivers/modules/redfish/management.py2
-rw-r--r--ironic/tests/unit/drivers/modules/redfish/test_management.py4
-rw-r--r--releasenotes/notes/fix-redfish-firmware-upgrade-7ef2fcb6bfd74e67.yaml5
3 files changed, 8 insertions, 3 deletions
diff --git a/ironic/drivers/modules/redfish/management.py b/ironic/drivers/modules/redfish/management.py
index 6839e38c6..b3517656c 100644
--- a/ironic/drivers/modules/redfish/management.py
+++ b/ironic/drivers/modules/redfish/management.py
@@ -807,7 +807,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 738bd8802..5930816ab 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
@@ -1204,7 +1204,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.