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

[action] [PR:522] Change Virtium SSD which doesn't support SmartCMD, to use only smartctl #531

Merged
merged 1 commit into from
Jan 21, 2025
Merged

[action] [PR:522] Change Virtium SSD which doesn't support SmartCMD, to use only smartctl #531

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 14 additions & 9 deletions sonic_platform_base/sonic_storage/ssd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,15 +79,15 @@ def __init__(self, diskdev):
self.log = syslogger.SysLogger(self.log_identifier)

self.vendor_ssd_utility = {
"Generic" : { "utility" : SMARTCTL, "parser" : self.parse_generic_ssd_info },
"InnoDisk" : { "utility" : INNODISK, "parser" : self.parse_innodisk_info },
"M.2" : { "utility" : INNODISK, "parser" : self.parse_innodisk_info },
"StorFly" : { "utility" : VIRTIUM, "parser" : self.parse_virtium_info },
"Virtium" : { "utility" : VIRTIUM, "parser" : self.parse_virtium_info },
"Swissbit" : { "utility" : SMARTCTL, "parser" : self.parse_swissbit_info },
"Micron" : { "utility" : SMARTCTL, "parser" : self.parse_micron_info },
"Intel" : { "utility" : SMARTCTL, "parser" : self.parse_intel_info },
"Transcend" : { "utility" : TRANSCEND, "parser" : self.parse_transcend_info },
"Generic" : { "utility" : SMARTCTL, "parser" : self.parse_generic_ssd_info },
"InnoDisk" : { "utility" : INNODISK, "parser" : self.parse_innodisk_info },
"M.2" : { "utility" : INNODISK, "parser" : self.parse_innodisk_info },
"StorFly" : { "utility" : VIRTIUM, "parser" : self.parse_virtium_info },
"Virtium" : { "utility" : VIRTIUM, "parser" : self.parse_virtium_info },
"Swissbit" : { "utility" : SMARTCTL, "parser" : self.parse_swissbit_info },
"Micron" : { "utility" : SMARTCTL, "parser" : self.parse_micron_info },
"Intel" : { "utility" : SMARTCTL, "parser" : self.parse_intel_info },
"Transcend" : { "utility" : TRANSCEND, "parser" : self.parse_transcend_info },
}

self.dev = diskdev
Expand All @@ -103,6 +103,11 @@ def fetch_parse_info(self, diskdev):

# Known vendor part
if self.model:
# For some Virtium SSDs, parse_generic_ssd_info should be called.
# Since it was called above, no need to parse a specific vendor SSD info.
if self.model in ['Virtium VTPM24CEXI080-BM110006']:
return

vendor = self._parse_vendor()
if vendor:
try:
Expand Down
Loading