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

device/arista/x86_64-arista_common/plugins/ssd_util.py

@@ -2,4 +2,4 @@
 try:
    from arista.utils.sonic_ssd import SsdUtil
 except ImportError:
-   from sonic_platform_base.sonic_ssd.ssd_generic import SsdUtil
+   from sonic_platform_base.sonic_storage.ssd import SsdUtil

device/nokia/arm64-nokia_ixs7215_52xb-r0/plugins/ssd_util.py

@@ -1,4 +1,4 @@
 try:
    from sonic_ssd import SsdUtil
 except ImportError:
-   from sonic_platform_base.sonic_ssd.ssd_generic import SsdUtil
+   from sonic_platform_base.sonic_storage.ssd import SsdUtil

device/nvidia-bluefield/arm64-nvda_bf-9009d3b600cvaa/plugins/ssd_util.py

@@ -1,8 +1,8 @@
 
 import os
 
-from sonic_platform_base.sonic_ssd.ssd_emmc import EmmcUtil
-from sonic_platform_base.sonic_ssd.ssd_generic import SsdUtil as SsdUtilDefault
+from sonic_platform_base.sonic_storage.emmc import EmmcUtil
+from sonic_platform_base.sonic_storage.ssd import SsdUtil as SsdUtilDefault
 
 def SsdUtil(diskdev):
    if os.path.basename(diskdev).startswith('mmcblk'):

device/pensando/arm64-elba-asic-r0/plugins/ssd_util.py

@@ -10,14 +10,14 @@
 try:
     import re
     import subprocess
-    from sonic_platform_base.sonic_ssd.ssd_base import SsdBase
+    from sonic_platform_base.sonic_storage.storage_base import StorageBase
 except ImportError as e:
     raise ImportError (str(e) + "- required module not found")
 
 NOT_AVAILABLE = "N/A"
 MMC_DATA_PATH = "/sys/class/mmc_host/mmc0/mmc0:0001/{}"
 
-class SsdUtil(SsdBase):
+class SsdUtil(StorageBase):
     """
     Generic implementation of the SSD health API
     """

device/ragile/x86_64-ragile_ra-b6510-48v8c-r0/plugins/ssd_util.py

@@ -11,7 +11,7 @@
     import re
     import os
     import subprocess
-    from sonic_platform_base.sonic_ssd.ssd_base import SsdBase
+    from sonic_platform_base.sonic_storage.storage_base import StorageBase
 except ImportError as e:
     raise ImportError (str(e) + "- required module not found")
 
@@ -30,7 +30,7 @@
 INNODISK_HEALTH_ID = 169
 INNODISK_TEMPERATURE_ID = 194
 
-class SsdUtil(SsdBase):
+class SsdUtil(StorageBase):
     """
     Generic implementation of the SSD health API
     """

device/ragile/x86_64-ragile_ra-b6920-4s-r0/plugins/ssd_util.py

@@ -2,14 +2,14 @@
 # ssd_health
 #
 
-from sonic_platform_base.sonic_ssd.ssd_base import SsdBase
+from sonic_platform_base.sonic_storage.storage_base import StorageBase
 from subprocess import Popen, PIPE
 from re import findall
 from os.path import exists
 
 NOT_AVAILABLE = "N/A"
 
-class SsdUtil(SsdBase):
+class SsdUtil(StorageBase):
 
     def __init__(self, diskdev):
         """

device/supermicro/x86_64-supermicro_sse_t7132s-r0/plugins/ssd_util.py

@@ -1,4 +1,4 @@
-from sonic_platform_base.sonic_ssd.ssd_generic import SsdUtil as SsdUtilGeneric
+from sonic_platform_base.sonic_storage.ssd import SsdUtil as SsdUtilGeneric
 
 class SsdUtil(SsdUtilGeneric):
     def parse_innodisk_info(self):

platform/marvell/sonic-platform-nokia/7215-a1/utils/sonic_ssd.py

@@ -2,10 +2,10 @@
 import os
 
 # pylint: disable=import-error
-from sonic_platform_base.sonic_ssd.ssd_base import SsdBase
-from sonic_platform_base.sonic_ssd.ssd_generic import SsdUtil as SsdUtilDefault
+from sonic_platform_base.sonic_storage.storage_base import StorageBase
+from sonic_platform_base.sonic_storage.ssd import SsdUtil as SsdUtilDefault
 
-class EmmcUtil(SsdBase):
+class EmmcUtil(StorageBase):
    def __init__(self, diskdev):
       self.diskdev = diskdev
       self.path = os.path.join('/sys/block', os.path.basename(diskdev))