Npapi based daemon optimize

platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py

@@ -35,14 +35,6 @@
 #reboot cause related definitions
 REBOOT_CAUSE_ROOT = HWMGMT_SYSTEM_ROOT
 
-REBOOT_CAUSE_POWER_LOSS_FILE = 'reset_main_pwr_fail'
-REBOOT_CAUSE_AUX_POWER_LOSS_FILE = 'reset_aux_pwr_or_ref'
-REBOOT_CAUSE_THERMAL_OVERLOAD_ASIC_FILE = 'reset_asic_thermal'
-REBOOT_CAUSE_WATCHDOG_FILE = 'reset_hotswap_or_wd'
-REBOOT_CAUSE_MLNX_FIRMWARE_RESET = 'reset_fw_reset'
-REBOOT_CAUSE_LONG_PB = 'reset_long_pb'
-REBOOT_CAUSE_SHORT_PB = 'reset_short_pb'
-
 REBOOT_CAUSE_FILE_LENGTH = 1
 
 #version retrieving related definitions
@@ -81,6 +73,14 @@ def __init__(self):
 
         # move the initialization of each components to their dedicated initializer
         # which will be called from platform
+        self.sfp_module_initialized = False
+        self.sfp_event_initialized = False
+        self.reboot_cause_initialized = False
+        logger.log_info("Chassis loaded successfully")
+
+    def __del__(self):
+        if self.sfp_event_initialized:
+            self.sfp_event.deinitialize()
 
     def initialize_psu(self):
         from sonic_platform.psu import Psu
@@ -109,7 +109,7 @@ def initialize_fan(self):
 
     def initialize_sfp(self):
         from sonic_platform.sfp import SFP
-        from sonic_platform.sfp_event import sfp_event
+
         self.sfp_module = SFP
 
         # Initialize SFP list
@@ -126,10 +126,7 @@ def initialize_sfp(self):
                 sfp_module = SFP(index, 'SFP')
             self._sfp_list.append(sfp_module)
 
-        # Initialize SFP event
-        self.sfp_event = sfp_event()
-        self.sfp_event.initialize()
-        self.MAX_SELECT_EVENT_RETURNED = self.PORT_END
+        self.sfp_module_initialized = True
 
     def initialize_thermals(self):
         from sonic_platform.thermal import initialize_thermals
@@ -148,6 +145,58 @@ def initialize_components_list(self):
         self._component_name_list.append(COMPONENT_CPLD1)
         self._component_name_list.append(COMPONENT_CPLD2)
 
+    ##############################################
+    # SFP methods
+    ##############################################
+    def get_num_sfps(self):
+        """
+        Retrieves the number of sfps available on this chassis
+
+        Returns:
+            An integer, the number of sfps available on this chassis
+        """
+        if not self.sfp_module_initialized:
+            self.initialize_sfp()
+        return len(self._sfp_list)
+
+    def get_all_sfps(self):
+        """
+        Retrieves all sfps available on this chassis
+
+        Returns:
+            A list of objects derived from SfpBase representing all sfps 
+            available on this chassis
+        """
+        if not self.sfp_module_initialized:
+            self.initialize_sfp()
+        return self._sfp_list
+
+    def get_sfp(self, index):
+        """
+        Retrieves sfp represented by (0-based) index <index>
+
+        Args:
+            index: An integer, the index (0-based) of the sfp to retrieve.
+                   The index should be the sequence of a physical port in a chassis,
+                   starting from 0.
+                   For example, 0 for Ethernet0, 1 for Ethernet4 and so on.
+
+        Returns:
+            An object dervied from SfpBase representing the specified sfp
+        """
+        if not self.sfp_module_initialized:
+            self.initialize_sfp()
+
+        sfp = None
+
+        try:
+            sfp = self._sfp_list[index]
+        except IndexError:
+            sys.stderr.write("SFP index {} out of range (0-{})\n".format(
+                             index, len(self._sfp_list)-1))
+
+        return sfp
+
     def _extract_num_of_fans_and_fan_drawers(self):
         num_of_fan = 0
         num_of_drawer = 0
