Skip to content

[action] [PR:21856] [Mellanox] Fix the issue with sensors with discrete indexes initialization #21890

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

Merged
mssonicbld merged 1 commit into from
Feb 28, 2025
Merged

[action] [PR:21856] [Mellanox] Fix the issue with sensors with discrete indexes initialization #21890

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
8 changes: 5 additions & 3 deletions platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,10 @@ def initialize_chassis_thermals():
thermal_list.append(create_indexable_thermal(rule, index, CHASSIS_THERMAL_SYSFS_FOLDER, position))
position += 1
elif thermal_type == 'discrete':
thermal_list.extend(create_discrete_thermal(rule))
discrete_thermals = create_discrete_thermal(rule, position)
if discrete_thermals:
position += len(discrete_thermals)
thermal_list.extend(discrete_thermals)
else:
thermal_object = create_single_thermal(rule, CHASSIS_THERMAL_SYSFS_FOLDER, position)
if thermal_object:
Expand Down Expand Up @@ -280,10 +283,9 @@ def create_single_thermal(rule, sysfs_folder, position, presence_cb=None):
return RemovableThermal(name, temp_file, high_th_file, high_crit_th_file, high_th_default, high_crit_th_default, scale, position, presence_cb)


def create_discrete_thermal(rule):
def create_discrete_thermal(rule, position):
search_pattern = rule.get('search_pattern')
index_pattern = rule.get('index_pattern')
position = 1
thermal_list = []
for file_path in glob.iglob(search_pattern):
file_name = os.path.basename(file_path)
Expand Down
Loading