[code sync] Merge code from sonic-net/sonic-platform-daemons:202505 to 202506#58
Merged
mssonicbld merged 2 commits intoAzure:202506from Nov 25, 2025
Merged
Conversation
Collaborator
mssonicbld
commented
Nov 25, 2025
mssonicbld
commented
…ers (#710) (#712)
Description
For certain CMIS transceivers which have transceiver type as "QSFP+ or later with CMIS", SFF manager also starts controlling Tx disable in addition to CMIS manager.
Hence, SFF manager needs to skip handling such CMIS transceivers. Following code needs to be modified to addressed this
sonic-platform-daemons/sonic-xcvrd/xcvrd/sff_mgr.py
Lines 387 to 389 in 69ce387
# Procced only for QSFP28/QSFP+ transceiver
if not (xcvr_type.startswith('QSFP28') or xcvr_type.startswith('QSFP+')):
continue
Motivation and Context
For certain CMIS transceivers which have transceiver type as "QSFP+ or later with CMIS", the SFF manager was also controlling Tx disable in addition to the CMIS manager. This created a conflict where both managers would attempt to control the same transceiver, leading to potential race conditions and unexpected behavior.
The previous type check only filtered based on the string prefix "QSFP28" or "QSFP+", which would incorrectly include CMIS modules that report as "QSFP+ or later with CMIS".
Added explicit CMIS API check using common.is_cmis_api() to the transceiver filtering logic
How Has This Been Tested?
Verified CMIS transceivers with "QSFP+ or later with CMIS" type are now properly skipped by SFF manager
Confirmed QSFP28 module continue to be handled correctly
Unrelated change
The pipeline pool has been updated to sonictest since sonic-common is not supported anymore.
Additional Information (Optional)
MSFT ADO - 35947863
---------
Signed-off-by: Mihir Patel <patelmi@microsoft.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.