3b89e5d467
As part of consolidating all common Python-based functionality into the new sonic-py-common package, this pull request: 1. Redirects all Python applications/scripts in sonic-buildimage repo which previously imported sonic_device_util or sonic_daemon_base to instead import sonic-py-common, which was added in https://github.com/Azure/sonic-buildimage/pull/5003 2. Replaces all calls to `sonic_device_util.get_platform_info()` to instead call `sonic_py_common.get_platform()` and removes any calls to `sonic_device_util.get_machine_info()` which are no longer necessary (i.e., those which were only used to pass the results to `sonic_device_util.get_platform_info()`. 3. Removes unused imports to the now-deprecated sonic-daemon-base package and sonic_device_util.py module This is the next step toward resolving https://github.com/Azure/sonic-buildimage/issues/4999 Also reverted my previous change in which device_info.get_platform() would first try obtaining the platform ID string from Config DB and fall back to gathering it from machine.conf upon failure because this function is called by sonic-cfggen before the data is in the DB, in which case, the db_connect() call will hang indefinitely, which was not the behavior I expected. As of now, the function will always reference machine.conf. |
||
|---|---|---|
| .. | ||
| docker-saiserver-mlnx | ||
| docker-syncd-mlnx | ||
| docker-syncd-mlnx-rpc | ||
| hw-management | ||
| issu-version | ||
| mft | ||
| mlnx-platform-api | ||
| mlnx-sai | ||
| sdk-src | ||
| .gitignore | ||
| docker-ptf-mlnx.dep | ||
| docker-ptf-mlnx.mk | ||
| docker-saiserver-mlnx.dep | ||
| docker-saiserver-mlnx.mk | ||
| docker-syncd-mlnx-rpc.dep | ||
| docker-syncd-mlnx-rpc.mk | ||
| docker-syncd-mlnx.dep | ||
| docker-syncd-mlnx.mk | ||
| fw.dep | ||
| fw.mk | ||
| hw-management.dep | ||
| hw-management.mk | ||
| issu-version.dep | ||
| issu-version.mk | ||
| libsaithrift-dev.dep | ||
| libsaithrift-dev.mk | ||
| mft.dep | ||
| mft.mk | ||
| mlnx-ffb.dep | ||
| mlnx-ffb.mk | ||
| mlnx-ffb.sh | ||
| mlnx-fw-upgrade.j2 | ||
| mlnx-onie-fw-update.dep | ||
| mlnx-onie-fw-update.mk | ||
| mlnx-onie-fw-update.sh | ||
| mlnx-platform-api.dep | ||
| mlnx-platform-api.mk | ||
| mlnx-sai.dep | ||
| mlnx-sai.mk | ||
| mlnx-ssd-fw-update.dep | ||
| mlnx-ssd-fw-update.mk | ||
| mlnx-ssd-fw-update.sh | ||
| one-image.dep | ||
| one-image.mk | ||
| platform.conf | ||
| rules.dep | ||
| rules.mk | ||
| sdk.dep | ||
| sdk.mk | ||