diff --git a/files/image_config/monit/container_checker b/files/image_config/monit/container_checker index c6271d26c8..0958368559 100755 --- a/files/image_config/monit/container_checker +++ b/files/image_config/monit/container_checker @@ -19,7 +19,6 @@ check program container_checker with path "/usr/bin/container_checker" import docker import sys -import swsssdk from sonic_py_common import multi_asic, device_info from swsscommon import swsscommon @@ -34,7 +33,7 @@ def get_expected_running_containers(): @return: A set which contains the expected running containers and a set that has containers marked as "always_enabled". """ - config_db = swsssdk.ConfigDBConnector() + config_db = swsscommon.ConfigDBConnector() config_db.connect() feature_table = config_db.get_table("FEATURE") diff --git a/files/scripts/supervisor-proc-exit-listener b/files/scripts/supervisor-proc-exit-listener index 7bf3059b5e..a17ffb7e45 100755 --- a/files/scripts/supervisor-proc-exit-listener +++ b/files/scripts/supervisor-proc-exit-listener @@ -10,7 +10,7 @@ import syslog import time from collections import defaultdict -import swsssdk +from swsscommon import swsscommon from supervisor import childutils @@ -87,7 +87,7 @@ def get_autorestart_state(container_name): @summary: Read the status of auto-restart feature from Config_DB. @return: Return the status of auto-restart feature. """ - config_db = swsssdk.ConfigDBConnector() + config_db = swsscommon.ConfigDBConnector() config_db.connect() features_table = config_db.get_table(FEATURE_TABLE_NAME) if not features_table: diff --git a/rules/asyncsnmp-py3.mk b/rules/asyncsnmp-py3.mk index 2592eb004e..60e8314037 100644 --- a/rules/asyncsnmp-py3.mk +++ b/rules/asyncsnmp-py3.mk @@ -4,6 +4,6 @@ ASYNCSNMP_PY3 = asyncsnmp-2.1.0-py3-none-any.whl $(ASYNCSNMP_PY3)_SRC_PATH = $(SRC_PATH)/sonic-snmpagent $(ASYNCSNMP_PY3)_PYTHON_VERSION = 3 # Depends on sonic-platform-common so it is possible to import sonic_psu -$(ASYNCSNMP_PY3)_DEPENDS += $(SWSSSDK_PY3) $(SONIC_PLATFORM_COMMON_PY3) +$(ASYNCSNMP_PY3)_DEPENDS += $(SONIC_PY_COMMON_PY3) $(SONIC_PLATFORM_COMMON_PY3) $(ASYNCSNMP_PY3)_DEBS_DEPENDS += $(LIBSWSSCOMMON) $(PYTHON3_SWSSCOMMON) SONIC_PYTHON_WHEELS += $(ASYNCSNMP_PY3) diff --git a/rules/dbsyncd-py3.mk b/rules/dbsyncd-py3.mk index 12cf13cafe..5d05b88299 100644 --- a/rules/dbsyncd-py3.mk +++ b/rules/dbsyncd-py3.mk @@ -3,6 +3,6 @@ DBSYNCD_PY3 = sonic_d-2.0.0-py3-none-any.whl $(DBSYNCD_PY3)_SRC_PATH = $(SRC_PATH)/sonic-dbsyncd $(DBSYNCD_PY3)_PYTHON_VERSION = 3 -$(DBSYNCD_PY3)_DEPENDS += $(SWSSSDK_PY3) +$(DBSYNCD_PY3)_DEPENDS += $(SONIC_PY_COMMON_PY3) $(DBSYNCD_PY3)_DEBS_DEPENDS += $(LIBSWSSCOMMON) $(PYTHON3_SWSSCOMMON) SONIC_PYTHON_WHEELS += $(DBSYNCD_PY3) diff --git a/rules/docker-config-engine-bullseye.mk b/rules/docker-config-engine-bullseye.mk index 0c4aad67a8..c125aa65b2 100644 --- a/rules/docker-config-engine-bullseye.mk +++ b/rules/docker-config-engine-bullseye.mk @@ -9,7 +9,6 @@ $(DOCKER_CONFIG_ENGINE_BULLSEYE)_DEPENDS += $(LIBSWSSCOMMON) \ $(LIBYANG_PY3) \ $(PYTHON3_SWSSCOMMON) \ $(SONIC_DB_CLI) -$(DOCKER_CONFIG_ENGINE_BULLSEYE)_PYTHON_WHEELS += $(SWSSSDK_PY3) $(DOCKER_CONFIG_ENGINE_BULLSEYE)_PYTHON_WHEELS += $(SONIC_PY_COMMON_PY3) \ $(SONIC_YANG_MGMT_PY3) \ $(SONIC_YANG_MODELS_PY3) diff --git a/rules/docker-config-engine-buster.mk b/rules/docker-config-engine-buster.mk index 079fc6dd07..ae5589a595 100644 --- a/rules/docker-config-engine-buster.mk +++ b/rules/docker-config-engine-buster.mk @@ -9,7 +9,6 @@ $(DOCKER_CONFIG_ENGINE_BUSTER)_DEPENDS += $(LIBSWSSCOMMON) \ $(LIBYANG_PY3) \ $(PYTHON3_SWSSCOMMON) \ $(SONIC_DB_CLI) -$(DOCKER_CONFIG_ENGINE_BUSTER)_PYTHON_WHEELS += $(SWSSSDK_PY3) $(DOCKER_CONFIG_ENGINE_BUSTER)_PYTHON_WHEELS += $(SONIC_PY_COMMON_PY3) \ $(SONIC_YANG_MGMT_PY3) \ $(SONIC_YANG_MODELS_PY3) diff --git a/rules/docker-config-engine-stretch.mk b/rules/docker-config-engine-stretch.mk index 8644102abe..dfceb7ecdb 100644 --- a/rules/docker-config-engine-stretch.mk +++ b/rules/docker-config-engine-stretch.mk @@ -5,7 +5,6 @@ $(DOCKER_CONFIG_ENGINE_STRETCH)_PATH = $(DOCKERS_PATH)/docker-config-engine-stre $(DOCKER_CONFIG_ENGINE_STRETCH)_DEPENDS += $(LIBSWSSCOMMON) \ $(PYTHON_SWSSCOMMON) \ $(SONIC_DB_CLI) -$(DOCKER_CONFIG_ENGINE_STRETCH)_PYTHON_WHEELS += $(SWSSSDK_PY2) $(DOCKER_CONFIG_ENGINE_STRETCH)_PYTHON_WHEELS += $(SONIC_PY_COMMON_PY2) $(DOCKER_CONFIG_ENGINE_STRETCH)_PYTHON_WHEELS += $(SONIC_CONFIG_ENGINE_PY2) $(DOCKER_CONFIG_ENGINE_STRETCH)_LOAD_DOCKERS += $(DOCKER_BASE_STRETCH) diff --git a/rules/docker-config-engine.mk b/rules/docker-config-engine.mk index 3923a970b4..bdb96984bd 100644 --- a/rules/docker-config-engine.mk +++ b/rules/docker-config-engine.mk @@ -4,7 +4,6 @@ DOCKER_CONFIG_ENGINE = docker-config-engine.gz $(DOCKER_CONFIG_ENGINE)_PATH = $(DOCKERS_PATH)/docker-config-engine $(DOCKER_CONFIG_ENGINE)_DEPENDS += $(LIBSWSSCOMMON) \ $(SONIC_DB_CLI) -$(DOCKER_CONFIG_ENGINE)_PYTHON_WHEELS += $(SWSSSDK_PY2) $(DOCKER_CONFIG_ENGINE)_PYTHON_WHEELS += $(SONIC_PY_COMMON_PY2) $(DOCKER_CONFIG_ENGINE)_PYTHON_WHEELS += $(SONIC_CONFIG_ENGINE_PY2) $(DOCKER_CONFIG_ENGINE)_LOAD_DOCKERS += $(DOCKER_BASE) diff --git a/rules/docker-platform-monitor.mk b/rules/docker-platform-monitor.mk index cb9be990e6..5c3c760f19 100644 --- a/rules/docker-platform-monitor.mk +++ b/rules/docker-platform-monitor.mk @@ -10,7 +10,6 @@ $(DOCKER_PLATFORM_MONITOR)_DEPENDS += $(LIBSENSORS) $(LM_SENSORS) $(FANCONTROL) $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY3) -$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SWSSSDK_PY3) $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PY_COMMON_PY3) $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_CONFIG_ENGINE_PY3) $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PLATFORM_API_PY3) diff --git a/rules/docker-snmp.mk b/rules/docker-snmp.mk index e0f7719c60..313b233a85 100644 --- a/rules/docker-snmp.mk +++ b/rules/docker-snmp.mk @@ -11,10 +11,11 @@ $(DOCKER_SNMP)_DEPENDS += $(SNMP) $(SNMPD) $(DOCKER_SNMP)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_DEPENDS) $(DOCKER_SNMP)_DBG_DEPENDS += $(SNMP_DBG) $(SNMPD_DBG) $(LIBSNMP_DBG) +$(DOCKER_SNMP)_DBG_DEPENDS += $(LIBSWSSCOMMON) $(PYTHON3_SWSSCOMMON) $(DOCKER_SNMP)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_IMAGE_PACKAGES) -$(DOCKER_SNMP)_PYTHON_WHEELS += $(SONIC_PY_COMMON_PY3) $(SONIC_PLATFORM_COMMON_PY3) $(SWSSSDK_PY3) $(ASYNCSNMP_PY3) +$(DOCKER_SNMP)_PYTHON_WHEELS += $(SONIC_PY_COMMON_PY3) $(SONIC_PLATFORM_COMMON_PY3) $(ASYNCSNMP_PY3) $(DOCKER_SNMP)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BULLSEYE) $(DOCKER_SNMP)_VERSION = 1.0.0 diff --git a/rules/sonic-host-services.mk b/rules/sonic-host-services.mk index 87463d2ba8..eeb931ce56 100644 --- a/rules/sonic-host-services.mk +++ b/rules/sonic-host-services.mk @@ -3,8 +3,7 @@ SONIC_HOST_SERVICES_PY3 = sonic_host_services-1.0-py3-none-any.whl $(SONIC_HOST_SERVICES_PY3)_SRC_PATH = $(SRC_PATH)/sonic-host-services $(SONIC_HOST_SERVICES_PY3)_PYTHON_VERSION = 3 -$(SONIC_HOST_SERVICES_PY3)_DEPENDS += $(SONIC_PY_COMMON_PY3) \ - $(SWSSSDK_PY3) +$(SONIC_HOST_SERVICES_PY3)_DEPENDS += $(SONIC_PY_COMMON_PY3) $(SONIC_HOST_SERVICES_PY3)_DEBS_DEPENDS = $(LIBSWSSCOMMON) \ $(PYTHON3_SWSSCOMMON) SONIC_PYTHON_WHEELS += $(SONIC_HOST_SERVICES_PY3) diff --git a/rules/sonic-utilities.mk b/rules/sonic-utilities.mk index 519f633cc7..9c59ebab48 100644 --- a/rules/sonic-utilities.mk +++ b/rules/sonic-utilities.mk @@ -8,7 +8,6 @@ $(SONIC_UTILITIES_PY3)_PYTHON_VERSION = 3 $(SONIC_UTILITIES_PY3)_NAME = $(SONIC_UTILITIES_PY3_NAME) $(SONIC_UTILITIES_PY3)_VERSION = $(SONIC_UTILITIES_PY3_VERSION) $(SONIC_UTILITIES_PY3)_DEPENDS += $(SONIC_PY_COMMON_PY3) \ - $(SWSSSDK_PY3) \ $(SONIC_CONFIG_ENGINE_PY3) \ $(SONIC_PLATFORM_COMMON_PY3) \ $(SONIC_YANG_MGMT_PY3) \ diff --git a/rules/sonic-ztp.mk b/rules/sonic-ztp.mk index 0c4819ec60..a4bcc5e285 100644 --- a/rules/sonic-ztp.mk +++ b/rules/sonic-ztp.mk @@ -5,7 +5,8 @@ SONIC_ZTP_VERSION = 1.0.0 SONIC_ZTP = sonic-ztp_$(SONIC_ZTP_VERSION)_all.deb $(SONIC_ZTP)_SRC_PATH = $(SRC_PATH)/sonic-ztp -$(SONIC_ZTP)_WHEEL_DEPENDS += $(SWSSSDK_PY3) +$(SONIC_ZTP)_PYTHON_VERSION = 3 +$(SONIC_ZTP)_DEBS_DEPENDS += $(LIBSWSSCOMMON) $(PYTHON3_SWSSCOMMON) SONIC_DPKG_DEBS += $(SONIC_ZTP) export SONIC_ZTP_VERSION