@@ -175,7 +224,7 @@ def _get_port_position_tuple_by_sku_name(self):
 
     def get_watchdog(self):
         """
-        Retreives hardware watchdog device on this chassis
+        Retrieves hardware watchdog device on this chassis
 
         Returns:
             An object derived from WatchdogBase representing the hardware
@@ -239,7 +288,7 @@ def _read_generic_file(self, filename, len):
             return result
         except Exception as e:
             logger.log_info("Fail to read file {} due to {}".format(filename, repr(e)))
-            return ''
+            return '0'
 
     def _verify_reboot_cause(self, filename):
         '''
@@ -249,6 +298,31 @@ def _verify_reboot_cause(self, filename):
         '''
         return bool(int(self._read_generic_file(join(REBOOT_CAUSE_ROOT, filename), REBOOT_CAUSE_FILE_LENGTH).rstrip('\n')))
 
+    def initialize_reboot_cause(self):
+        self.reboot_major_cause_dict = {
+            'reset_main_pwr_fail'       :   self.REBOOT_CAUSE_POWER_LOSS,
+            'reset_aux_pwr_or_ref'      :   self.REBOOT_CAUSE_POWER_LOSS,
+            'reset_asic_thermal'        :   self.REBOOT_CAUSE_THERMAL_OVERLOAD_ASIC,
+            'reset_hotswap_or_wd'       :   self.REBOOT_CAUSE_WATCHDOG,
+            'reset_swb_wd'              :   self.REBOOT_CAUSE_WATCHDOG,
+            'reset_sff_wd'              :   self.REBOOT_CAUSE_WATCHDOG
+        }
+        self.reboot_minor_cause_dict = {
+            'reset_fw_reset'            :   "Reset by ASIC firmware",
+            'reset_long_pb'             :   "Reset by long press on power button",
+            'reset_short_pb'            :   "Reset by short press on power button",
+            'reset_comex_thermal'       :   "ComEx thermal shutdown",
+            'reset_comex_pwr_fail'      :   "ComEx power fail",
+            'reset_comex_wd'            :   "Reset requested from ComEx",
+            'reset_from_asic'           :   "Reset requested from ASIC",
+            'reset_reload_bios'         :   "Reset caused by BIOS reload",
+            'reset_sw_reset'            :   "Software reset",
+            'reset_hotswap_or_halt'     :   "Reset caused by hotswap or halt",
+            'reset_from_comex'          :   "Reset from ComEx",
+            'reset_voltmon_upgrade_fail':   "Reset due to voltage monitor devices upgrade failure"
+        }
+        self.reboot_cause_initialized = True
+
     def get_reboot_cause(self):
         """
         Retrieves the cause of the previous reboot
@@ -261,27 +335,18 @@ def get_reboot_cause(self):
             to pass a description of the reboot cause.
         """
         #read reboot causes files in the following order
-        minor_cause = ''
-        if self._verify_reboot_cause(REBOOT_CAUSE_POWER_LOSS_FILE):
-            major_cause = self.REBOOT_CAUSE_POWER_LOSS
-        elif self._verify_reboot_cause(REBOOT_CAUSE_AUX_POWER_LOSS_FILE):
-            major_cause = self.REBOOT_CAUSE_POWER_LOSS
-        elif self._verify_reboot_cause(REBOOT_CAUSE_THERMAL_OVERLOAD_ASIC_FILE):
-            major_cause = self.REBOOT_CAUSE_THERMAL_OVERLOAD_ASIC
-        elif self._verify_reboot_cause(REBOOT_CAUSE_WATCHDOG_FILE):
-            major_cause = self.REBOOT_CAUSE_WATCHDOG
-        else:
-            major_cause = self.REBOOT_CAUSE_HARDWARE_OTHER
-            if self._verify_reboot_cause(REBOOT_CAUSE_MLNX_FIRMWARE_RESET):
-                minor_cause = "Reset by ASIC firmware"
-            elif self._verify_reboot_cause(REBOOT_CAUSE_LONG_PB):
-                minor_cause = "Reset by long press on power button"
-            elif self._verify_reboot_cause(REBOOT_CAUSE_SHORT_PB):
-                minor_cause = "Reset by short press on power button"
-            else:
-                major_cause = self.REBOOT_CAUSE_NON_HARDWARE
+        if not self.reboot_cause_initialized:
+            self.initialize_reboot_cause()
 
-        return major_cause, minor_cause
+        for reset_file, reset_cause in self.reboot_major_cause_dict.iteritems():
+            if self._verify_reboot_cause(reset_file):
+                return reset_cause, ''
+
+        for reset_file, reset_cause in self.reboot_minor_cause_dict.iteritems():
+            if self._verify_reboot_cause(reset_file):
+                return self.REBOOT_CAUSE_HARDWARE_OTHER, reset_cause
+
+        return self.REBOOT_CAUSE_NON_HARDWARE, ''
 
     def _get_cpld_version(self, version_file):
         cpld_version = self._read_generic_file(join(CPLD_VERSION_ROOT, version_file), CPLD_VERSION_MAX_LENGTH)
@@ -423,6 +488,14 @@ def get_change_event(self, timeout=0):
                       indicates that fan 0 has been removed, fan 2
                       has been inserted and sfp 11 has been removed.
         """
+        # Initialize SFP event first
+        if not self.sfp_event_initialized:
+            from sonic_platform.sfp_event import sfp_event
+            self.sfp_event = sfp_event()
+            self.sfp_event.initialize()
+            self.MAX_SELECT_EVENT_RETURNED = self.PORT_END
+            self.sfp_event_initialized = True
+
         wait_for_ever = (timeout == 0)
         port_dict = {}
         if wait_for_ever:

platform/mellanox/mlnx-platform-api/sonic_platform/platform.py

@@ -22,7 +22,6 @@ def __init__(self):
             self._chassis = Chassis()
             self._chassis.initialize_psu()
             self._chassis.initialize_fan()
-            self._chassis.initialize_sfp()
             self._chassis.initialize_eeprom()
             self._chassis.initialize_components_list()