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

[ssdutil] Inform if the disk is not SSD #1957

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

[ssdutil] Inform if the disk is not SSD #1957

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3ac184a
Inform if the disk is not SSD
sujinmkang Dec 1, 2021
217079b
check the disk available
sujinmkang Dec 5, 2021
3cbf9b9
disk name should be same
sujinmkang Dec 6, 2021
d17a02f
add finding default-device instead of using the hardcoded one
sujinmkang Dec 7, 2021
35b5cf1
fix lgtm
sujinmkang Dec 7, 2021
237caf7
Update disk check
sujinmkang Jan 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions ssdutil/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
try:
import argparse
import os
import subprocess
import sys

from sonic_py_common import device_info, logger
Expand All @@ -16,11 +17,20 @@

DEFAULT_DEVICE="/dev/sda"
SYSLOG_IDENTIFIER = "ssdutil"
DISK_TYPE_SSD = "0"

# Global logger instance
log = logger.Logger(SYSLOG_IDENTIFIER)


def get_disk_type(diskdev):
Copy link
Contributor

Choose a reason for hiding this comment

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

better to validate if the listed diskdev is valid as listed by "lsblk" otherwise the utility will crash. you can use

lsblk -l -n | grep 'disk'

to get the list of all disk names available in the host

"""Check disk type"""
cmd = "cat /sys/block/{}/queue/rotational".format(diskdev.replace('/dev/',''))
proc = subprocess.Popen(cmd, shell=True, text=True, stdout=subprocess.PIPE)
Copy link
Contributor

Choose a reason for hiding this comment

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

Forking to cat here seems unnecessary. Is there a reason you chose not to use native python io here?

Copy link
Contributor

Choose a reason for hiding this comment

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

It is also more pythonic to do this and add error handling in order to handle the DISK_INVALID case rather than forking lsblk as well.

out = proc.stdout.readline()
return out.rstrip()


def import_ssd_api(diskdev):
"""
Loads platform specific or generic ssd_util module from source
Expand Down Expand Up @@ -65,6 +75,11 @@ def ssdutil():
parser.add_argument("-e", "--vendor", action="store_true", default=False, help="Show vendor output (extended output if provided by platform vendor)")
args = parser.parse_args()

disk_type = get_disk_type(args.device)
if disk_type != DISK_TYPE_SSD:
print("Disk is not SSD")
sys.exit(1)
neethajohn marked this conversation as resolved.
Show resolved Hide resolved

ssd = import_ssd_api(args.device)

print("Device Model : {}".format(ssd.get_model()))
Expand Down