Skip to content

Commit

Permalink
Replace swsssdk with swsscommon in sonic-host-services (sonic-net#8034)
Browse files Browse the repository at this point in the history
#### Why I did it
swsssdk will be deprecated. Use swsscommon instead.

#### How to verify it
Unit test
  • Loading branch information
qiluo-msft authored and Carl Keene committed Aug 7, 2021
1 parent 41cb49b commit 94fb7ce
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 20 deletions.
2 changes: 2 additions & 0 deletions rules/sonic-host-services.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@ $(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)_DEBS_DEPENDS = $(LIBSWSSCOMMON) \
$(PYTHON3_SWSSCOMMON)
SONIC_PYTHON_WHEELS += $(SONIC_HOST_SERVICES_PY3)
2 changes: 1 addition & 1 deletion src/sonic-host-services/scripts/aaastatsd
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import os
import syslog
import threading
from swsssdk import ConfigDBConnector
from swsscommon.swsscommon import ConfigDBConnector
from watchdog.observers import Observer
from watchdog.events import FileSystemEventHandler

Expand Down
7 changes: 3 additions & 4 deletions src/sonic-host-services/scripts/caclmgrd
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ try:

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

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

SonicDBConfig.load_sonic_global_db_config()
swsscommon.SonicDBConfig.load_sonic_global_db_config()
self.config_db_map = {}
self.iptables_cmd_ns_prefix = {}
self.config_db_map[DEFAULT_NAMESPACE] = ConfigDBConnector(use_unix_socket_path=True, namespace=DEFAULT_NAMESPACE)
self.config_db_map[DEFAULT_NAMESPACE] = swsscommon.ConfigDBConnector(use_unix_socket_path=True, namespace=DEFAULT_NAMESPACE)
self.config_db_map[DEFAULT_NAMESPACE].connect()
self.iptables_cmd_ns_prefix[DEFAULT_NAMESPACE] = ""
self.namespace_mgmt_ip = self.get_namespace_mgmt_ip(self.iptables_cmd_ns_prefix[DEFAULT_NAMESPACE], DEFAULT_NAMESPACE)
Expand All @@ -115,7 +114,7 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
self.lock[front_asic_namespace] = threading.Lock()
self.num_changes[front_asic_namespace] = 0

self.config_db_map[front_asic_namespace] = ConfigDBConnector(use_unix_socket_path=True, namespace=front_asic_namespace)
self.config_db_map[front_asic_namespace] = swsscommon.ConfigDBConnector(use_unix_socket_path=True, namespace=front_asic_namespace)
self.config_db_map[front_asic_namespace].connect()
self.iptables_cmd_ns_prefix[front_asic_namespace] = "ip netns exec " + front_asic_namespace + " "
self.namespace_docker_mgmt_ip[front_asic_namespace] = self.get_namespace_mgmt_ip(self.iptables_cmd_ns_prefix[front_asic_namespace],
Expand Down
2 changes: 1 addition & 1 deletion src/sonic-host-services/scripts/hostcfgd
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import syslog

import jinja2
from sonic_py_common import device_info
from swsssdk import ConfigDBConnector
from swsscommon.swsscommon import ConfigDBConnector

# FILE
PAM_AUTH_CONF = "/etc/pam.d/common-auth-sonic"
Expand Down
4 changes: 2 additions & 2 deletions src/sonic-host-services/scripts/procdockerstatsd
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import time
from datetime import datetime

from sonic_py_common import daemon_base
import swsssdk
from swsscommon import swsscommon

VERSION = '1.0'

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

def __init__(self, log_identifier):
super(ProcDockerStats, self).__init__(log_identifier)
self.state_db = swsssdk.SonicV2Connector(host=REDIS_HOSTIP)
self.state_db = swsscommon.SonicV2Connector(host=REDIS_HOSTIP)
self.state_db.connect("STATE_DB")

def run_command(self, cmd):
Expand Down
4 changes: 2 additions & 2 deletions src/sonic-host-services/scripts/process-reboot-cause
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ try:
import pwd
import sys

import swsssdk
from swsscommon import swsscommon
from sonic_py_common import logger
except ImportError as err:
raise ImportError("%s - required module not found" % str(err))
Expand All @@ -39,7 +39,7 @@ sonic_logger = logger.Logger(SYSLOG_IDENTIFIER)
# ============================= Functions =============================
def read_reboot_cause_files_and_save_state_db():
# Connect State DB
state_db = swsssdk.SonicV2Connector(host=REDIS_HOSTIP)
state_db = swsscommon.SonicV2Connector(host=REDIS_HOSTIP)
state_db.connect(state_db.STATE_DB)

# Sort the previous reboot cause files by creation time
Expand Down
1 change: 0 additions & 1 deletion src/sonic-host-services/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
'Jinja2>=2.10',
'PyGObject',
'sonic-py-common',
'swsssdk>=2.0.1',
'systemd-python',
],
setup_requires = [
Expand Down
4 changes: 2 additions & 2 deletions src/sonic-host-services/tests/determine-reboot-cause_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import os
import pytest

import swsssdk
from swsscommon import swsscommon
from sonic_py_common.general import load_module_from_source

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

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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
import os
import sys
import subprocess
import swsssdk
from swsscommon import swsscommon

from parameterized import parameterized
from unittest import TestCase, mock
from tests.hostcfgd.test_radius_vectors import HOSTCFGD_TEST_RADIUS_VECTOR
from tests.hostcfgd.mock_configdb import MockConfigDb


swsssdk.ConfigDBConnector = MockConfigDb
swsscommon.ConfigDBConnector = MockConfigDb
test_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
modules_path = os.path.dirname(test_path)
scripts_path = os.path.join(modules_path, "scripts")
Expand Down
6 changes: 3 additions & 3 deletions src/sonic-host-services/tests/hostcfgd/hostcfgd_test.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import os
import sys
import swsssdk
import swsscommon

from parameterized import parameterized
from sonic_py_common.general import load_module_from_source
Expand All @@ -12,7 +12,7 @@
from pyfakefs.fake_filesystem_unittest import patchfs


swsssdk.ConfigDBConnector = MockConfigDb
swsscommon.swsscommon.ConfigDBConnector = MockConfigDb
test_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
modules_path = os.path.dirname(test_path)
scripts_path = os.path.join(modules_path, "scripts")
Expand Down Expand Up @@ -93,7 +93,7 @@ def test_hostcfgd(self, test_name, test_data, fs):
Returns:
None
"""
fs.add_real_paths(swsssdk.__path__) # add real path of swsssdk for database_config.json
fs.add_real_paths(swsscommon.__path__) # add real path of swsscommon for database_config.json
fs.create_dir(hostcfgd.FeatureHandler.SYSTEMD_SYSTEM_DIR)
MockConfigDb.set_config_db(test_data["config_db"])
with mock.patch("hostcfgd.subprocess") as mocked_subprocess:
Expand Down
4 changes: 2 additions & 2 deletions src/sonic-host-services/tests/procdockerstatsd_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
import os
import pytest

import swsssdk
from swsscommon import swsscommon
from sonic_py_common.general import load_module_from_source

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)
Expand Down

0 comments on commit 94fb7ce

Please sign in to comment.