diff options
| author | Zuul <zuul@review.opendev.org> | 2021-12-17 17:53:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-12-17 17:53:48 +0000 |
| commit | 1a03e613299c04c2bb6ea929ee94e776d3da2137 (patch) | |
| tree | 16c70d73f9145acee8397d64fef1a6b66f2ba96f /ironic | |
| parent | 17a0f69c6c4aac9169a5ea8981d070bd8eef216e (diff) | |
| parent | 9076f185ca40e7629523b926ddf817da1ca6b4a8 (diff) | |
| download | ironic-1a03e613299c04c2bb6ea929ee94e776d3da2137.tar.gz | |
Merge "Fix redfish update_firmware for newer Sushy"
Diffstat (limited to 'ironic')
| -rw-r--r-- | ironic/drivers/modules/redfish/management.py | 2 | ||||
| -rw-r--r-- | ironic/tests/unit/drivers/modules/redfish/test_management.py | 4 |
2 files changed, 3 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 = { |