Merge branch 'sonic-net:master' into Revise_get_firmware_update_notification_output_to_string

Author: PJHsieh

setup.py

@@ -37,7 +37,7 @@
         'sonic_platform_base',
         'sonic_platform_base.sonic_eeprom',
         'sonic_platform_base.sonic_sfp',
-        'sonic_platform_base.sonic_ssd',
+        'sonic_platform_base.sonic_storage',
         'sonic_platform_base.sonic_pcie',
         'sonic_platform_base.sonic_thermal_control',
         'sonic_platform_base.sonic_xcvr',
@@ -52,6 +52,7 @@
         'sonic_platform_base.sonic_xcvr.api.credo',
         'sonic_platform_base.sonic_xcvr.mem_maps.credo',
         'sonic_platform_base.sonic_xcvr.codes.credo',
+        'sonic_platform_base.sonic_xcvr.api.innolight',
         'sonic_psu',
         'sonic_sfp',
         'sonic_thermal',

sonic_platform_base/sonic_ssd/ssd_generic.py

@@ -1,21 +1,22 @@
 #
-# ssd_emmc.py
+# emmc.py
 #
 # Implementation of SSD Utility API for eMMC.
 # It reads eMMC health, model, firmware, and serial from /sys/block/*.
 #
 
 try:
     import os
-    from .ssd_base import SsdBase
+    from .storage_common import StorageCommon
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
 
-class EmmcUtil(SsdBase):
+class EmmcUtil(StorageCommon):
     def __init__(self, diskdev):
         self.diskdev = diskdev
         self.path = os.path.join('/sys/block', os.path.basename(diskdev))
+        StorageCommon.__init__(self, diskdev)
 
     def _read_device_entry(self, entry, default=None):
         path = os.path.join(self.path, 'device', entry)
@@ -49,3 +50,15 @@ def get_serial(self):
 
     def get_vendor_output(self):
         return ''
+
+    def get_disk_io_reads(self):
+        return 'N/A'
+
+    def get_disk_io_writes(self):
+        return 'N/A'
+
+    def get_reserved_blocks(self):
+        return 'N/A'
+
+    def fetch_parse_info(self, diskdev=None):
+        return