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

DellEMC: Skip thermalctld (S6000, S6100, Z9100 and Z9264) and thermal platform API changes (#4644)

Browse Source 
- Skip thermalctld in DellEMC S6000, S6100, Z9100 and Z9264 platforms.
- Change the return type of thermal Platform APIs in DellEMC S6000, S6100, Z9100 and Z9264 platforms to 'float'.
This commit is contained in:
Arun Saravanan Balachandran 2020-05-28 00:52:55 +05:30 committed by GitHub
parent d7df56872b
commit f0eb1dbc93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
device/dell/x86_64-dell_s6000_s1220-r0/pmon_daemon_control.json
View File

@ -1,3 +1,4 @@
{ {
"skip_ledd": true "skip_ledd": true,
"skip_thermalctld": true
} }

3
device/dell/x86_64-dell_s6100_c2538-r0/pmon_daemon_control.json
View File

@ -1,3 +1,4 @@
{ {
"skip_ledd": true "skip_ledd": true,
"skip_thermalctld": true
} }

3
device/dell/x86_64-dell_z9100_c2538-r0/pmon_daemon_control.json
View File

@ -1,3 +1,4 @@
{ {
"skip_ledd": true "skip_ledd": true,
"skip_thermalctld": true
} }

3
device/dell/x86_64-dellemc_z9264f_c3538-r0/pmon_daemon_control.json
View File

@ -1,3 +1,4 @@
{ {
"skip_ledd": true "skip_ledd": true,
"skip_thermalctld": true
} }

12
platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/thermal.py
View File

@ -179,11 +179,11 @@ class Thermal(ThermalBase):
thermal_temperature = self._read_sysfs_file( thermal_temperature = self._read_sysfs_file(
self.thermal_temperature_file) self.thermal_temperature_file)
if (thermal_temperature != 'ERR'): if (thermal_temperature != 'ERR'):
thermal_temperature = float(thermal_temperature) / 1000 thermal_temperature = float(thermal_temperature)
else: else:
thermal_temperature = 0 thermal_temperature = 0
return "{:.3f}".format(thermal_temperature) return thermal_temperature / 1000.0
def get_high_threshold(self): def get_high_threshold(self):
""" """
@ -197,11 +197,11 @@ class Thermal(ThermalBase):
thermal_high_threshold = self._read_sysfs_file( thermal_high_threshold = self._read_sysfs_file(
self.thermal_high_threshold_file) self.thermal_high_threshold_file)
if (thermal_high_threshold != 'ERR'): if (thermal_high_threshold != 'ERR'):
thermal_high_threshold = float(thermal_high_threshold) / 1000 thermal_high_threshold = float(thermal_high_threshold)
else: else:
thermal_high_threshold = 0 thermal_high_threshold = 0
return "{:.3f}".format(thermal_high_threshold) return thermal_high_threshold / 1000.0
def get_low_threshold(self): def get_low_threshold(self):
""" """
@ -215,11 +215,11 @@ class Thermal(ThermalBase):
thermal_low_threshold = self._read_sysfs_file( thermal_low_threshold = self._read_sysfs_file(
self.thermal_low_threshold_file) self.thermal_low_threshold_file)
if (thermal_low_threshold != 'ERR'): if (thermal_low_threshold != 'ERR'):
thermal_low_threshold = float(thermal_low_threshold) / 1000 thermal_low_threshold = float(thermal_low_threshold)
else: else:
thermal_low_threshold = 0 thermal_low_threshold = 0
return "{:.3f}".format(thermal_low_threshold) return thermal_low_threshold / 1000.0
def set_high_threshold(self, temperature): def set_high_threshold(self, temperature):
""" """

12
platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/thermal.py
View File

@ -138,11 +138,11 @@ class Thermal(ThermalBase):
thermal_temperature = self._read_sysfs_file( thermal_temperature = self._read_sysfs_file(
self.thermal_temperature_file) self.thermal_temperature_file)
if (thermal_temperature != 'ERR'): if (thermal_temperature != 'ERR'):
thermal_temperature = float(thermal_temperature) / 1000 thermal_temperature = float(thermal_temperature)
else: else:
thermal_temperature = 0 thermal_temperature = 0
return "{:.3f}".format(thermal_temperature) return thermal_temperature / 1000.0
def get_high_threshold(self): def get_high_threshold(self):
""" """
@ -156,11 +156,11 @@ class Thermal(ThermalBase):
thermal_high_threshold = self._read_sysfs_file( thermal_high_threshold = self._read_sysfs_file(
self.thermal_high_threshold_file) self.thermal_high_threshold_file)
if (thermal_high_threshold != 'ERR'): if (thermal_high_threshold != 'ERR'):
thermal_high_threshold = float(thermal_high_threshold) / 1000 thermal_high_threshold = float(thermal_high_threshold)
else: else:
thermal_high_threshold = 0 thermal_high_threshold = 0
return "{:.3f}".format(thermal_high_threshold) return thermal_high_threshold / 1000.0
def get_low_threshold(self): def get_low_threshold(self):
""" """
@ -174,11 +174,11 @@ class Thermal(ThermalBase):
thermal_low_threshold = self._read_sysfs_file( thermal_low_threshold = self._read_sysfs_file(
self.thermal_low_threshold_file) self.thermal_low_threshold_file)
if (thermal_low_threshold != 'ERR'): if (thermal_low_threshold != 'ERR'):
thermal_low_threshold = float(thermal_low_threshold) / 1000 thermal_low_threshold = float(thermal_low_threshold)
else: else:
thermal_low_threshold = 0 thermal_low_threshold = 0
return "{:.3f}".format(thermal_low_threshold) return thermal_low_threshold / 1000.0
def set_high_threshold(self, temperature): def set_high_threshold(self, temperature):
""" """

12
platform/broadcom/sonic-platform-modules-dell/z9100/sonic_platform/thermal.py
View File

@ -134,11 +134,11 @@ class Thermal(ThermalBase):
thermal_temperature = self._read_sysfs_file( thermal_temperature = self._read_sysfs_file(
self.thermal_temperature_file) self.thermal_temperature_file)
if (thermal_temperature != 'ERR'): if (thermal_temperature != 'ERR'):
thermal_temperature = float(thermal_temperature) / 1000 thermal_temperature = float(thermal_temperature)
else: else:
thermal_temperature = 0 thermal_temperature = 0
return "{:.3f}".format(thermal_temperature) return thermal_temperature / 1000.0
def get_high_threshold(self): def get_high_threshold(self):
""" """
@ -152,11 +152,11 @@ class Thermal(ThermalBase):
thermal_high_threshold = self._read_sysfs_file( thermal_high_threshold = self._read_sysfs_file(
self.thermal_high_threshold_file) self.thermal_high_threshold_file)
if (thermal_high_threshold != 'ERR'): if (thermal_high_threshold != 'ERR'):
thermal_high_threshold = float(thermal_high_threshold) / 1000 thermal_high_threshold = float(thermal_high_threshold)
else: else:
thermal_high_threshold = 0 thermal_high_threshold = 0
return "{:.3f}".format(thermal_high_threshold) return thermal_high_threshold / 1000.0
def get_low_threshold(self): def get_low_threshold(self):
""" """
@ -170,11 +170,11 @@ class Thermal(ThermalBase):
thermal_low_threshold = self._read_sysfs_file( thermal_low_threshold = self._read_sysfs_file(
self.thermal_low_threshold_file) self.thermal_low_threshold_file)
if (thermal_low_threshold != 'ERR'): if (thermal_low_threshold != 'ERR'):
thermal_low_threshold = float(thermal_low_threshold) / 1000 thermal_low_threshold = float(thermal_low_threshold)
else: else:
thermal_low_threshold = 0 thermal_low_threshold = 0
return "{:.3f}".format(thermal_low_threshold) return thermal_low_threshold / 1000.0
def set_high_threshold(self, temperature): def set_high_threshold(self, temperature):
""" """

6
platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/thermal.py
View File

@ -94,7 +94,7 @@ class Thermal(ThermalBase):
if not is_valid: if not is_valid:
temperature = 0 temperature = 0
return "{:.3f}".format(temperature) return float(temperature)
def get_high_threshold(self): def get_high_threshold(self):
""" """
@ -109,7 +109,7 @@ class Thermal(ThermalBase):
if not is_valid: if not is_valid:
high_threshold = 0 high_threshold = 0
return "{:.3f}".format(high_threshold) return float(high_threshold)
def get_low_threshold(self): def get_low_threshold(self):
""" """
@ -124,7 +124,7 @@ class Thermal(ThermalBase):
if not is_valid: if not is_valid:
low_threshold = 0 low_threshold = 0
return "{:.3f}".format(low_threshold) return float(low_threshold)
def set_high_threshold(self, temperature): def set_high_threshold(self, temperature):
""" """