[Mellanox] Fix thermal control bugs #4298
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Conflicts: device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py
Conflicts: platform/mellanox/mlnx-platform-api/sonic_platform/psu.py
Conflicts: platform/mellanox/mlnx-platform-api/sonic_platform/psu.py
…_available_status
…icate conditions in different policies
…m sysfs but directly return N/A
Conflicts: device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py
Conflicts: platform/mellanox/mlnx-platform-api/sonic_platform/psu.py
Conflicts: platform/mellanox/mlnx-platform-api/sonic_platform/psu.py
…_available_status
…icate conditions in different policies
…m sysfs but directly return N/A
…image into thermal-fix
|
I closed review #4252 and created this new one. I did a rebase for build issue in previous review. |
|
Retest this please |
|
Retest vsimage please |
|
Looks good to me. I'd just like someone else from Mellanox to review and approve. |
|
@kebol could you please help review? |
keboliu
approved these changes
Mar 25, 2020
jleveque
approved these changes
Mar 25, 2020
pphuchar
pushed a commit
to pphuchar/sonic-buildimage
that referenced
this pull request
Apr 20, 2020
* [thermal control] Fix pmon docker stop issue on 3800 * [thermal fix] Fix QA test issue * [thermal fix] change psu._get_power_available_status to psu.get_power_available_status * [thermal fix] adjust log for PSU absence and power absence * [thermal fix] add unit test for loading thermal policy file with duplicate conditions in different policies * [thermal] fix fan.get_presence for non-removable SKU * [thermal fix] fix issue: fan direction is based on drawer * Fix issue: when fan is not present, should not read fan direction from sysfs but directly return N/A * [thermal fix] add unit test for get_direction for absent FAN * Unplugable PSU has no FAN, no need add a FAN object for this PSU * Update submodules
|
@Junchao-Mellanox Please create PR for 201911. There is merge conflict. |
Junchao-Mellanox
added a commit
to Junchao-Mellanox/sonic-buildimage
that referenced
this pull request
Jun 1, 2020
* [thermal control] Fix pmon docker stop issue on 3800 * [thermal fix] Fix QA test issue * [thermal fix] change psu._get_power_available_status to psu.get_power_available_status * [thermal fix] adjust log for PSU absence and power absence * [thermal fix] add unit test for loading thermal policy file with duplicate conditions in different policies * [thermal] fix fan.get_presence for non-removable SKU * [thermal fix] fix issue: fan direction is based on drawer * Fix issue: when fan is not present, should not read fan direction from sysfs but directly return N/A * [thermal fix] add unit test for get_direction for absent FAN * Unplugable PSU has no FAN, no need add a FAN object for this PSU * Update submodules Co-authored-by: Stephen Sun <5379172+stephenxs@users.noreply.github.com> Conflicts: platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py platform/mellanox/mlnx-platform-api/sonic_platform/fan.py platform/mellanox/mlnx-platform-api/sonic_platform/psu.py platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py src/sonic-platform-common src/sonic-platform-daemons
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
- What I did
- How I did it
- How to verify it
Manually verify and run existing regression cases
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)