Skip to content
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.

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

[dell-hwmon] Changed variables in psuutil scripts for both Z9100/S6100 platforms #1305

Merged
merged 2 commits into from
Feb 4, 2018

Conversation

paavaanan
Copy link
Contributor

*- What I did
Changed hwmon variables in psuutil scripts for Z9100 and S6100 platforms. Now scripts are full-hwmon compatiable.

- How I did it
Replaced dell_s6100_lpc proc reference to SMF/hwmon1

- How to verify it
Execute the script and expect for same results. Without any issues.

- IMPORTANT NOTE
Please do merge this change along with this "sonic-net/sonic-platform-modules-dell#26" pull request. This is the real code to introduce hwmon for dell platforms. Both should be in the build to avoid breakage.

- Description for the changelog

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

@paavaanan
Copy link
Contributor Author

Please do merge this change along with this "sonic-net/sonic-platform-modules-dell#26" pull request. This is the real code to introduce hwmon for dell platforms. Both should be in the build to avoid breakage.

@stcheng
Copy link
Contributor

stcheng commented Jan 18, 2018

do we need to have the submodule update included in this pull request as well?

@jleveque
Copy link
Contributor

@stcheng: Yes, the submodule pointer needs to be updated here before the merge.

@paavaanan: Guohan merged sonic-net/sonic-platform-modules-dell#26 earlier today. Can you please update the submodule pointer here now?

@paavaanan
Copy link
Contributor Author

jileveque, raised a new handle here.
#1328

@jleveque
Copy link
Contributor

@paavaanan: For the future, you could have pushed the submodule update commit to this branch, and it would become part of this PR. That way, all of these changes get merged along with the submodule pointer update in one atomic commit.

@stcheng
Copy link
Contributor

stcheng commented Jan 19, 2018

yes. agree with @jleveque could you close the #1328 and move the submodule update into this pull request? then we won't have a broken commit in the master that would have a broken state.

@paavaanan
Copy link
Contributor Author

@jleveque I missed the same branch part while raising the pull request. Thanks for pointing this. I raised the submodule request now.

@lguohan lguohan merged commit a4bcccc into sonic-net:master Feb 4, 2018
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