Skip to content

Handle NotImplementedError exception while changing optoe write max #2985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
prgeor merged 4 commits into from
Sep 19, 2023
Merged

Handle NotImplementedError exception while changing optoe write max #2985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eb8baa2
Handle NotImplementedError exception while changing optoe write max
mihirpat1 Sep 18, 2023
85b2115
Merge branch 'master' of https://github.com/sonic-net/sonic-utilities…
mihirpat1 Sep 18, 2023
842d56d
Added unit test for more coverage
mihirpat1 Sep 19, 2023
bdefbe9
Removed unused import
mihirpat1 Sep 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions sfputil/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1325,7 +1325,10 @@ def download_firmware(port_name, filepath):
sys.exit(EXIT_FAIL)

# Increase the optoe driver's write max to speed up firmware download
sfp.set_optoe_write_max(SMBUS_BLOCK_WRITE_SIZE)
try:
sfp.set_optoe_write_max(SMBUS_BLOCK_WRITE_SIZE)
except NotImplementedError:
click.echo("Platform doesn't implement optoe write max change. Skipping value increase.")

with click.progressbar(length=file_size, label="Downloading ...") as bar:
address = 0
Expand All @@ -1351,7 +1354,10 @@ def download_firmware(port_name, filepath):
remaining -= count

# Restore the optoe driver's write max to '1' (default value)
sfp.set_optoe_write_max(1)
try:
sfp.set_optoe_write_max(1)
except NotImplementedError:
click.echo("Platform doesn't implement optoe write max change. Skipping value restore!")

status = api.cdb_firmware_download_complete()
update_firmware_info_to_state_db(port_name)
Expand Down
17 changes: 17 additions & 0 deletions tests/sfputil_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,6 +825,23 @@ def test_show_fwversion_Rj45(self, mock_chassis):
assert result.output == 'Show firmware version is not applicable for RJ45 port Ethernet0.\n'
assert result.exit_code == EXIT_FAIL

@patch('builtins.open')
@patch('sfputil.main.platform_chassis')
@patch('sfputil.main.logical_port_to_physical_port_index', MagicMock(return_value=1))
@patch('sfputil.main.update_firmware_info_to_state_db', MagicMock())
def test_download_firmware(self, mock_chassis, mock_file):
mock_file.return_value.tell.return_value = 0
mock_sfp = MagicMock()
mock_api = MagicMock()
mock_sfp.get_xcvr_api = MagicMock(return_value=mock_api)
mock_chassis.get_sfp = MagicMock(return_value=mock_sfp)
mock_api.get_module_fw_mgmt_feature.return_value = {'status': True, 'feature': (0, 0, False, False, 0)}
mock_api.cdb_start_firmware_download.return_value = 1
mock_api.cdb_firmware_download_complete.return_value = 1
mock_sfp.set_optoe_write_max = MagicMock(side_effect=NotImplementedError)
status = sfputil.download_firmware("Ethernet0", "test.bin")
assert status == 1

@patch('sfputil.main.platform_chassis')
@patch('sfputil.main.logical_port_to_physical_port_index', MagicMock(return_value=1))
def test_run_firmwre(self, mock_chassis):
Expand Down