[device/celestica]: Add firmware management api based on the new platform API

device/celestica/x86_64-cel_e1031-r0/sonic_platform/chassis.py

@@ -18,18 +18,14 @@
     from sonic_platform_base.chassis_base import ChassisBase
     from sonic_platform.fan import Fan
     from sonic_platform.psu import Psu
-    from sonic_platform.module import Module
+    from sonic_platform.device import Device
+    from sonic_platform.component import Component
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
-MMC_CPLD_ADDR = '0x100'
-BIOS_VERSION_PATH = "/sys/class/dmi/id/bios_version"
 CONFIG_DB_PATH = "/etc/sonic/config_db.json"
-SMC_CPLD_PATH = "/sys/devices/platform/e1031.smc/version"
-MMC_CPLD_PATH = "/sys/devices/platform/e1031.smc/getreg"
 NUM_FAN = 3
 NUM_PSU = 2
-NUM_MODULE = 3
 
 
 class Chassis(ChassisBase):
@@ -43,20 +39,9 @@ def __init__(self):
         for index in range(0, NUM_PSU):
             psu = Psu(index)
             self._psu_list.append(psu)
-        for index in range(0, NUM_MODULE):
-            module = Module(index)
-            self._module_list.append(module)
         ChassisBase.__init__(self)
-
-    def __get_register_value(self, path, register):
-        cmd = "echo {1} > {0}; cat {0}".format(path, register)
-        p = subprocess.Popen(
-            cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        raw_data, err = p.communicate()
-        if err is not '':
-            return 'None'
-        else:
-            return raw_data.strip()
+        self.component_device = Device("component")
+        self.component_list = self.component_device.get_name_list()
 
     def __read_config_db(self):
         try:
@@ -80,39 +65,41 @@ def get_base_mac(self):
         except KeyError:
             raise KeyError("Base MAC not found")
 
-    def get_component_versions(self):
+    def get_component_list(self):
+        """
+        Retrieves chassis components list such as BIOS, CPLD, FPGA, etc.
+
+        Returns:
+            A list containing component name
+        """
+        return self.component_list
+
+    def get_firmware_version(self, component_name):
         """
         Retrieves platform-specific hardware/firmware versions for chassis
         componenets such as BIOS, CPLD, FPGA, etc.
+        Args:
+            type: A string, component name
+
         Returns:
             A string containing platform-specific component versions
         """
+        self.component = Component(component_name)
+        if component_name not in self.component_list:
+            return None
+        return self.component.get_firmware_version()
 
-        component_versions = dict()
-
-        # Get BIOS version
-        try:
-            with open(BIOS_VERSION_PATH, 'r') as fd:
-                bios_version = fd.read()
-        except IOError:
-            raise IOError("Unable to open version file !")
-
-        # Get CPLD version
-        cpld_version = dict()
-
-        with open(SMC_CPLD_PATH, 'r') as fd:
-            smc_cpld_version = fd.read()
-        smc_cpld_version = 'None' if smc_cpld_version is 'None' else "{}.{}".format(
-            int(smc_cpld_version[2], 16), int(smc_cpld_version[3], 16))
-
-        mmc_cpld_version = self.__get_register_value(
-            MMC_CPLD_PATH, MMC_CPLD_ADDR)
-        mmc_cpld_version = 'None' if mmc_cpld_version is 'None' else "{}.{}".format(
-            int(mmc_cpld_version[2], 16), int(mmc_cpld_version[3], 16))
-
-        cpld_version["SMC"] = smc_cpld_version
-        cpld_version["MMC"] = mmc_cpld_version
+    def install_component_firmware(self, component_name, image_path):
+        """
+        Install firmware to module
+        Args:
+            type: A string, component name.
+            image_path: A string, path to firmware image.
 
-        component_versions["CPLD"] = cpld_version
-        component_versions["BIOS"] = bios_version.strip()
-        return str(component_versions)
+        Returns:
+            A boolean, True if install successfully, False if not
+        """
+        self.component = Component(component_name)
+        if component_name not in self.component_list:
+            return False
+        return self.component.upgrade_firmware(image_path)

device/celestica/x86_64-cel_e1031-r0/sonic_platform/module.py → device/celestica/x86_64-cel_e1031-r0/sonic_platform/component.py

@@ -3,8 +3,8 @@
 #############################################################################
 # Celestica
 #
-# Module contains an implementation of SONiC Platform Base API and
-# provides the components firmware management fucntion
+# Component contains an implementation of SONiC Platform Base API and
+# provides the components firmware management function
 #
 #############################################################################
 
@@ -15,8 +15,7 @@
 import subprocess
 
 try:
-    from sonic_platform_base.module_base import ModuleBase
-    from sonic_platform.device import Device
+    from sonic_platform_base.device_base import DeviceBase
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
@@ -27,14 +26,14 @@
 MMC_CPLD_PATH = "/sys/devices/platform/e1031.smc/getreg"
 
 
-class Module(ModuleBase):
-    """Platform-specific Module class"""
+class Component(DeviceBase):
+    """Platform-specific Component class"""
 
-    def __init__(self, module_index):
-        ModuleBase.__init__(self)
-        self.index = module_index
-        self.device_base = Device(self.index, self.DEVICE_TYPE)
-        self.name = self.device_base.get_name()
+    DEVICE_TYPE = "component"
+
+    def __init__(self, component_name):
+        DeviceBase.__init__(self)
+        self.name = component_name.upper()
 
     def __run_command(self, command):
         # Run bash command and print output to stdout
@@ -45,8 +44,6 @@ def __run_command(self, command):
                 output = process.stdout.readline()
                 if output == '' and process.poll() is not None:
                     break
-                if output:
-                    print(output.strip())
             rc = process.poll()
             if rc != 0:
                 return False
@@ -64,7 +61,7 @@ def __get_register_value(self, path, register):
             return None
         return raw_data.strip()
 
-    def get_bios_version(self):
+    def __get_bios_version(self):
         # Retrieves the BIOS firmware version
         try:
             with open(BIOS_VERSION_PATH, 'r') as fd:
@@ -73,7 +70,7 @@ def get_bios_version(self):
         except Exception as e:
             return None
 
-    def get_cpld_version(self):
+    def __get_cpld_version(self):
         # Retrieves the CPLD firmware version
         cpld_version = dict()
         with open(SMC_CPLD_PATH, 'r') as fd:
@@ -99,9 +96,9 @@ def get_firmware_version(self):
         fw_version = None
 
         if self.name == "BIOS":
-            fw_version = self.get_bios_version()
+            fw_version = self.__get_bios_version()
         elif "CPLD" in self.name:
-            cpld_version = self.get_cpld_version()
+            cpld_version = self.__get_cpld_version()
             fw_version = cpld_version.get(self.name)
 
         return fw_version

device/celestica/x86_64-cel_e1031-r0/sonic_platform/device.py

@@ -3,8 +3,8 @@
 #############################################################################
 # Celestica
 #
-# Module contains an implementation of SONiC Platform Base API and
-# provides the components firmware management fucntion
+# Device contains an implementation of SONiC Platform Base API and
+# provides the device information
 #
 #############################################################################
 
@@ -17,21 +17,31 @@
 class Device(DeviceBase):
     """Platform-specific Device class"""
 
-    MODULES_NAME = ["SMC_CPLD", "MMC_CPLD", "BIOS"]
+    COMPONENTS_NAME = ["SMC_CPLD", "MMC_CPLD", "BIOS"]
 
-    def __init__(self, index, device_type):
+    def __init__(self, device_type, index=None):
         self.device_type = device_type
         self.index = index
         DeviceBase.__init__(self)
 
     def get_name(self):
         """
         Retrieves the name of the device
-
-        Returns:
+            Returns:
             string: The name of the device
         """
         device_name = {
-            "module": self.MODULES_NAME[self.index]
+            "component": self.COMPONENTS_NAME[self.index]
         }.get(self.device_type, None)
         return device_name
+
+    def get_name_list(self):
+        """
+        Retrieves list of the device name that available in this device type
+            Returns:
+            string: The list of device name
+        """
+        name_list = {
+            "component": self.COMPONENTS_NAME
+        }.get(self.device_type, None)
+        return name_list

device/celestica/x86_64-cel_seastone-r0/sonic_platform/chassis.py

@@ -18,22 +18,14 @@
     from sonic_platform_base.chassis_base import ChassisBase
     from sonic_platform.fan import Fan
     from sonic_platform.psu import Psu
-    from sonic_platform.module import Module
+    from sonic_platform.device import Device
+    from sonic_platform.component import Component
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
-BIOS_VERSION_PATH = "/sys/class/dmi/id/bios_version"
-GETREG_PATH = "/sys/devices/platform/dx010_cpld/getreg"
 CONFIG_DB_PATH = "/etc/sonic/config_db.json"
 NUM_FAN = 5
-NUM_MODULE = 5
-CPLD_ADDR_MAPPING = {
-    "CPLD1": "0x100",
-    "CPLD2": "0x200",
-    "CPLD3": "0x280",
-    "CPLD4": "0x300",
-    "CPLD5": "0x380"
-}
+NUM_PSU = 2
 
 
 class Chassis(ChassisBase):
@@ -47,20 +39,9 @@ def __init__(self):
         for index in range(0, NUM_PSU):
             psu = Psu(index)
             self._psu_list.append(psu)
-        for index in range(0, NUM_MODULE):
-            module = Module(index)
-            self._module_list.append(module)
         ChassisBase.__init__(self)
-
-    def __get_register_value(self, path, register):
-        cmd = "echo {1} > {0}; cat {0}".format(path, register)
-        p = subprocess.Popen(
-            cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        raw_data, err = p.communicate()
-        if err is not '':
-            return 'None'
-        else:
-            return raw_data.strip()
+        self.component_device = Device("component")
+        self.component_list = self.component_device.get_name_list()
 
     def __read_config_db(self):
         try:
@@ -84,35 +65,41 @@ def get_base_mac(self):
         except KeyError:
             raise KeyError("Base MAC not found")
 
-    def get_component_versions(self):
+    def get_component_list(self):
+        """
+        Retrieves chassis components list such as BIOS, CPLD, FPGA, etc.
+
+        Returns:
+            A list containing component name
+        """
+        return self.component_list
+
+    def get_firmware_version(self, component_name):
         """
         Retrieves platform-specific hardware/firmware versions for chassis
         componenets such as BIOS, CPLD, FPGA, etc.
+        Args:
+            type: A string, component name
+
         Returns:
             A string containing platform-specific component versions
         """
+        self.component = Component(component_name)
+        if component_name not in self.component_list:
+            return None
+        return self.component.get_firmware_version()
 
-        component_versions = dict()
-
-        # Get BIOS version
-        try:
-            with open(BIOS_VERSION_PATH, 'r') as fd:
-                bios_version = fd.read()
-        except IOError:
-            raise IOError("Unable to open version file !")
+    def install_component_firmware(self, component_name, image_path):
+        """
+        Install firmware to module
+        Args:
+            type: A string, component name.
+            image_path: A string, path to firmware image.
 
-        # Get CPLD version
-        cpld_version = dict()
-        for cpld_name in CPLD_ADDR_MAPPING:
-            try:
-                cpld_addr = CPLD_ADDR_MAPPING[cpld_name]
-                cpld_version_raw = self.__get_register_value(
-                    GETREG_PATH, cpld_addr)
-                cpld_version_str = "{}.{}".format(int(cpld_version_raw[2], 16), int(
-                    cpld_version_raw[3], 16)) if cpld_version_raw is not None else 'None'
-                cpld_version[cpld_name] = cpld_version_str
-            except Exception, e:
-                cpld_version[cpld_name] = 'None'
-        component_versions["CPLD"] = cpld_version
-        component_versions["BIOS"] = bios_version.strip()
-        return str(component_versions)
+        Returns:
+            A boolean, True if install successfully, False if not
+        """
+        self.component = Component(component_name)
+        if component_name not in self.component_list:
+            return False
+        return self.component.upgrade_firmware(image_path)