Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Mellanox] [201911] Fan speed should not be 100% when PSU is powered off #111

Closed
wants to merge 1 commit into from
Closed

[Mellanox] [201911] Fan speed should not be 100% when PSU is powered off #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions platform/mellanox/mlnx-platform-api/sonic_platform/thermal_infos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def collect(self, chassis):
elif status and fan in self._fault_fans:
self._fault_fans.remove(fan)
self._status_changed = True


def get_absence_fans(self):
"""
Expand Down Expand Up @@ -95,12 +95,12 @@ def collect(self, chassis):
"""
self._status_changed = False
for psu in chassis.get_all_psus():
if psu.get_presence() and psu.get_powergood_status() and psu not in self._presence_psus:
if psu.get_presence() and psu not in self._presence_psus:
self._presence_psus.add(psu)
self._status_changed = True
if psu in self._absence_psus:
self._absence_psus.remove(psu)
elif (not psu.get_presence() or not psu.get_powergood_status()) and psu not in self._absence_psus:
elif (not psu.get_presence()) and psu not in self._absence_psus:
self._absence_psus.add(psu)
self._status_changed = True
if psu in self._presence_psus:
Expand Down
14 changes: 7 additions & 7 deletions platform/mellanox/mlnx-platform-api/tests/test_thermal_policy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ def test_psu_info():

psu_list[0].powergood = False
psu_info.collect(chassis)
assert len(psu_info.get_absence_psus()) == 1
assert len(psu_info.get_presence_psus()) == 0
assert psu_info.is_status_changed()
assert len(psu_info.get_absence_psus()) == 0
assert len(psu_info.get_presence_psus()) == 1
assert not psu_info.is_status_changed()


def test_fan_policy(thermal_manager):
Expand Down Expand Up @@ -304,12 +304,12 @@ def test_load_control_thermal_algo_action():
json_str = '{\"status\": \"false\"}'
json_obj = json.loads(json_str)
action.load_from_json(json_obj)
assert not action.status
assert not action.status

json_str = '{\"status\": \"true\"}'
json_obj = json.loads(json_str)
action.load_from_json(json_obj)
assert action.status
assert action.status

json_str = '{\"status\": \"invalid\"}'
json_obj = json.loads(json_str)
Expand Down Expand Up @@ -407,7 +407,7 @@ class MockThermalManager(ThermalManagerBase):

with pytest.raises(Exception):
MockThermalManager.load(os.path.join(test_path, 'policy_with_same_conditions.json'))

def test_dynamic_minimum_table_data():
from sonic_platform.device_data import DEVICE_DATA
for platform, platform_data in DEVICE_DATA.items():
Expand All @@ -432,7 +432,7 @@ def check_minimum_table_data(platform, minimum_table):
for item in data_list:
cooling_level = item[0]
range_str = item[1]

ranges = range_str.split(':')
low = int(ranges[0])
high = int(ranges[1])
Expand Down