Skip to content
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

Jump to bottom

[ssdhealth] Check for default device before falling back to discovery #3693

Merged
merged 4 commits into from
Jan 21, 2025
Merged

[ssdhealth] Check for default device before falling back to discovery #3693

merged 4 commits into from
Jan 21, 2025

Conversation

vivekrnv
Copy link
Contributor

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

  1. 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%]
  1. Verified the CLI is printing the health output for expected device

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
Copy link
Collaborator

/azp run

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@vivekrnv vivekrnv mentioned this pull request Dec 21, 2024
Merged
11 tasks
liat-grozovik
liat-grozovik previously approved these changes Dec 24, 2024
View reviewed changes
@liat-grozovik
Copy link
Collaborator

@keboliu as of prev changes on ssd health done by you, could you please help to review as well?

@liat-grozovik
Copy link
Collaborator

/azpw run Azure.sonic-utilities

@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

FengPan-Frank
FengPan-Frank approved these changes Dec 31, 2024
View reviewed changes
Copy link
Contributor

@FengPan-Frank FengPan-Frank left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@liat-grozovik liat-grozovik merged commit fc3a3cb into sonic-net:master Jan 21, 2025
7 checks passed
@mssonicbld mssonicbld mentioned this pull request Jan 21, 2025
Merged
@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202411: #3725

ayurkiv-nvda pushed a commit to ayurkiv-nvda/sonic-utilities that referenced this pull request Jan 22, 2025
@dprital
[202411_RC.1015] [ssdhealth] Check for default device before falling …
37cc6f7 
…back to discovery (sonic-net#3693)
@kperumalbfn kperumalbfn mentioned this pull request Jan 30, 2025
Closed
@kperumalbfn kperumalbfn mentioned this pull request Jan 30, 2025
Merged
liat-grozovik pushed a commit to sonic-net/sonic-buildimage that referenced this pull request Feb 2, 2025
@vivekrnv
[nvidia-bluefield] Add default disk to platform json (#21250)
a3792f8 
- 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
@mssonicbld
[nvidia-bluefield] Add default disk to platform json
16d0bc6 
<!--
     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)
@mssonicbld mssonicbld mentioned this pull request Feb 6, 2025
Merged
11 tasks
mssonicbld added a commit to sonic-net/sonic-buildimage that referenced this pull request Feb 7, 2025
@mssonicbld
[nvidia-bluefield] Add default disk to platform json (#21654)
d4e9dd3 
<!--
 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)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dgsudharsan dgsudharsan dgsudharsan approved these changes

@liat-grozovik liat-grozovik liat-grozovik approved these changes

@FengPan-Frank FengPan-Frank FengPan-Frank approved these changes

Assignees
No one assigned
Labels
Approved for 202411 Branch Included in 202411 Branch Request for 202411 Branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@vivekrnv @mssonicbld @liat-grozovik @dgsudharsan @FengPan-Frank @kperumalbfn