Revert "Add thermal control support for SONiC (#3949)"

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

@@ -91,14 +91,3 @@ stdout_logfile=syslog
 stderr_logfile=syslog
 startsecs=10
 {% endif %}
-
-{% if not skip_thermalctld %}
-[program:thermalctld]
-command=/usr/bin/thermalctld
-priority=9
-autostart=false
-autorestart=unexpected
-stdout_logfile=syslog
-stderr_logfile=syslog
-startsecs=10
-{% endif %}

dockers/docker-platform-monitor/start.sh.j2

@@ -75,7 +75,3 @@ supervisorctl start psud
 supervisorctl start syseepromd
 {% endif %}
 
-{% if not skip_thermalctld %}
-supervisorctl start thermalctld
-{% endif %}
-

platform/mellanox/mlnx-platform-api.mk

@@ -3,7 +3,6 @@
 SONIC_PLATFORM_API_PY2 = mlnx_platform_api-1.0-py2-none-any.whl
 $(SONIC_PLATFORM_API_PY2)_SRC_PATH = $(PLATFORM_PATH)/mlnx-platform-api
 $(SONIC_PLATFORM_API_PY2)_PYTHON_VERSION = 2
-$(SONIC_PLATFORM_API_PY2)_DEPENDS = $(SONIC_PLATFORM_COMMON_PY2) $(SONIC_DAEMON_BASE_PY2) $(SONIC_CONFIG_ENGINE)
 SONIC_PYTHON_WHEELS += $(SONIC_PLATFORM_API_PY2)
 
 export mlnx_platform_api_py2_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_PLATFORM_API_PY2))"

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

@@ -12,14 +12,6 @@
     maintainer_email='kevinw@mellanox.com',
     packages=[
         'sonic_platform',
-        'tests'
-    ],
-    setup_requires= [
-        'pytest-runner'
-    ],
-    tests_require = [
-        'pytest',
-        'mock>=2.0.0'
     ],
     classifiers=[
         'Development Status :: 3 - Alpha',
@@ -34,6 +26,5 @@
         'Topic :: Utilities',
     ],
     keywords='sonic SONiC platform PLATFORM',
-    test_suite='setup.get_test_suite'
 )
 

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

@@ -1,2 +1,2 @@
 __all__ = ["platform", "chassis"]
-from sonic_platform import *
+from sonic_platform import *

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

@@ -442,8 +442,3 @@ def get_change_event(self, timeout=0):
             return True, {'sfp':port_dict}
         else:
             return True, {'sfp':{}}
-
-    def get_thermal_manager(self):
-        from .thermal_manager import ThermalManager
-        return ThermalManager
-

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

@@ -38,22 +38,17 @@ def __init__(self, fan_index, drawer_index = 1, psu_fan = False):
             self.fan_speed_set_path = "fan{}_speed_set".format(self.index)
             self.fan_presence_path = "fan{}_status".format(self.drawer_index)
             self.fan_max_speed_path = "fan{}_max".format(self.index)
-            self._name = "fan{}".format(fan_index + 1)
         else:
             self.fan_speed_get_path = "psu{}_fan1_speed_get".format(self.index)
             self.fan_presence_path = "psu{}_fan1_speed_get".format(self.index)
-            self._name = 'psu_{}_fan_{}'.format(self.index, fan_index)
-            self.fan_max_speed_path = None
+            self.fan_max_speed_path = "psu{}_max".format(self.index)
         self.fan_status_path = "fan{}_fault".format(self.index)
         self.fan_green_led_path = "led_fan{}_green".format(self.drawer_index)
         self.fan_red_led_path = "led_fan{}_red".format(self.drawer_index)
         self.fan_orange_led_path = "led_fan{}_orange".format(self.drawer_index)
         self.fan_pwm_path = "pwm1"
         self.fan_led_cap_path = "led_fan{}_capability".format(self.drawer_index)
 
-    def get_name(self):
-        return self._name
-
     def get_status(self):
         """
         Retrieves the operational status of fan
@@ -128,11 +123,7 @@ def get_speed(self):
                 speed_in_rpm = int(fan_curr_speed.read())
         except (ValueError, IOError):
             speed_in_rpm = 0
-
-        if self.fan_max_speed_path is None:
-            # in case of max speed unsupported, we just return speed in unit of RPM.
-            return speed_in_rpm
-
+
         max_speed_in_rpm = self._get_max_speed_in_rpm()
         speed = 100*speed_in_rpm/max_speed_in_rpm
 
@@ -145,10 +136,11 @@ def get_target_speed(self):
         Returns:
             int: percentage of the max fan speed
         """
+        speed = 0
+
         if self.is_psu_fan:
             # Not like system fan, psu fan speed can not be modified, so target speed is N/A 
-            return self.get_speed()
-
+            return speed
         try:
             with open(os.path.join(FAN_PATH, self.fan_speed_set_path), 'r') as fan_pwm:
                 pwm = int(fan_pwm.read())

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

@@ -24,7 +24,6 @@ def __init__(self):
             self._chassis.initialize_psu()
             self._chassis.initialize_fan()
             self._chassis.initialize_eeprom()
-            self._chassis.initialize_thermals()
 
     def _is_host(self):
         """

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

@@ -60,7 +60,6 @@ def __init__(self, psu_index, sku):
         psu_oper_status = "thermal/psu{}_pwr_status".format(self.index)
         #psu_oper_status should always be present for all SKUs
         self.psu_oper_status = os.path.join(self.psu_path, psu_oper_status)
-        self._name = "PSU{}".format(psu_index + 1)
 
         if sku in hwsku_dict_psu:
             filemap = psu_profile_list[hwsku_dict_psu[sku]]
@@ -93,10 +92,7 @@ def __init__(self, psu_index, sku):
 
         fan = Fan(psu_index, psu_index, True)
         if fan.get_presence():
-            self._fan_list.append(fan)
-
-    def get_name(self):
-        return self._name
+            self._fan = fan
 
     def _read_generic_file(self, filename, len):
         """