Skip to content

Commit f14430b

Browse files
authored
Replace swsssdk with swsscommon in sonic-host-services (#8034)
#### Why I did it swsssdk will be deprecated. Use swsscommon instead. #### How to verify it Unit test
1 parent 863b05e commit f14430b

11 files changed

+20
-20
lines changed

rules/sonic-host-services.mk

+2
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@ $(SONIC_HOST_SERVICES_PY3)_SRC_PATH = $(SRC_PATH)/sonic-host-services
55
$(SONIC_HOST_SERVICES_PY3)_PYTHON_VERSION = 3
66
$(SONIC_HOST_SERVICES_PY3)_DEPENDS += $(SONIC_PY_COMMON_PY3) \
77
$(SWSSSDK_PY3)
8+
$(SONIC_HOST_SERVICES_PY3)_DEBS_DEPENDS = $(LIBSWSSCOMMON) \
9+
$(PYTHON3_SWSSCOMMON)
810
SONIC_PYTHON_WHEELS += $(SONIC_HOST_SERVICES_PY3)

src/sonic-host-services/scripts/aaastatsd

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import os
55
import syslog
66
import threading
7-
from swsssdk import ConfigDBConnector
7+
from swsscommon.swsscommon import ConfigDBConnector
88
from watchdog.observers import Observer
99
from watchdog.events import FileSystemEventHandler
1010

src/sonic-host-services/scripts/caclmgrd

+3-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ try:
2020

2121
from sonic_py_common import daemon_base, device_info
2222
from swsscommon import swsscommon
23-
from swsssdk import SonicDBConfig, ConfigDBConnector
2423
except ImportError as err:
2524
raise ImportError("%s - required module not found" % str(err))
2625

@@ -98,10 +97,10 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
9897
self.lock[DEFAULT_NAMESPACE] = threading.Lock()
9998
self.num_changes[DEFAULT_NAMESPACE] = 0
10099

101-
SonicDBConfig.load_sonic_global_db_config()
100+
swsscommon.SonicDBConfig.load_sonic_global_db_config()
102101
self.config_db_map = {}
103102
self.iptables_cmd_ns_prefix = {}
104-
self.config_db_map[DEFAULT_NAMESPACE] = ConfigDBConnector(use_unix_socket_path=True, namespace=DEFAULT_NAMESPACE)
103+
self.config_db_map[DEFAULT_NAMESPACE] = swsscommon.ConfigDBConnector(use_unix_socket_path=True, namespace=DEFAULT_NAMESPACE)
105104
self.config_db_map[DEFAULT_NAMESPACE].connect()
106105
self.iptables_cmd_ns_prefix[DEFAULT_NAMESPACE] = ""
107106
self.namespace_mgmt_ip = self.get_namespace_mgmt_ip(self.iptables_cmd_ns_prefix[DEFAULT_NAMESPACE], DEFAULT_NAMESPACE)
@@ -115,7 +114,7 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
115114
self.lock[front_asic_namespace] = threading.Lock()
116115
self.num_changes[front_asic_namespace] = 0
117116

118-
self.config_db_map[front_asic_namespace] = ConfigDBConnector(use_unix_socket_path=True, namespace=front_asic_namespace)
117+
self.config_db_map[front_asic_namespace] = swsscommon.ConfigDBConnector(use_unix_socket_path=True, namespace=front_asic_namespace)
119118
self.config_db_map[front_asic_namespace].connect()
120119
self.iptables_cmd_ns_prefix[front_asic_namespace] = "ip netns exec " + front_asic_namespace + " "
121120
self.namespace_docker_mgmt_ip[front_asic_namespace] = self.get_namespace_mgmt_ip(self.iptables_cmd_ns_prefix[front_asic_namespace],

src/sonic-host-services/scripts/hostcfgd

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import syslog
99

1010
import jinja2
1111
from sonic_py_common import device_info
12-
from swsssdk import ConfigDBConnector
12+
from swsscommon.swsscommon import ConfigDBConnector
1313

1414
# FILE
1515
PAM_AUTH_CONF = "/etc/pam.d/common-auth-sonic"

src/sonic-host-services/scripts/procdockerstatsd

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import time
1212
from datetime import datetime
1313

1414
from sonic_py_common import daemon_base
15-
import swsssdk
15+
from swsscommon import swsscommon
1616

1717
VERSION = '1.0'
1818

@@ -25,7 +25,7 @@ class ProcDockerStats(daemon_base.DaemonBase):
2525

2626
def __init__(self, log_identifier):
2727
super(ProcDockerStats, self).__init__(log_identifier)
28-
self.state_db = swsssdk.SonicV2Connector(host=REDIS_HOSTIP)
28+
self.state_db = swsscommon.SonicV2Connector(host=REDIS_HOSTIP)
2929
self.state_db.connect("STATE_DB")
3030

3131
def run_command(self, cmd):

src/sonic-host-services/scripts/process-reboot-cause

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ try:
1212
import pwd
1313
import sys
1414

15-
import swsssdk
15+
from swsscommon import swsscommon
1616
from sonic_py_common import logger
1717
except ImportError as err:
1818
raise ImportError("%s - required module not found" % str(err))
@@ -39,7 +39,7 @@ sonic_logger = logger.Logger(SYSLOG_IDENTIFIER)
3939
# ============================= Functions =============================
4040
def read_reboot_cause_files_and_save_state_db():
4141
# Connect State DB
42-
state_db = swsssdk.SonicV2Connector(host=REDIS_HOSTIP)
42+
state_db = swsscommon.SonicV2Connector(host=REDIS_HOSTIP)
4343
state_db.connect(state_db.STATE_DB)
4444

4545
# Sort the previous reboot cause files by creation time

src/sonic-host-services/setup.py

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
'Jinja2>=2.10',
2828
'PyGObject',
2929
'sonic-py-common',
30-
'swsssdk>=2.0.1',
3130
'systemd-python',
3231
],
3332
setup_requires = [

src/sonic-host-services/tests/determine-reboot-cause_test.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import os
33
import pytest
44

5-
import swsssdk
5+
from swsscommon import swsscommon
66
from sonic_py_common.general import load_module_from_source
77

88
# TODO: Remove this if/else block once we no longer support Python 2
@@ -21,7 +21,7 @@
2121

2222
from .mock_connector import MockConnector
2323

24-
swsssdk.SonicV2Connector = MockConnector
24+
swsscommon.SonicV2Connector = MockConnector
2525

2626
test_path = os.path.dirname(os.path.abspath(__file__))
2727
modules_path = os.path.dirname(test_path)

src/sonic-host-services/tests/hostcfgd/hostcfgd_radius_test.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
import os
66
import sys
77
import subprocess
8-
import swsssdk
8+
from swsscommon import swsscommon
99

1010
from parameterized import parameterized
1111
from unittest import TestCase, mock
1212
from tests.hostcfgd.test_radius_vectors import HOSTCFGD_TEST_RADIUS_VECTOR
1313
from tests.hostcfgd.mock_configdb import MockConfigDb
1414

1515

16-
swsssdk.ConfigDBConnector = MockConfigDb
16+
swsscommon.ConfigDBConnector = MockConfigDb
1717
test_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
1818
modules_path = os.path.dirname(test_path)
1919
scripts_path = os.path.join(modules_path, "scripts")

src/sonic-host-services/tests/hostcfgd/hostcfgd_test.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import os
22
import sys
3-
import swsssdk
3+
import swsscommon
44

55
from parameterized import parameterized
66
from sonic_py_common.general import load_module_from_source
@@ -12,7 +12,7 @@
1212
from pyfakefs.fake_filesystem_unittest import patchfs
1313

1414

15-
swsssdk.ConfigDBConnector = MockConfigDb
15+
swsscommon.swsscommon.ConfigDBConnector = MockConfigDb
1616
test_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
1717
modules_path = os.path.dirname(test_path)
1818
scripts_path = os.path.join(modules_path, "scripts")
@@ -93,7 +93,7 @@ def test_hostcfgd(self, test_name, test_data, fs):
9393
Returns:
9494
None
9595
"""
96-
fs.add_real_paths(swsssdk.__path__) # add real path of swsssdk for database_config.json
96+
fs.add_real_paths(swsscommon.__path__) # add real path of swsscommon for database_config.json
9797
fs.create_dir(hostcfgd.FeatureHandler.SYSTEMD_SYSTEM_DIR)
9898
MockConfigDb.set_config_db(test_data["config_db"])
9999
with mock.patch("hostcfgd.subprocess") as mocked_subprocess:

src/sonic-host-services/tests/procdockerstatsd_test.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
import os
33
import pytest
44

5-
import swsssdk
5+
from swsscommon import swsscommon
66
from sonic_py_common.general import load_module_from_source
77

88
from .mock_connector import MockConnector
99

10-
swsssdk.SonicV2Connector = MockConnector
10+
swsscommon.SonicV2Connector = MockConnector
1111

1212
test_path = os.path.dirname(os.path.abspath(__file__))
1313
modules_path = os.path.dirname(test_path)

0 commit comments

Comments
 (0)