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

[Mellanox] Support per PSU slope value for PSU power threshold (#13757)

Browse Source 
- Why I did it
Support per PSU slope value for PSU power threshold according to hardware team requirement

- How I did it
Pass the PSU number as a parameter when fetching the slope value of PSU.

- How to verify it
Running regression and manual test

Signed-off-by: Stephen Sun <stephens@nvidia.com>
This commit is contained in:
Stephen Sun 2023-02-14 14:55:28 +08:00 committed by GitHub
parent 389b279ba9
commit 71b5bb6f37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
platform/mellanox/mlnx-platform-api/sonic_platform/psu.py
View File

@ -220,7 +220,7 @@ class Psu(FixedPsu):
FAN_AMBIENT_TEMP = os.path.join(PSU_PATH, "thermal/fan_amb") FAN_AMBIENT_TEMP = os.path.join(PSU_PATH, "thermal/fan_amb")
AMBIENT_TEMP_CRITICAL_THRESHOLD = os.path.join(PSU_PATH, "config/amb_tmp_crit_limit") AMBIENT_TEMP_CRITICAL_THRESHOLD = os.path.join(PSU_PATH, "config/amb_tmp_crit_limit")
AMBIENT_TEMP_WARNING_THRESHOLD = os.path.join(PSU_PATH, "config/amb_tmp_warn_limit") AMBIENT_TEMP_WARNING_THRESHOLD = os.path.join(PSU_PATH, "config/amb_tmp_warn_limit")
PSU_POWER_SLOPE = os.path.join(PSU_PATH, "config/psu_power_slope") PSU_POWER_SLOPE = os.path.join(PSU_PATH, "config/psu{}_power_slope")
shared_led = None shared_led = None
@ -245,6 +245,8 @@ class Psu(FixedPsu):
self.psu_temp = os.path.join(PSU_PATH, 'thermal/psu{}_temp'.format(self.index)) self.psu_temp = os.path.join(PSU_PATH, 'thermal/psu{}_temp'.format(self.index))
self.psu_temp_threshold = os.path.join(PSU_PATH, 'thermal/psu{}_temp_max'.format(self.index)) self.psu_temp_threshold = os.path.join(PSU_PATH, 'thermal/psu{}_temp_max'.format(self.index))
self.psu_power_slope = os.path.join(PSU_PATH, self.PSU_POWER_SLOPE.format(self.index))
from .fan import PsuFan from .fan import PsuFan
self._fan_list.append(PsuFan(psu_index, 1, self)) self._fan_list.append(PsuFan(psu_index, 1, self))
@ -529,7 +531,7 @@ class Psu(FixedPsu):
if ambient_temp < temp_threshold: if ambient_temp < temp_threshold:
power_threshold = power_max_capacity power_threshold = power_max_capacity
else: else:
slope = utils.read_int_from_file(Psu.PSU_POWER_SLOPE) slope = utils.read_int_from_file(self.psu_power_slope)
power_threshold = power_max_capacity - (ambient_temp - temp_threshold) * slope power_threshold = power_max_capacity - (ambient_temp - temp_threshold) * slope
if power_threshold <= 0: if power_threshold <= 0:
logger.log_warning('Got negative PSU power threshold {} for {}'.format(power_threshold, self.get_name())) logger.log_warning('Got negative PSU power threshold {} for {}'.format(power_threshold, self.get_name()))

2
platform/mellanox/mlnx-platform-api/tests/test_psu.py
View File

@ -172,7 +172,7 @@ class TestPsu:
psu.psu_power_max_capacity: 100000000, psu.psu_power_max_capacity: 100000000,
psu.AMBIENT_TEMP_CRITICAL_THRESHOLD: 65000, psu.AMBIENT_TEMP_CRITICAL_THRESHOLD: 65000,
psu.AMBIENT_TEMP_WARNING_THRESHOLD: 55000, psu.AMBIENT_TEMP_WARNING_THRESHOLD: 55000,
psu.PSU_POWER_SLOPE: 2000 psu.psu_power_slope: 2000
} }
normal_data = { normal_data = {
psu.PORT_AMBIENT_TEMP: 55000, psu.PORT_AMBIENT_TEMP: 55000,