Skip to content

[action] [PR:632] Catch the xcvrd exception returned by get_transceiver_info #25

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
mssonicbld merged 1 commit into from
Jul 2, 2025
Merged

[action] [PR:632] Catch the xcvrd exception returned by get_transceiver_info #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions sonic-xcvrd/tests/test_xcvrd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3897,6 +3897,9 @@ def test_wrapper_get_transceiver_info(self, mock_sfputil, mock_chassis):
mock_sfputil.get_transceiver_info_dict = MagicMock(return_value=False)
assert not _wrapper_get_transceiver_info(1)

mock_chassis.get_sfp = MagicMock(side_effect=Exception)
assert not _wrapper_get_transceiver_info(1)

@pytest.mark.parametrize("mock_sfp, expected", [
(MagicMock(is_transceiver_vdm_supported=MagicMock(side_effect=NotImplementedError)), False),
(MagicMock(is_transceiver_vdm_supported=MagicMock(return_value=False)), False),
Expand Down
4 changes: 4 additions & 0 deletions sonic-xcvrd/xcvrd/xcvrd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,10 @@ def _wrapper_get_transceiver_info(physical_port):
return platform_chassis.get_sfp(physical_port).get_transceiver_info()
except NotImplementedError:
pass
except Exception as e:
helper_logger.log_error("Failed to get transceiver info for physical port {}. Exception: {}".format(physical_port, e))
log_exception_traceback()
return None
return platform_sfputil.get_transceiver_info_dict(physical_port)

def _wrapper_get_transceiver_firmware_info(physical_port):
Expand Down
Loading