Skip to content

[code sync] Merge code from sonic-net/sonic-platform-daemons:202505 to 202506 #59

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 2 commits into from
Jan 17, 2026
Merged

[code sync] Merge code from sonic-net/sonic-platform-daemons:202505 to 202506 #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef2977b
Enable sff_mgr for all non-cmis txvrs (#719)
az-pz Jan 16, 2026
37f69ef
Merge branch '202505' of https://github.com/sonic-net/sonic-platform-…
mssonicbld Jan 17, 2026
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
1 change: 0 additions & 1 deletion sonic-xcvrd/tests/test_xcvrd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2274,7 +2274,6 @@ def test_SffManagerTask_task_worker(self, mock_chassis, mock_logger):
mock_xcvr_api.is_flat_memory.call_count = 0
task.task_stopping_event.is_set = MagicMock(side_effect=[False, False, True])
task.task_worker()
assert mock_xcvr_api.is_flat_memory.call_count == 1
assert mock_xcvr_api.tx_disable_channel.call_count == 2
mock_xcvr_api.is_flat_memory = MagicMock(return_value=False)

Expand Down
10 changes: 2 additions & 8 deletions sonic-xcvrd/xcvrd/sff_mgr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,8 +366,8 @@ def task_worker(self):
# Skip if these essential routines are not available
continue

# Procced only for QSFP28/QSFP+ transceiver
if not (xcvr_type.startswith('QSFP28') or xcvr_type.startswith('QSFP+')) or xcvrd.is_cmis_api(api):
# Proceed only for non-cmis transceiver
if xcvrd.is_cmis_api(api):
continue

# Handle the case that host_tx_ready value in the local cache hasn't
Expand Down Expand Up @@ -422,12 +422,6 @@ def task_worker(self):
data[self.ADMIN_STATUS], admin_status_changed))

try:
# Skip if it's not a paged memory device
if api.is_flat_memory():
self.log_notice(
"{}: skipping sff_mgr for flat memory xcvr".format(lport))
continue

# Skip if it's a copper cable
if api.is_copper():
self.log_notice(
Expand Down