device\celestica\x86_64-cel_redstone_xp-r0\sonic_platform\psu.py: Changed use of the Fan class for the PSU fans.

device\celestica\x86_64-cel_redstone_xp-r0\sonic_platform\fan.py: Changed the logic to calculate if the fan is part of a PSU.

Author: DACRepair

device/celestica/x86_64-cel_redstone_xp-r0/sonic_platform/fan.py

@@ -44,14 +44,14 @@
 class Fan(FanBase):
     """Platform-specific Fan class"""
 
-    def __init__(self, fan_tray_index, fan_index=0, is_psu_fan=False, psu_index=0):
+    def __init__(self, fan_tray_index, fan_index=0):
         FanBase.__init__(self)
         self.fan_index = fan_index
         self._api_helper = APIHelper()
         self.fan_tray_index = fan_tray_index
-        self.is_psu_fan = is_psu_fan
+        self.is_psu_fan = fan_tray_index >= 4
         if self.is_psu_fan:
-            self.psu_index = psu_index
+            self.psu_index = fan_tray_index - 4
             self.psu_i2c_num = PSU_I2C_MAPPING[self.psu_index]["num"]
             self.psu_i2c_addr = PSU_I2C_MAPPING[self.psu_index]["addr"]
             self.psu_hwmon_path = PSU_HWMON_PATH.format(

device/celestica/x86_64-cel_redstone_xp-r0/sonic_platform/psu.py

@@ -45,7 +45,7 @@ def __init__(self, psu_index):
         self.hwmon_path = self._api_helper.get_hwmon_path(i2c_adapter, i2c_address)
         self.eeprom_path = "/sys/bus/i2c/devices/{}-00{}/eeprom".format(i2c_adapter, i2c_eeprom)
 
-        self._fan_list.append(Fan(0, 0, is_psu_fan=True, psu_index=self.index))
+        self._fan_list.append(Fan(self.index + 4, 0))
 
     @property
     def presence(self):