Skip to content

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

Merged
lguohan merged 2 commits intosonic-net:masterfrom
ArunSaravananBalachandran:thermal
May 27, 2020
Merged

DellEMC: Skip thermalctld (S6000, S6100, Z9100 and Z9264) and thermal platform API changes#4644
lguohan merged 2 commits intosonic-net:masterfrom
ArunSaravananBalachandran:thermal

Conversation

@ArunSaravananBalachandran
Copy link
Contributor

@ArunSaravananBalachandran ArunSaravananBalachandran commented May 26, 2020

- Why I did it

  • 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'.

- How I did it

  • Add 'skip_thermalctld:true' in pmon_daemon_control.json for DellEMC S6000, S6100, Z9100 and Z9264 platforms.
  • Made changes in thermal.py, for 'get_temperature', 'get_high_threshold' and 'get_low_threshold' to return 'float' value.

- How to verify it

  • Check thermalctld is not running in 'pmon'.
  • Wrote a python script to load Chassis class and then call the APIs accordingly and verify the return type.

UT logs : UT_logs.txt
Test Script : thermal_test_py.txt

- Description for the changelog

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

- A picture of a cute animal (not mandatory but encouraged)

@ArunSaravananBalachandran
Copy link
Contributor Author

This PR needs to be picked for 201911 branch.

@jleveque
Copy link
Contributor

Retest vsimage please

@ArunSaravananBalachandran ArunSaravananBalachandran changed the title DellEMC: Skip thermalctld (S6100, Z9100 and Z9264) and thermal platform API changes DellEMC: Skip thermalctld (S6000, S6100, Z9100 and Z9264) and thermal platform API changes May 27, 2020
@lguohan lguohan merged commit f0eb1db into sonic-net:master May 27, 2020
@abdosi
Copy link
Contributor

abdosi commented May 28, 2020

@ArunSaravananBalachandran Please create PR for 201911. Cherry-pick has conflict.

@rlhui

@ArunSaravananBalachandran ArunSaravananBalachandran deleted the thermal branch May 28, 2020 03:58
@ArunSaravananBalachandran
Copy link
Contributor Author

#4752 has been raised for 201911 branch

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants