matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[BFN] Fixed FANs indexing for multi-drawer case (#12491)

Browse Source 
Why I did it
In case the device contains more then one FAN drawer, the FANs name was incorrect.

How I did it
Passed max fan value to FAN object.
Fixed get_name() FAN API

How to verify it
show platform fan
This commit is contained in:
Andriy Kokhan 2022-11-07 16:06:52 +02:00 committed by GitHub
parent f0873f29d8
commit 00178187d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/fan.py
View File

@ -17,15 +17,15 @@ def _fan_info_get(fan_num, cb, default=None):
# Fan -> FanBase -> DeviceBase # Fan -> FanBase -> DeviceBase
class Fan(FanBase): class Fan(FanBase):
def __init__(self, index, fantrayindex): def __init__(self, index, max_index, fantrayindex):
self.__index = index self.__index = index
self.__fantrayindex = fantrayindex self.__glob_index = (fantrayindex - 1) * max_index + self.__index
# FanBase interface methods: # FanBase interface methods:
# returns speed in percents # returns speed in percents
def get_speed(self): def get_speed(self):
def cb(info): return info.percent def cb(info): return info.percent
return _fan_info_get(self.__index, cb, 0) return _fan_info_get(self.__glob_index, cb, 0)
def set_speed(self, percent): def set_speed(self, percent):
# Fan tray speed controlled by BMC # Fan tray speed controlled by BMC
@ -33,10 +33,10 @@ class Fan(FanBase):
# DeviceBase interface methods: # DeviceBase interface methods:
def get_name(self): def get_name(self):
return "counter-rotating-fan-{}".format((self.__fantrayindex - 1) * self.__index + self.__index) return "counter-rotating-fan-{}".format(self.__glob_index)
def get_presence(self): def get_presence(self):
return _fan_info_get(self.__index, lambda _: True, False) return _fan_info_get(self.__glob_index, lambda _: True, False)
def get_position_in_parent(self): def get_position_in_parent(self):
return self.__index return self.__index

2
platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/fan_drawer.py
View File

@ -10,7 +10,7 @@ class FanDrawer(FanDrawerBase):
def __init__(self, fantray_index, max_fan): def __init__(self, fantray_index, max_fan):
# For now we return only present fans # For now we return only present fans
self.fantrayindex = fantray_index self.fantrayindex = fantray_index
self._fan_list = [Fan(i, self.fantrayindex) for i in range(1, max_fan + 1)] self._fan_list = [Fan(i, max_fan, self.fantrayindex) for i in range(1, max_fan + 1)]
# DeviceBase interface methods: # DeviceBase interface methods:
def get_name(self): def get_name(self):