[ssdhealth] Check for default device before falling back to discovery#3693
Merged
liat-grozovik merged 4 commits intosonic-net:masterfrom Jan 21, 2025
Merged
[ssdhealth] Check for default device before falling back to discovery#3693liat-grozovik merged 4 commits intosonic-net:masterfrom
liat-grozovik merged 4 commits intosonic-net:masterfrom
Conversation
Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
11 tasks
dgsudharsan
approved these changes
Dec 21, 2024
liat-grozovik
previously approved these changes
Dec 24, 2024
Collaborator
|
@keboliu as of prev changes on ssd health done by you, could you please help to review as well? |
Collaborator
|
/azpw run Azure.sonic-utilities |
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
liat-grozovik
approved these changes
Jan 21, 2025
Collaborator
|
Cherry-pick PR to 202411: #3725 |
mssonicbld
added
Included in 202411 Branch
and removed
Created PR to 202411 Branch
labels
ayurkiv-nvda
pushed a commit
to ayurkiv-nvda/sonic-utilities
that referenced
this pull request
Jan 22, 2025
…back to discovery (sonic-net#3693)
liat-grozovik
pushed a commit
to sonic-net/sonic-buildimage
that referenced
this pull request
Feb 2, 2025
- Why I did it On nvidia-bluefield, there is a eMMC along with the default NVMe disk. However, the ssdhealth command today picks up eMMC by default. Thus added this new field to platforn.json Related to sonic-net/sonic-utilities#3693 - How I did it Infra to read this is updated in the sonic-utilities show cli - How to verify it Verfied if show platform ssdhealth is reading the correct disk by default
mssonicbld
added a commit
to mssonicbld/sonic-buildimage
that referenced
this pull request
Feb 6, 2025
<!--
Please make sure you've read and understood our contributing guidelines:
https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md
** Make sure all your commits include a signature generated with `git commit -s` **
If this is a bug fix, make sure your description includes "fixes #xxxx", or
"closes #xxxx" or "resolves #xxxx"
Please provide the following information:
-->
#### Why I did it
On nvidia-bluefield, there is a eMMC along with the default NVMe disk. However, the ssdhealth command today picks up eMMC by default. Thus added this new field to platforn.json
Related to sonic-net/sonic-utilities#3693
##### Work item tracking
- Microsoft ADO **(number only)**:
#### How I did it
Infra to read this is updated in the sonic-utilities show cli
#### How to verify it
<!--
If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012.
-->
Verfied if `show platform ssdhealth` is reading the correct disk by default
#### Which release branch to backport (provide reason below if selected)
<!--
- Note we only backport fixes to a release branch, *not* features!
- Please also provide a reason for the backporting below.
- e.g.
- [x] 202006
-->
- [ ] 201811
- [ ] 201911
- [ ] 202006
- [ ] 202012
- [ ] 202106
- [ ] 202111
- [ ] 202205
- [ ] 202211
- [ ] 202305
#### Tested branch (Please provide the tested image version)
<!--
- Please provide tested image version
- e.g.
- [x] 20201231.100
-->
- [ ] <!-- image version 1 -->
- [ ] <!-- image version 2 -->
#### Description for the changelog
<!--
Write a short (one line) summary that describes the changes in this
pull request for inclusion in the changelog:
-->
<!--
Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.
-->
#### Link to config_db schema for YANG module changes
<!--
Provide a link to config_db schema for the table for which YANG model
is defined
Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md
-->
#### A picture of a cute animal (not mandatory but encouraged)
11 tasks
mssonicbld
added a commit
to sonic-net/sonic-buildimage
that referenced
this pull request
Feb 7, 2025
<!-- 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 "fixes #xxxx", or "closes #xxxx" or "resolves #xxxx" Please provide the following information: --> #### Why I did it On nvidia-bluefield, there is a eMMC along with the default NVMe disk. However, the ssdhealth command today picks up eMMC by default. Thus added this new field to platforn.json Related to sonic-net/sonic-utilities#3693 ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it Infra to read this is updated in the sonic-utilities show cli #### How to verify it <!-- If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012. --> Verfied if `show platform ssdhealth` is reading the correct disk by default #### Which release branch to backport (provide reason below if selected) <!-- - Note we only backport fixes to a release branch, *not* features! - Please also provide a reason for the backporting below. - e.g. - [x] 202006 --> - [ ] 201811 - [ ] 201911 - [ ] 202006 - [ ] 202012 - [ ] 202106 - [ ] 202111 - [ ] 202205 - [ ] 202211 - [ ] 202305 #### Tested branch (Please provide the tested image version) <!-- - Please provide tested image version - e.g. - [x] 20201231.100 --> - [ ] <!-- image version 1 --> - [ ] <!-- image version 2 --> #### Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: --> <!-- Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU. --> #### Link to config_db schema for YANG module changes <!-- Provide a link to config_db schema for the table for which YANG model is defined Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md --> #### A picture of a cute animal (not mandatory but encouraged)
nmoray
pushed a commit
to nmoray/sonic-utilities
that referenced
this pull request
Jun 25, 2025
…sonic-net#3693) - What I did Some platforms may have multiple primary disks which makes it ambiguous to determine the device when there is no device specific in the ssdhealth command - How I did it Update the show platform command to check platform.json - How to verify it UT's vkarri@85964d14e169:/sonic/src/sonic-utilities$ pytest-3 tests/show_platform_test.py -k "ssdhealth" -v collected 8 items / 6 deselected / 2 selected tests/show_platform_test.py::TestShowPlatformSsdhealth::test_ssdhealth PASSED [ 50%] tests/show_platform_test.py::TestShowPlatformSsdhealth::test_ssdhealth_default_device PASSED [100%] Verified the CLI is printing the health output for expected device Signed-off-by: Vivek Reddy <vkarri@nvidia.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
6 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.
What I did
Some platforms may have multiple primary disks which makes it ambiguous to determine the device when there is no device specific in the ssdhealth command
How I did it
Update the show platform command to check platform.json
How to verify it
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)