[DellEMC Z9332f] Added support for platform system health daemon (#6642)

device/dell/x86_64-dellemc_z9332f_d1508-r0/system_health_monitoring_config.json

@@ -0,0 +1,11 @@
+{
+    "services_to_ignore": [],
+    "devices_to_ignore": ["asic","fan.speed"],
+    "user_defined_checkers": [],
+    "polling_interval": 60,
+    "led_color": {
+        "fault": "yellow",
+        "normal": "green",
+        "booting": "flash_green"
+    }
+}

platform/broadcom/sonic-platform-modules-dell/common/ipmihelper.py

@@ -33,7 +33,7 @@ def get_ipmitool_raw_output(args):
     command = "ipmitool raw {}".format(args)
     try:
         proc = subprocess.Popen(command.split(), stdout=subprocess.PIPE,
-                                stderr=subprocess.STDOUT)
+                                universal_newlines=True, stderr=subprocess.STDOUT)
         stdout = proc.communicate()[0]
         proc.wait()
         if not proc.returncode:
@@ -175,11 +175,11 @@ class IpmiFru(object):
         command = "ipmitool fru print {}".format(self.id)
         try:
             proc = subprocess.Popen(command.split(), stdout=subprocess.PIPE,
-                                    stderr=subprocess.STDOUT)
+                                    universal_newlines=True, stderr=subprocess.STDOUT)
             stdout = proc.communicate()[0]
             proc.wait()
             if not proc.returncode:
-                result = stdout.decode('utf-8').rstrip('\n')
+                result = stdout.rstrip('\n')
         except EnvironmentError:
             pass
 
@@ -248,11 +248,11 @@ class IpmiFru(object):
                                                           offset_MSB, count)
         try:
             proc = subprocess.Popen(command.split(), stdout=subprocess.PIPE,
-                                    stderr=subprocess.STDOUT)
+                                    universal_newlines=True, stderr=subprocess.STDOUT)
             stdout = proc.communicate()[0]
             proc.wait()
             if not proc.returncode:
-                result = stdout.decode('utf-8').rstrip('\n')
+                result = stdout.rstrip('\n')
         except EnvironmentError:
             is_valid = False
 

platform/broadcom/sonic-platform-modules-dell/common/sonic_platform/hwaccess.py

@@ -1,5 +1,6 @@
 # Helper functions to access hardware
 
+import os
 import struct
 import mmap
 import subprocess
@@ -22,3 +23,31 @@ def pci_get_value(resource, offset):
 
 def i2c_get(bus, i2caddr, ofs):
     return int(subprocess.check_output(['/usr/sbin/i2cget', '-y', str(bus), str(i2caddr), str(ofs)]), 16)
+
+def io_reg_read(io_resource, offset):
+    fd = os.open(io_resource, os.O_RDONLY)
+    if fd < 0:
+        print('file open failed %s' % io_resource)
+        return -1
+    if os.lseek(fd, offset, os.SEEK_SET) != offset:
+        print('lseek failed on %s' % io_resource)
+        return -1
+    buf = os.read(fd, 1)
+    reg_val1 = ord(buf)
+    os.close(fd)
+    return reg_val1
+
+def io_reg_write(io_resource, offset, val):
+    fd = os.open(io_resource, os.O_RDWR)
+    if fd < 0:
+        print('file open failed %s' % io_resource)
+        return False
+    if os.lseek(fd, offset, os.SEEK_SET) != offset:
+        print('lseek failed on %s' % io_resource)
+        return False
+    ret = os.write(fd, struct.pack('B', val))
+    if ret != 1:
+        print('write failed %d' % ret)
+        return False
+    os.close(fd)
+    return True

platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py

@@ -19,6 +19,7 @@ try:
     from sonic_platform.thermal import Thermal
     from sonic_platform.fan_drawer import FanDrawer
     from sonic_platform.watchdog import Watchdog
+    import sonic_platform.hwaccess as hwaccess
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
@@ -53,9 +54,25 @@ class Chassis(ChassisBase):
     REBOOT_CAUSE_PATH = "/host/reboot-cause/platform/reboot_reason"
     oir_fd = -1
     epoll = -1
