diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/component.py b/platform/mellanox/mlnx-platform-api/sonic_platform/component.py index 0e7a024cca14..3d339217b54f 100644 --- a/platform/mellanox/mlnx-platform-api/sonic_platform/component.py +++ b/platform/mellanox/mlnx-platform-api/sonic_platform/component.py @@ -351,7 +351,7 @@ def auto_update_firmware(self, image_path, boot_action): return FW_AUTO_ERR_IMAGE if boot_action in default_supported_boot: - if self.install_firmware(image_path): + if self.update_firmware(image_path): # Successful update return FW_AUTO_INSTALLED # Failed update (unknown reason) @@ -520,7 +520,7 @@ def auto_update_firmware(self, image_path, boot_action): return FW_AUTO_ERR_UKNOWN if boot_action in supported_boot: - if self.install_firmware(image_path): + if self.update_firmware(image_path): # Successful update return FW_AUTO_INSTALLED # Failed update (unknown reason) diff --git a/platform/mellanox/mlnx-platform-api/tests/test_firmware.py b/platform/mellanox/mlnx-platform-api/tests/test_firmware.py index cdd68fa70505..32f002bcb372 100644 --- a/platform/mellanox/mlnx-platform-api/tests/test_firmware.py +++ b/platform/mellanox/mlnx-platform-api/tests/test_firmware.py @@ -16,10 +16,10 @@ FW_AUTO_ERR_IMAGE, \ FW_AUTO_ERR_UKNOWN -def mock_install_firmware_success(image_path): +def mock_update_firmware_success(image_path): return True -def mock_install_firmware_fail(image_path): +def mock_update_firmware_fail(image_path): return False def mock_update_notification_cold_boot(image_path): @@ -34,29 +34,29 @@ def mock_update_notification_error(image_path): test_data_default = [ (None, False, None, FW_AUTO_ERR_IMAGE), (None, True, 'warm', FW_AUTO_ERR_BOOT_TYPE), - (mock_install_firmware_fail, True, 'cold', FW_AUTO_ERR_UKNOWN), - (mock_install_firmware_success, True, 'cold', FW_AUTO_INSTALLED) + (mock_update_firmware_fail, True, 'cold', FW_AUTO_ERR_UKNOWN), + (mock_update_firmware_success, True, 'cold', FW_AUTO_INSTALLED) ] test_data_ssd = [ (None, None, False, None, FW_AUTO_ERR_IMAGE), (None, mock_update_notification_error, True, None, FW_AUTO_ERR_UKNOWN), - (mock_install_firmware_fail, mock_update_notification_cold_boot, True, 'cold', FW_AUTO_ERR_UKNOWN), - (mock_install_firmware_success, mock_update_notification_cold_boot, True, 'warm', FW_AUTO_ERR_BOOT_TYPE), - (mock_install_firmware_success, mock_update_notification_cold_boot, True, 'cold', FW_AUTO_INSTALLED), - (mock_install_firmware_success, mock_update_notification_warm_boot, True, 'warm', FW_AUTO_INSTALLED), - (mock_install_firmware_success, mock_update_notification_warm_boot, True, 'cold', FW_AUTO_INSTALLED) + (mock_update_firmware_fail, mock_update_notification_cold_boot, True, 'cold', FW_AUTO_ERR_UKNOWN), + (mock_update_firmware_success, mock_update_notification_cold_boot, True, 'warm', FW_AUTO_ERR_BOOT_TYPE), + (mock_update_firmware_success, mock_update_notification_cold_boot, True, 'cold', FW_AUTO_INSTALLED), + (mock_update_firmware_success, mock_update_notification_warm_boot, True, 'warm', FW_AUTO_INSTALLED), + (mock_update_firmware_success, mock_update_notification_warm_boot, True, 'cold', FW_AUTO_INSTALLED) ] -@pytest.mark.parametrize('install_func, image_found, boot_type, expect', test_data_default) -def test_auto_update_firmware_default(monkeypatch, install_func, image_found, boot_type, expect): +@pytest.mark.parametrize('update_func, image_found, boot_type, expect', test_data_default) +def test_auto_update_firmware_default(monkeypatch, update_func, image_found, boot_type, expect): def mock_path_exists(path): return image_found test_component = Component() - monkeypatch.setattr(test_component, 'install_firmware', install_func) + monkeypatch.setattr(test_component, 'update_firmware', update_func) monkeypatch.setattr(os.path, 'exists', mock_path_exists) result = test_component.auto_update_firmware(None, boot_type) @@ -64,15 +64,15 @@ def mock_path_exists(path): assert result == expect -@pytest.mark.parametrize('install_func, notify, image_found, boot_type, expect', test_data_ssd) -def test_auto_update_firmware_default(monkeypatch, install_func, notify, image_found, boot_type, expect): +@pytest.mark.parametrize('update_func, notify, image_found, boot_type, expect', test_data_ssd) +def test_auto_update_firmware_default(monkeypatch, update_func, notify, image_found, boot_type, expect): def mock_path_exists(path): return image_found test_component_ssd = ComponentSSD() - monkeypatch.setattr(test_component_ssd, 'install_firmware', install_func) + monkeypatch.setattr(test_component_ssd, 'update_firmware', update_func) monkeypatch.setattr(test_component_ssd, 'get_firmware_update_notification', notify) monkeypatch.setattr(os.path, 'exists', mock_path_exists)