diff --git a/rules/system-health.mk b/rules/system-health.mk index bafc09daa7..00cd48858d 100644 --- a/rules/system-health.mk +++ b/rules/system-health.mk @@ -3,7 +3,7 @@ SYSTEM_HEALTH = system_health-1.0-py3-none-any.whl $(SYSTEM_HEALTH)_SRC_PATH = $(SRC_PATH)/system-health $(SYSTEM_HEALTH)_PYTHON_VERSION = 3 -$(SYSTEM_HEALTH)_DEPENDS = $(SONIC_PY_COMMON_PY3) $(SWSSSDK_PY3) $(SONIC_CONFIG_ENGINE_PY3) +$(SYSTEM_HEALTH)_DEPENDS = $(SONIC_PY_COMMON_PY3) $(SONIC_CONFIG_ENGINE_PY3) SONIC_PYTHON_WHEELS += $(SYSTEM_HEALTH) export system_health_py3_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SYSTEM_HEALTH))" diff --git a/src/system-health/health_checker/hardware_checker.py b/src/system-health/health_checker/hardware_checker.py index 2636165782..575564de87 100644 --- a/src/system-health/health_checker/hardware_checker.py +++ b/src/system-health/health_checker/hardware_checker.py @@ -1,5 +1,5 @@ from natsort import natsorted -from swsssdk import SonicV2Connector +from swsscommon.swsscommon import SonicV2Connector from .health_checker import HealthChecker diff --git a/src/system-health/scripts/healthd b/src/system-health/scripts/healthd index 799fa028f2..da0258bb59 100644 --- a/src/system-health/scripts/healthd +++ b/src/system-health/scripts/healthd @@ -9,7 +9,7 @@ import signal import threading from sonic_py_common.daemon_base import DaemonBase -from swsssdk import SonicV2Connector +from swsscommon.swsscommon import SonicV2Connector from health_checker.manager import HealthCheckerManager diff --git a/src/system-health/setup.py b/src/system-health/setup.py index e8084701f0..b0cc998e48 100644 --- a/src/system-health/setup.py +++ b/src/system-health/setup.py @@ -3,7 +3,6 @@ from setuptools import setup dependencies = [ 'natsort', 'sonic_py_common', - 'swsssdk>=2.0.1', ] setup( diff --git a/src/system-health/tests/test_system_health.py b/src/system-health/tests/test_system_health.py index 8fe8642b10..8e3d3c77e9 100644 --- a/src/system-health/tests/test_system_health.py +++ b/src/system-health/tests/test_system_health.py @@ -10,14 +10,14 @@ """ import os import sys -import swsssdk +from swsscommon import swsscommon from mock import Mock, MagicMock, patch from sonic_py_common import device_info from .mock_connector import MockConnector -swsssdk.SonicV2Connector = MockConnector +swsscommon.SonicV2Connector = MockConnector test_path = os.path.dirname(os.path.abspath(__file__)) modules_path = os.path.dirname(test_path)