Skip to content

[201911] DellEMC: Skip thermalctld and thermal platform API changes #4752

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
jleveque merged 1 commit into from
Jun 11, 2020
Merged

[201911] DellEMC: Skip thermalctld and thermal platform API changes #4752

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
3 changes: 2 additions & 1 deletion device/dell/x86_64-dell_s6000_s1220-r0/pmon_daemon_control.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"skip_ledd": true
"skip_ledd": true,
"skip_thermalctld": true
}
3 changes: 2 additions & 1 deletion device/dell/x86_64-dell_s6100_c2538-r0/pmon_daemon_control.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"skip_ledd": true
"skip_ledd": true,
"skip_thermalctld": true
}
3 changes: 2 additions & 1 deletion device/dell/x86_64-dell_z9100_c2538-r0/pmon_daemon_control.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"skip_ledd": true
"skip_ledd": true,
"skip_thermalctld": true
}
3 changes: 2 additions & 1 deletion device/dell/x86_64-dellemc_z9264f_c3538-r0/pmon_daemon_control.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"skip_ledd": true
"skip_ledd": true,
"skip_thermalctld": true
}
12 changes: 6 additions & 6 deletions platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/thermal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,11 @@ def get_temperature(self):
thermal_temperature = self._read_sysfs_file(
self.thermal_temperature_file)
if (thermal_temperature != 'ERR'):
thermal_temperature = float(thermal_temperature) / 1000
thermal_temperature = float(thermal_temperature)
else:
thermal_temperature = 0

return "{:.3f}".format(thermal_temperature)
return thermal_temperature / 1000.0

def get_high_threshold(self):
"""
Expand All @@ -197,11 +197,11 @@ def get_high_threshold(self):
thermal_high_threshold = self._read_sysfs_file(
self.thermal_high_threshold_file)
if (thermal_high_threshold != 'ERR'):
thermal_high_threshold = float(thermal_high_threshold) / 1000
thermal_high_threshold = float(thermal_high_threshold)
else:
thermal_high_threshold = 0

return "{:.3f}".format(thermal_high_threshold)
return thermal_high_threshold / 1000.0

def get_low_threshold(self):
"""
Expand All @@ -215,11 +215,11 @@ def get_low_threshold(self):
thermal_low_threshold = self._read_sysfs_file(
self.thermal_low_threshold_file)
if (thermal_low_threshold != 'ERR'):
thermal_low_threshold = float(thermal_low_threshold) / 1000
thermal_low_threshold = float(thermal_low_threshold)
else:
thermal_low_threshold = 0

return "{:.3f}".format(thermal_low_threshold)
return thermal_low_threshold / 1000.0

def set_high_threshold(self, temperature):
"""
Expand Down
12 changes: 6 additions & 6 deletions platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/thermal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,11 @@ def get_temperature(self):
thermal_temperature = self._read_sysfs_file(
self.thermal_temperature_file)
if (thermal_temperature != 'ERR'):
thermal_temperature = float(thermal_temperature) / 1000
thermal_temperature = float(thermal_temperature)
else:
thermal_temperature = 0

return "{:.3f}".format(thermal_temperature)
return thermal_temperature / 1000.0

def get_high_threshold(self):
"""
Expand All @@ -156,11 +156,11 @@ def get_high_threshold(self):
thermal_high_threshold = self._read_sysfs_file(
self.thermal_high_threshold_file)
if (thermal_high_threshold != 'ERR'):
thermal_high_threshold = float(thermal_high_threshold) / 1000
thermal_high_threshold = float(thermal_high_threshold)
else:
thermal_high_threshold = 0

return "{:.3f}".format(thermal_high_threshold)
return thermal_high_threshold / 1000.0

def get_low_threshold(self):
"""
Expand All @@ -174,11 +174,11 @@ def get_low_threshold(self):
thermal_low_threshold = self._read_sysfs_file(
self.thermal_low_threshold_file)
if (thermal_low_threshold != 'ERR'):
thermal_low_threshold = float(thermal_low_threshold) / 1000
thermal_low_threshold = float(thermal_low_threshold)
else:
thermal_low_threshold = 0

return "{:.3f}".format(thermal_low_threshold)
return thermal_low_threshold / 1000.0

def set_high_threshold(self, temperature):
"""
Expand Down
12 changes: 6 additions & 6 deletions platform/broadcom/sonic-platform-modules-dell/z9100/sonic_platform/thermal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,11 @@ def get_temperature(self):
thermal_temperature = self._read_sysfs_file(
self.thermal_temperature_file)
if (thermal_temperature != 'ERR'):
thermal_temperature = float(thermal_temperature) / 1000
thermal_temperature = float(thermal_temperature)
else:
thermal_temperature = 0

return "{:.3f}".format(thermal_temperature)
return thermal_temperature / 1000.0

def get_high_threshold(self):
"""
Expand All @@ -152,11 +152,11 @@ def get_high_threshold(self):
thermal_high_threshold = self._read_sysfs_file(
self.thermal_high_threshold_file)
if (thermal_high_threshold != 'ERR'):
thermal_high_threshold = float(thermal_high_threshold) / 1000
thermal_high_threshold = float(thermal_high_threshold)
else:
thermal_high_threshold = 0

return "{:.3f}".format(thermal_high_threshold)
return thermal_high_threshold / 1000.0

def get_low_threshold(self):
"""
Expand All @@ -170,11 +170,11 @@ def get_low_threshold(self):
thermal_low_threshold = self._read_sysfs_file(
self.thermal_low_threshold_file)
if (thermal_low_threshold != 'ERR'):
thermal_low_threshold = float(thermal_low_threshold) / 1000
thermal_low_threshold = float(thermal_low_threshold)
else:
thermal_low_threshold = 0

return "{:.3f}".format(thermal_low_threshold)
return thermal_low_threshold / 1000.0

def set_high_threshold(self, temperature):
"""
Expand Down