From fc92e6b3e52a59fbc4ef0c6762c304f4c96551d5 Mon Sep 17 00:00:00 2001
From: dflynn <dennis.flynn@nokia.com>
Date: Wed, 15 Sep 2021 13:49:07 -0400
Subject: [PATCH 1/2] [Nokia ixs7215] Support show system-health

---
 .../system_health_monitoring_config.json      | 14 +++++
 .../7215/sonic_platform/chassis.py            | 52 +++++++++++--------
 2 files changed, 45 insertions(+), 21 deletions(-)
 create mode 100644 device/nokia/armhf-nokia_ixs7215_52x-r0/system_health_monitoring_config.json

diff --git a/device/nokia/armhf-nokia_ixs7215_52x-r0/system_health_monitoring_config.json b/device/nokia/armhf-nokia_ixs7215_52x-r0/system_health_monitoring_config.json
new file mode 100644
index 00000000000..fb16658c840
--- /dev/null
+++ b/device/nokia/armhf-nokia_ixs7215_52x-r0/system_health_monitoring_config.json
@@ -0,0 +1,14 @@
+{
+    "services_to_ignore": [],
+    "devices_to_ignore": [
+        "asic",
+        "psu"
+    ],
+    "user_defined_checkers": [],
+    "polling_interval": 60,
+    "led_color": {
+        "fault": "amber",
+        "normal": "green",
+        "booting": "blinking green"
+    }
+}
diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/chassis.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/chassis.py
index a01aca24b68..7fd9c7583c4 100755
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/chassis.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/chassis.py
@@ -8,6 +8,7 @@
 try:
     import os
     import sys
+    import subprocess
     import glob
     from sonic_platform_base.chassis_base import ChassisBase
     from sonic_platform.sfp import Sfp
@@ -27,6 +28,11 @@
 except ImportError as e:
     smbus_present = 0
 
+if sys.version_info[0] < 3:
+    import commands as cmd
+else:
+    import subprocess as cmd
+
 MAX_SELECT_DELAY = 3600
 COPPER_PORT_START = 1
 COPPER_PORT_END = 48
@@ -278,6 +284,9 @@ def get_thermal_manager(self):
         from .thermal_manager import ThermalManager
         return ThermalManager
 
+    def initizalize_system_led(self):
+        return True
+
     def set_status_led(self, color):
         """
         Sets the state of the system LED
@@ -306,17 +315,18 @@ def set_status_led(self, color):
             return False
 
         # Write sys led
-        if smbus_present == 0:
-            sonic_logger.log_warning("PMON LED SET -> smbus present = 0")
+        if smbus_present == 0:  # called from host (e.g. 'show system-health')
+            cmdstatus, value = cmd.getstatusoutput('sudo i2cset -y 0 0x41 0x7 %d' % value)
+            if cmdstatus:
+                sonic_logger.log_warning("  System LED set %s failed" % value)
+                return False
         else:
             bus = smbus.SMBus(0)
             DEVICE_ADDRESS = 0x41
             DEVICEREG = 0x7
             bus.write_byte_data(DEVICE_ADDRESS, DEVICEREG, value)
-            sonic_logger.log_info("  System LED set O.K.  ")
-            return True
 
-        return False
+        return True
 
     def get_status_led(self):
         """
@@ -327,29 +337,29 @@ def get_status_led(self):
             specified.
         """
         # Read sys led
-        if smbus_present == 0:
-            sonic_logger.log_warning("PMON LED GET -> smbus present = 0")
-            return False
+        if smbus_present == 0:  # called from host
+            cmdstatus, value = cmd.getstatusoutput('sudo i2cget -y 0 0x41 0x7')
+            value = int(value, 16)
         else:
             bus = smbus.SMBus(0)
             DEVICE_ADDRESS = 0x41
             DEVICE_REG = 0x7
             value = bus.read_byte_data(DEVICE_ADDRESS, DEVICE_REG)
 
-            if value == 0x00:
-                color = 'off'
-            elif value == 0x01:
-                color = 'amber'
-            elif value == 0x02:
-                color = 'green'
-            elif value == 0x03:
-                color = 'amber_blink'
-            elif value == 0x04:
-                color = 'green_blink'
-            else:
-                return False
+        if value == 0x00:
+            color = 'off'
+        elif value == 0x01:
+            color = 'amber'
+        elif value == 0x02:
+            color = 'green'
+        elif value == 0x03:
+            color = 'amber_blink'
+        elif value == 0x04:
+            color = 'green_blink'
+        else:
+            return None
 
-            return color
+        return color
 
     def get_watchdog(self):
         """

From d909d6a44f05a877ac10cd1d31b7d48086e9808a Mon Sep 17 00:00:00 2001
From: dflynn <dennis.flynn@nokia.com>
Date: Thu, 16 Sep 2021 09:16:04 -0400
Subject: [PATCH 2/2] [Nokia ixs7215] Fix LGTM alert

---
 .../sonic-platform-nokia/7215/sonic_platform/chassis.py          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/chassis.py b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/chassis.py
index 7fd9c7583c4..cf67a7bb30a 100755
--- a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/chassis.py
+++ b/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/chassis.py
@@ -8,7 +8,6 @@
 try:
     import os
     import sys
-    import subprocess
     import glob
     from sonic_platform_base.chassis_base import ChassisBase
     from sonic_platform.sfp import Sfp