correct supervisord format and is_leak return value when sysfs doesn't

exist at all

Signed-off-by: Yuanzhe, Liu <[email protected]>

Author: yuazhe

dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2

@@ -207,7 +207,7 @@ dependent_startup_wait_for=rsyslogd:running {% if delay_non_critical_daemon %}de
 {% endif -%}
 
 {% if liquid_cooling_update_interval %}
-    {%- set options = options + " --liquid_cooling_update_interval {{ liquid_cooling_update_interval }}" %}
+    {%- set options = options ~ " --liquid_cooling_update_interval " ~ liquid_cooling_update_interval %}
 {% endif -%}
 
 {%- set command = base_command ~ options %}

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

@@ -44,7 +44,7 @@ def __init__(self, name,path):
         self.path = path
 
     def is_leak(self):
-        content = utils.read_int_from_file(self.path, 0)
+        content = utils.read_int_from_file(self.path, 'N/A')
 
         if content == 1:
             self.leaking = False
@@ -54,7 +54,7 @@ def is_leak(self):
             return True
         else:
             logger.error(f"Failed to read leakage sensor {self.name} value: {content}")
-            return True
+            return 'N/A'
 
 class LiquidCooling(LiquidCoolingBase):
     """Platform-specific Liquid Cooling class"""

platform/mellanox/mlnx-platform-api/tests/test_liquid_cooling.py

@@ -26,7 +26,7 @@ def test_leakage_sensor_is_leak():
     # Test when file does not exist
     with mock.patch('os.path.exists') as mock_exists:
         mock_exists.return_value = False
-        assert sensor.is_leak() is True
+        assert sensor.is_leak() == 'N/A'
 
 def test_liquid_cooling_init():
     with mock.patch('os.path.exists') as mock_exists, \

src/system-health/health_checker/hardware_checker.py

@@ -327,7 +327,7 @@ def _check_liquid_cooling_status(self, config):
 
             data_dict = self._db.get_all(self._db.STATE_DB, key)
             leak_status = data_dict.get('leak_status', None)
-            if leak_status is None:
+            if leak_status is None or leak_status == 'N/A':
                 self.set_object_not_ok('Liquid Cooling', name, 'Failed to get leakage sensor status for {}'.format(name))
                 continue