[python3] Support python3 for mellanox sonic platform API and pmon related makefiles #42
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
…upport in make rules
… it python2 and python3 compatible
…ding to API version
Conflicts: dockers/docker-platform-monitor/docker_init.sh platform/mellanox/mlnx-platform-api/sonic_platform/eeprom.py rules/docker-platform-monitor.mk rules/sonic-ledd.mk rules/sonic-psud.mk rules/sonic-syseepromd.mk rules/sonic-thermalctld.mk rules/sonic-xcvrd.mk slave.mk
Junchao-Mellanox
commented
Dec 7, 2020
| {% endif %} | ||
|
|
||
| {% if not skip_syseepromd %} | ||
| [program:syseepromd] | ||
| command=/usr/local/bin/syseepromd | ||
| command={% if API_VERSION == 3 and 'syseepromd' in python3_daemons %}python3 {% else %} python2 {% endif %}/usr/local/bin/syseepromd |
There was a problem hiding this comment.
what if python3_daemons is not defined?
There was a problem hiding this comment.
Did a test. If python3_daemons is not defined, the code 'syseepromd' in python3_daemons returns False. So it works as expect.
|
|
||
| except ImportError as e: | ||
| raise ImportError (str(e) + "- required module not found") | ||
|
|
||
| try: | ||
| # python_sdk_api does not support python3 for now, for python3, catch the ImportError | ||
| # and ignore it here. Meanwhile, we have to trigger xcvrd using python2 now. |
There was a problem hiding this comment.
Add comment: daemons such as thermalctld will also import this file, so need to catch the ImportError here.
| $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PSUD_PY2) | ||
| $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_SYSEEPROMD_PY2) | ||
| $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_THERMALCTLD_PY2) | ||
| $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_XCVRD_PY2) |
There was a problem hiding this comment.
What if SONIC_XCVRD_PY2 is not provided?
Junchao-Mellanox
pushed a commit
that referenced
this pull request
Jan 14, 2022
457e94d51 [macsec_linux]: Fixbug cannot dump the PN due to type error (#42) f7c073323 Disable P2P module (#41) 7b3b777e2 [ci]: use native arm64 and armhf build pool (#40) d4e91d66c [sonic_operator]: Increase wait timeout (#39) 43611ef88e [sonic_operators]: Add log in sonic operators (#43) Signed-off-by: Ze Gan <[email protected]>
Junchao-Mellanox
pushed a commit
that referenced
this pull request
Jul 25, 2023
…face (sonic-net#15881) sonic-build image side change to fix source interface selection in dual tor scenario. dhcprelay related PR: [master]fix dhcpv6 relay dual tor source interface selection issue sonic-dhcp-relay#42 Announce dhcprelay submodule to 6a6ce24 to include PR #42
Junchao-Mellanox
pushed a commit
that referenced
this pull request
Mar 13, 2024
…ly (sonic-net#18097) #### Why I did it src/sonic-ztp ``` * 56cebae - (HEAD -> master, origin/master, origin/HEAD) Enhancements to allow custom umask usage while executing plugins (#42) (2 hours ago) [rajendra-dendukuri] ``` #### How I did it #### How to verify it #### Description for the changelog
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.
- Why I did it
python2 is end of life and SONiC is going to support python3. This PR is going to support:
- How I did it
- How to verify it
- Which release branch to backport (provide reason below if selected)
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)