+    io_res = "/dev/port"
+    sysled_offset = 0xA162
+    SYSLED_COLOR_TO_REG = {
+       "green": 0xd0,
+       "yellow": 0xe0,
+       "flash_green": 0xd2,
+       "flash_yellow": 0xe2
+       }
+
+    REG_TO_SYSLED_COLOR = {
+        0xd0 : "green",
+        0xe0 : "yellow",
+        0xd2 : "flash_green",
+        0xd1 : "flash_green",
+        0xe2 : "flash_yellow",
+        0xe1 : "flash_yellow"
+        }
 
     _global_port_pres_dict = {}
-
     _port_to_i2c_mapping = {
             1:  10,
             2:  11,
@@ -317,3 +334,35 @@ class Chassis(ChassisBase):
 
     def get_qualified_media_list(self):
         return media_part_num_list
+
+    def initizalize_system_led(self):
+        self.sys_ledcolor = "green"
+
+    def get_status_led(self):
+        """
+        Gets the current system LED color
+
+        Returns:
+            A string that represents the supported color
+        """
+        val = hwaccess.io_reg_read(self.io_res, self.sysled_offset)
+        if val != -1:
+            return self.REG_TO_SYSLED_COLOR.get(val)
+        return self.sys_ledcolor
+
+    def set_status_led(self, color):
+        """ 
+        Set system LED status based on the color type passed in the argument.
+        Argument: Color to be set
+        Returns:
+          bool: True is specified color is set, Otherwise return False
+        """
+
+        if color not in list(self.SYSLED_COLOR_TO_REG.keys()):
+            return False
+
+        if(not hwaccess.io_reg_write(self.io_res, self.sysled_offset, self.SYSLED_COLOR_TO_REG[color])):
+            return False
+        self.sys_ledcolor = color
+        return True
+

platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/psu.py

@@ -21,9 +21,11 @@ class Psu(PsuBase):
 
     # { PSU-ID: { Sensor-Name: Sensor-ID } }
     SENSOR_MAPPING = { 1: { "State": 0x2f, "Current": 0x37,
-                            "Power": 0x38, "Voltage": 0x36 },
+                            "Power": 0x38, "Voltage": 0x36, 
+                            "Temperature": 0x35 },
                        2: { "State": 0x39, "Current": 0x41,
-                            "Power": 0x42, "Voltage": 0x40 } }
+                            "Power": 0x42, "Voltage": 0x40, 
+                            "Temperature": 0x3F } }
     # ( PSU-ID: FRU-ID }
     FRU_MAPPING = { 1: 3, 2: 4 }
 
@@ -36,6 +38,7 @@ class Psu(PsuBase):
         self.voltage_sensor = IpmiSensor(self.SENSOR_MAPPING[self.index]["Voltage"])
         self.current_sensor = IpmiSensor(self.SENSOR_MAPPING[self.index]["Current"])
         self.power_sensor = IpmiSensor(self.SENSOR_MAPPING[self.index]["Power"])
+        self.temp_sensor = IpmiSensor(self.SENSOR_MAPPING[self.index ]["Temperature"])
         self.fru = IpmiFru(self.FRU_MAPPING[self.index])
         self.psu_type_raw_cmd = "0x3A 0x0B {}".format(psu_index+1)
 
@@ -112,6 +115,38 @@ class Psu(PsuBase):
 
         return "{:.1f}".format(voltage)
 
+    def get_voltage_low_threshold(self):
+        """
+        Returns PSU low threshold in Volts
+        """
+        return 11.4
+
+    def get_voltage_high_threshold(self):
+        """
+        Returns PSU high threshold in Volts
+        """
+        return 12.6
+
+    def get_temperature(self):
+        """
+        Retrieves current temperature reading from thermal
+
+        Returns:
+            A float number of current temperature in Celsius up to
+            nearest thousandth of one degree Celsius, e.g. 30.125
+        """
+        is_valid, temperature = self.temp_sensor.get_reading()
+        if not is_valid:
+            temperature = 0
+
+        return float(temperature)
+
+    def get_temperature_high_threshold(self):
+        """
+        Returns the high temperature threshold for PSU in Celsius
+        """
+        return 45.0
+
     def get_current(self):
         """
         Retrieves present electric current supplied by PSU