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.

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

Changed the import path of ssdutil in vendor ssdutil to match stormon changes #19113

Closed

Conversation

assrinivasan
Copy link
Contributor

@assrinivasan assrinivasan commented May 28, 2024

Why I did it

This is a sister PR to the Storge Monitoring Daemon implementation, where the names of sonic-platform-common/sonic_platofrm_base/sonic_ssd and its constituent files were changed.

Work item tracking
  • Microsoft ADO (number only): 17468992

How I did it

Changed the import path to match the new folder sturcture in sonic-platform-common

How to verify it

After Storage monitoring daemon and associated changes have been merged, pick up this change. Then run the ssdutil command as follows:

admin@str-s6100-acs-1:/usr/local/lib/python3.11/dist-packages$ cat ssdutil/* | grep -i "ssdutil"
SYSLOG_IDENTIFIER = "ssdutil"
        from ssd_util import SsdUtil
        log.log_warning("Platform specific SsdUtil module not found. Falling down to the generic implementation")
            **from sonic_platform_base.sonic_storage.ssd import SsdUtil**
            log.log_error("Failed to import default SsdUtil. Error: {}".format(str(e)), True)
    return SsdUtil(diskdev)
cat: def ssdutil():
ssdutil/__pycache__    ssdutil()

admin@str-s6100-acs-1:/usr/local/lib/python3.11/dist-packages$ sudo ssdutil
Device Model : InnoDisk Corp. - mSATA 3IE3
Health       : 99%
Temperature  : 30C

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205
  • 202211
  • 202305

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

NOTE: Ideal merge order should be as follows:

  1. Support for static and dynamic attrs as part of stormond implementation
  2. Implementation of a Monitoring Daemon for storage devices in SONiC switches
  3. Added makefile and dependencies for building sonic-stormond whl
  4. Rename sonic_ssd to sonic_storage matching corresponding sonic-platform-common change
  5. This PR

@assrinivasan
Copy link
Contributor Author

/azpw run

@mssonicbld
Copy link
Collaborator

/AzurePipelines run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@assrinivasan
Copy link
Contributor Author

/azpw run

@mssonicbld
Copy link
Collaborator

/AzurePipelines run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@assrinivasan
Copy link
Contributor Author

The changes made here were done as part of #19113, rendering this PR unnecessary. Closing.

@assrinivasan assrinivasan deleted the vendor-ssdutil-namechange branch June 4, 2024 21:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants