Skip to content

[code sync] Merge code from sonic-net/sonic-utilities:202412 to 202503#216

Merged
mssonicbld merged 2 commits intoAzure:202503from
mssonicbld:sonicbld/202503-merge
Aug 3, 2025
Merged

[code sync] Merge code from sonic-net/sonic-utilities:202412 to 202503#216
mssonicbld merged 2 commits intoAzure:202503from
mssonicbld:sonicbld/202503-merge

Conversation

@mssonicbld
Copy link
Collaborator

* b7b98ce2 - (base/202412, test, 202412) [sfputil debug] Fix issue: do not check output status when CMIS version is lower than 5.0 (#212) (2025-08-02) [mssonicbld]<br>```

mssonicbld and others added 2 commits August 2, 2025 11:12
…on is lower than 5.0 (Azure#212)

<!--
 Please make sure you've read and understood our contributing guidelines:
 https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md

 failure_prs.log skip_prs.log Make sure all your commits include a signature generated with `git commit -s` **

 If this is a bug fix, make sure your description includes "closes #xxxx",
 "fixes #xxxx" or "resolves #xxxx" so that GitHub automatically closes the related
 issue when the PR is merged.

 If you are adding/modifying/removing any command or utility script, please also
 make sure to add/modify/remove any unit tests from the tests
 directory as appropriate.

 If you are modifying or removing an existing 'show', 'config' or 'sonic-clear'
 subcommand, or you are adding a new subcommand, please make sure you also
 update the Command Line Reference Guide (doc/Command-Reference.md) to reflect
 your changes.

 Please provide the following information:
-->

#### What I did

OutputStatusTx and OutputStatusRx are only supported since CMIS 5.0. `sfputil debug tx-output` and `sfputil debug rx-output` should check them only if CMIS rev is higher or equal to 5.0.

#### How I did it

1. Use `get_tx_disable` and `get_rx_disable` to check if the corresponding bits have been set by `sfputil debug` command
2. Check the CMIS rev, ignore checking of OutputStatusTx and OutputStatusRx if CMIS rev is below 5.0.

#### How to verify it

1. Manual test
2. unit test

#### Previous command output (if the output of a command-line utility has changed)

#### New command output (if the output of a command-line utility has changed)
@mssonicbld mssonicbld merged commit 6aaaa68 into Azure:202503 Aug 3, 2025
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant