Adds logic to get default disk and check disk type #3399

ashwnsri · 2024-07-04T00:19:13Z

What I did

Fix for sonic-buildimage issue 9407

To be merged

after sonic-buildimage PR: Added blkinfo module to host for use by ssdutil sonic-buildimage#19362
before sonic-mgmt PR: Modified ssdhealth test to account for currently supported disk types sonic-mgmt#14071

How I did it

Added logic using python libraries blkinfo and psutil to get the default disk, and the disk type (SATA/non-SATA).

How to verify it

call sudo ssdutil on a device with non-SATA disk (such as EUSB). Expected output is:


#EUSB disk:
admin@sonic-switch-usb:~$ realpath /sys/block/sda/device
/sys/devices/pci0000:00/0000:00:12.2/usb1/1-2/1-2:1.0/host2/target2:0:0/2:0:0:0

root@sonic-switch-usb:~# ssdutil
Disk type: USB
Device Model : N/A
Health       : N/A
Temperature  : N/A
root@sonic-switch-usb:~#
root@sonic-switch-usb:~# show plat ssdh
Disk type: USB
Device Model : N/A
Health       : N/A
Temperature  : N/A
root@sonic-switch-usb:~#

#EMMC Disk:

root@sonic-switch-emmc:~# realpath /sys/block/mmcblk0/device
/sys/devices/pci0000:00/0000:00:14.7/mmc_host/mmc0/mmc0:0001

root@sonic-switch-emmc:~# ssdutil
Disk Type    : EMMC
Device Model : N/A
Health       : N/A
Temperature  : N/A

root@sonic-switch-emmc:~# show plat ssd
Disk Type    : EMMC
Device Model : N/A
Health       : N/A
Temperature  : N/A

#NVMe Disk

root@sonic-switch-nvme:~# realpath /sys/block/nvme0n1/device
/sys/devices/pci0000:00/0000:00:10.0/0000:01:00.0/nvme/nvme0

root@sonic-switch-nvme:~# ssdutil
Disk Type    : NVME
Device Model : Micron_7450_MTFDKBA400TFS
Health       : 100.0%
Temperature  : 27.0C

root@sonic-switch-nvme:~# show plat ssdh
Disk Type    : NVME
Device Model : Micron_7450_MTFDKBA400TFS
Health       : 100.0%
Temperature  : 27.0C

#SATA Disk

root@sonic-switch-sata:~$ realpath /sys/block/sda/device
/sys/devices/pci0000:00/0000:00:1f.2/ata1/host0/target0:0:0/0:0:0:0

root@sonic-switch-sata:~# ssdutil
Disk type: SATA
Device Model : TRSC41BM030M4-46EN
Health       : N/A
Temperature  : 100C

root@sonic-switch-sata:~# show platform ssdhealth
Disk type: SATA
Device Model : TRSC41BM030M4-46EN
Health       : N/A
Temperature  : 100C
root@sonic-switch-sata:~#

Also ran a modified test_show_platform_ssdhealth (See sonic-mgmt PR mentioned above) on switches with all 4 disk types and verified that test was either skipped or passed. Logs attached: test_show_platform_ssdhealth.txt

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

admin@sonic:~$ sudo ssdutil
Device Model : N/A
Health       : N/A
Temperature  : N/A

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

admin@sonic:~$ sudo ssdutil
Disk type: <disk_type>
Device Model : N/A
Health       : N/A
Temperature  : N/A

ashwnsri · 2024-07-04T05:10:10Z

/azpw run

mssonicbld · 2024-07-04T05:10:12Z

/AzurePipelines run

azure-pipelines · 2024-07-04T05:10:23Z

Azure Pipelines successfully started running 1 pipeline(s).

ssdutil/main.py

… issues

ssdutil/main.py

The syslogger-to-logger change is unrelated to the sonic-utilities change and breaks backwards compatibility. It should be a separate commit once SysLogger is in all the older versions.

ashwnsri · 2024-09-09T18:54:41Z

@prgeor please help review/merge. Thanks.

ssdutil/main.py

ashwnsri · 2024-10-28T18:43:00Z

@bingwang-ms please help cherry-pick to 202405 branch, thanks!

* Added function to check if disk is SATA * Fixed eval bug unconvered by UT * Changed logger to syslogger; fixed UT failures * Added checks for partitions and filtered_disks; fixed static analysis issues * Fix static analysis errors E303, E711 * Changed information delivery semantics per review comment * Reverted syslogger to logger to maintain backward compatibility The syslogger-to-logger change is unrelated to the sonic-utilities change and breaks backwards compatibility. It should be a separate commit once SysLogger is in all the older versions. * Changed Disk 'type' --> 'Type' for uniformity * Made the fields look uniform * Disk Type Support for eMMC devices * Removed old sonic_ssd import

mssonicbld · 2024-11-06T22:33:12Z

Cherry-pick PR to 202405: #3601

* Added function to check if disk is SATA * Fixed eval bug unconvered by UT * Changed logger to syslogger; fixed UT failures * Added checks for partitions and filtered_disks; fixed static analysis issues * Fix static analysis errors E303, E711 * Changed information delivery semantics per review comment * Reverted syslogger to logger to maintain backward compatibility The syslogger-to-logger change is unrelated to the sonic-utilities change and breaks backwards compatibility. It should be a separate commit once SysLogger is in all the older versions. * Changed Disk 'type' --> 'Type' for uniformity * Made the fields look uniform * Disk Type Support for eMMC devices * Removed old sonic_ssd import

…ash drive is plugged in Fix `show platform ssdhealth` not showing expected output when a usb flash drive is plugged in.  #### What I did When 'show platform ssdhealth' is not supplied with a device name and a usb flash drive is attached we show incorrect output as we deduce incorrect device name from 'lsblk' command and pass it to ssdutil. I removed this incorrect deduction of the device name. #### How I did it Instead of incorrectly deducing the device using the lsblk command we can instead not pass any device name as argument to the ssdutil and it will automatically choose the device on which /host partition is mounted which is the primary storage device in our case as per the PR: sonic-net/sonic-utilities#3399 #### How to verify it Run `sudo show platform ssdhealth` without any arguments with a flash drive plugged into the sonic switch. #### Previous command output (if the output of a command-line utility has changed) ``` root@qa-eth-vt19-1-4280:~# show platform ssdhealth Disk Type : NVME Device Model : N/A Health : N/A Temperature : N/A ``` #### New command output (if the output of a command-line utility has changed) ``` root@qa-eth-vt19-1-4280:/home/admin# show platform ssdhealth Disk Type : NVME Device Model : Virtium VTPM24CEXI080-BM110006 Health : 100.0% Temperature : 51.0C ``` In the case where the user passes the device name as argument to the command (`show platform ssdhealth /dev/nvme0n1`) output remains the same and no changes have been made.

…ash drive is plugged in (#166) Fix `show platform ssdhealth` not showing expected output when a usb flash drive is plugged in.  #### What I did When 'show platform ssdhealth' is not supplied with a device name and a usb flash drive is attached we show incorrect output as we deduce incorrect device name from 'lsblk' command and pass it to ssdutil. I removed this incorrect deduction of the device name. #### How I did it Instead of incorrectly deducing the device using the lsblk command we can instead not pass any device name as argument to the ssdutil and it will automatically choose the device on which /host partition is mounted which is the primary storage device in our case as per the PR: sonic-net/sonic-utilities#3399 #### How to verify it Run `sudo show platform ssdhealth` without any arguments with a flash drive plugged into the sonic switch. #### Previous command output (if the output of a command-line utility has changed) ``` root@qa-eth-vt19-1-4280:~# show platform ssdhealth Disk Type : NVME Device Model : N/A Health : N/A Temperature : N/A ``` #### New command output (if the output of a command-line utility has changed) ``` root@qa-eth-vt19-1-4280:/home/admin# show platform ssdhealth Disk Type : NVME Device Model : Virtium VTPM24CEXI080-BM110006 Health : 100.0% Temperature : 51.0C ``` In the case where the user passes the device name as argument to the command (`show platform ssdhealth /dev/nvme0n1`) output remains the same and no changes have been made.

* Added function to check if disk is SATA * Fixed eval bug unconvered by UT * Changed logger to syslogger; fixed UT failures * Added checks for partitions and filtered_disks; fixed static analysis issues * Fix static analysis errors E303, E711 * Changed information delivery semantics per review comment * Reverted syslogger to logger to maintain backward compatibility The syslogger-to-logger change is unrelated to the sonic-utilities change and breaks backwards compatibility. It should be a separate commit once SysLogger is in all the older versions. * Changed Disk 'type' --> 'Type' for uniformity * Made the fields look uniform * Disk Type Support for eMMC devices * Removed old sonic_ssd import

Ashwin Srinivasan added 2 commits July 2, 2024 08:15

Added function to check if disk is SATA

ba220f0

Fixed eval bug unconvered by UT

04445f0

ashwnsri requested review from saiarcot895, prgeor, vdahiya12, mihirpat1 and vvolam July 4, 2024 00:22

Changed logger to syslogger; fixed UT failures

1fa0cdd

vvolam reviewed Jul 8, 2024

View reviewed changes

ssdutil/main.py Show resolved Hide resolved

ssdutil/main.py Show resolved Hide resolved

Ashwin Srinivasan added 2 commits July 8, 2024 21:12

Added checks for partitions and filtered_disks; fixed static analysis…

7a4bf4d

… issues

Fix static analysis errors E303, E711

584d11e

keboliu reviewed Jul 31, 2024

View reviewed changes

ssdutil/main.py Outdated Show resolved Hide resolved

Ashwin Srinivasan added 5 commits August 1, 2024 06:08

Changed information delivery semantics per review comment

5ce53b3

Reverted syslogger to logger to maintain backward compatibility

53aac46

The syslogger-to-logger change is unrelated to the sonic-utilities change and breaks backwards compatibility. It should be a separate commit once SysLogger is in all the older versions.

Changed Disk 'type' --> 'Type' for uniformity

a9f2490

Made the fields look uniform

75ec32c

Disk Type Support for eMMC devices

e1bf142

ashwnsri mentioned this pull request Aug 13, 2024

Modified ssdhealth test to account for currently supported disk types sonic-net/sonic-mgmt#14071

Merged

8 tasks

ashwnsri added the Request for 202405 Branch label Aug 19, 2024

keboliu reviewed Sep 10, 2024

View reviewed changes

ssdutil/main.py Show resolved Hide resolved

keboliu approved these changes Sep 10, 2024

View reviewed changes

prgeor reviewed Sep 23, 2024

View reviewed changes

ssdutil/main.py Outdated Show resolved Hide resolved

Removed old sonic_ssd import

cbbd283

prgeor approved these changes Oct 28, 2024

View reviewed changes

prgeor merged commit d64a90a into sonic-net:master Oct 28, 2024
7 checks passed

bingwang-ms added the Approved for 202405 Branch label Nov 6, 2024

mssonicbld mentioned this pull request Nov 6, 2024

[action] [PR:3399] Adds logic to get default disk and check disk type (#3399) #3601

Merged

mssonicbld added the Created PR to 202405 Branch label Nov 6, 2024

mssonicbld added Included in 202405 Branch and removed Created PR to 202405 Branch labels Nov 6, 2024

mssonicbld mentioned this pull request Dec 11, 2024

[action] [PR:14071] Modified ssdhealth test to account for currently supported disk types sonic-net/sonic-mgmt#16011

Merged

8 tasks

This was referenced Apr 2, 2025

Fix show platform ssdhealth not showing expected output when a usb flash drive is plugged in for some platforms tirupatihemanth/sonic-utilities#2

Closed

Fix show platform ssdhealth not showing expected output when a usb flash drive is plugged in #3833

Merged

mssonicbld mentioned this pull request Apr 15, 2025

[action] [PR:3833] Fix show platform ssdhealth not showing expected output when a usb flash drive is plugged in Azure/sonic-utilities.msft#166

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Adds logic to get default disk and check disk type #3399

Adds logic to get default disk and check disk type #3399

Uh oh!

ashwnsri commented Jul 4, 2024 •

edited

Loading

Uh oh!

ashwnsri commented Jul 4, 2024

Uh oh!

mssonicbld commented Jul 4, 2024

Uh oh!

azure-pipelines bot commented Jul 4, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ashwnsri commented Sep 9, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ashwnsri commented Oct 28, 2024

Uh oh!

mssonicbld commented Nov 6, 2024

Uh oh!

Uh oh!

Adds logic to get default disk and check disk type #3399

Adds logic to get default disk and check disk type #3399

Uh oh!

Conversation

ashwnsri commented Jul 4, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What I did

How I did it

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)

Uh oh!

ashwnsri commented Jul 4, 2024

Uh oh!

mssonicbld commented Jul 4, 2024

Uh oh!

azure-pipelines bot commented Jul 4, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ashwnsri commented Sep 9, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ashwnsri commented Oct 28, 2024

Uh oh!

mssonicbld commented Nov 6, 2024

Uh oh!

Uh oh!

ashwnsri commented Jul 4, 2024 •

edited

Loading