[sonic-cfggen] fix name conflict between sonic_platform package and sonic_platform.py #2875
Conversation
There was a problem hiding this comment.
@keboliu: Thanks for this fix. However, please note that there are scripts in sonic-utilities which also reference this file. They will also require updates: https://github.com/Azure/sonic-utilities/search?q=sonic_platform&unscoped_q=sonic_platform
Can you please check the other submodules as well?
I will wait to merge this until we have all PRs ready for merge so that we don't break anything.
|
@jleveque thanks for the heads-up, I created another PR for sonic-utilities repo sonic-net/sonic-utilities#528. I searched other repos and they should be clean. |
|
@keboliu: I opted against updating the submodule in this PR as it makes it harder to cherry-pick commits into other branches. |
|
@jleveque I realized that and just reverted. |
|
@keboliu: After discussion with Guohan, we think it is best to continue the old practice of adding the submodule update into any PRs which require it to build sucessfully, even if it makes the cherry-pick more complicated. Can you please update the sonic-utilities submodule here? I will then merge this after it passes the PR checks. |
|
@jleveque sure. |
jleveque
changed the title
|
Retest this please. |
|
@jleveque the Broadcom image build failure should irrelevant. |
…onic_platform.py (sonic-net#2875) * fix name conflict between sonic_platfrom package and sonic_platform.py * update sonic-utility submodule to pickup lastest fix * Revert "update sonic-utility submodule to pickup lastest fix" This reverts commit f66aa99. * update sonic-utility sub module
- What I did
There is a name conflict between a module "sonic_platform.py" which sonic-cfggen is using and the new added "sonic_platform" package form each platform's implementation of new platform API.
This name conflict cause pmon container not able to go up since sonic-cfggen can't load correct "sonic_platform.py". So rename "sonic_platform.py" to "sonic_device_util.py" as a temporary mitigation to this issue. In the long run, this "sonic_platform.py" will be moved out and shared with multiple applications.
- How I did it
rename "sonic_platform.py" to "sonic_device_util.py" and change sonic-cfggen, package setup.py accordingly.
- How to verify it
run sonic-cfggen
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)