matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace swsssdk.ConfigDBConnector and SonicDBConfig with swsscommon implementation in system-health (#8186)

Browse Source 
swsssdk will be deprecated. Use swsscommon instead.
This commit is contained in:
Qi Luo 2021-07-16 19:56:24 -07:00 committed by GitHub
parent aca80a685c
commit ec624e280c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rules/system-health.mk
View File

@ -3,7 +3,7 @@
SYSTEM_HEALTH = system_health-1.0-py3-none-any.whl SYSTEM_HEALTH = system_health-1.0-py3-none-any.whl
$(SYSTEM_HEALTH)_SRC_PATH = $(SRC_PATH)/system-health $(SYSTEM_HEALTH)_SRC_PATH = $(SRC_PATH)/system-health
$(SYSTEM_HEALTH)_PYTHON_VERSION = 3 $(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) SONIC_PYTHON_WHEELS += $(SYSTEM_HEALTH)
export system_health_py3_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SYSTEM_HEALTH))" export system_health_py3_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SYSTEM_HEALTH))"

2
src/system-health/health_checker/hardware_checker.py
View File

@ -1,5 +1,5 @@
from natsort import natsorted from natsort import natsorted
from swsssdk import SonicV2Connector from swsscommon.swsscommon import SonicV2Connector
from .health_checker import HealthChecker from .health_checker import HealthChecker

2
src/system-health/scripts/healthd
View File

@ -9,7 +9,7 @@ import signal
import threading import threading
from sonic_py_common.daemon_base import DaemonBase from sonic_py_common.daemon_base import DaemonBase
from swsssdk import SonicV2Connector from swsscommon.swsscommon import SonicV2Connector
from health_checker.manager import HealthCheckerManager from health_checker.manager import HealthCheckerManager

1
src/system-health/setup.py
View File

@ -3,7 +3,6 @@ from setuptools import setup
dependencies = [ dependencies = [
'natsort', 'natsort',
'sonic_py_common', 'sonic_py_common',
'swsssdk>=2.0.1',
] ]
setup( setup(

4
src/system-health/tests/test_system_health.py
View File

@ -10,14 +10,14 @@
""" """
import os import os
import sys import sys
import swsssdk from swsscommon import swsscommon
from mock import Mock, MagicMock, patch from mock import Mock, MagicMock, patch
from sonic_py_common import device_info from sonic_py_common import device_info
from .mock_connector import MockConnector from .mock_connector import MockConnector
swsssdk.SonicV2Connector = MockConnector swsscommon.SonicV2Connector = MockConnector
test_path = os.path.dirname(os.path.abspath(__file__)) test_path = os.path.dirname(os.path.abspath(__file__))
modules_path = os.path.dirname(test_path) modules_path = os.path.dirname(test_path)