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

Replace swsssdk with swsscommon in sonic-host-services (#8034)

Browse Source 
#### Why I did it
swsssdk will be deprecated. Use swsscommon instead.

#### How to verify it
Unit test
This commit is contained in:
Qi Luo 2021-07-06 02:07:45 -07:00 committed by GitHub
parent 863b05e572
commit f14430b29b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rules/sonic-host-services.mk
View File

@ -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)_PYTHON_VERSION = 3
$(SONIC_HOST_SERVICES_PY3)_DEPENDS += $(SONIC_PY_COMMON_PY3) \ $(SONIC_HOST_SERVICES_PY3)_DEPENDS += $(SONIC_PY_COMMON_PY3) \
$(SWSSSDK_PY3) $(SWSSSDK_PY3)
$(SONIC_HOST_SERVICES_PY3)_DEBS_DEPENDS = $(LIBSWSSCOMMON) \
$(PYTHON3_SWSSCOMMON)
SONIC_PYTHON_WHEELS += $(SONIC_HOST_SERVICES_PY3) SONIC_PYTHON_WHEELS += $(SONIC_HOST_SERVICES_PY3)

2
src/sonic-host-services/scripts/aaastatsd
View File

@ -4,7 +4,7 @@
import os import os
import syslog import syslog
import threading import threading
from swsssdk import ConfigDBConnector from swsscommon.swsscommon import ConfigDBConnector
from watchdog.observers import Observer from watchdog.observers import Observer
from watchdog.events import FileSystemEventHandler from watchdog.events import FileSystemEventHandler

7
src/sonic-host-services/scripts/caclmgrd
View File

@ -20,7 +20,6 @@ try:
from sonic_py_common import daemon_base, device_info from sonic_py_common import daemon_base, device_info
from swsscommon import swsscommon from swsscommon import swsscommon
from swsssdk import SonicDBConfig, ConfigDBConnector
except ImportError as err: except ImportError as err:
raise ImportError("%s - required module not found" % str(err)) raise ImportError("%s - required module not found" % str(err))
@ -98,10 +97,10 @@ class ControlPlaneAclManager(daemon_base.DaemonBase):
self.lock[DEFAULT_NAMESPACE] = threading.Lock() self.lock[DEFAULT_NAMESPACE] = threading.Lock()
self.num_changes[DEFAULT_NAMESPACE] = 0 self.num_changes[DEFAULT_NAMESPACE] = 0
SonicDBConfig.load_sonic_global_db_config() swsscommon.SonicDBConfig.load_sonic_global_db_config()
self.config_db_map = {} self.config_db_map = {}
self.iptables_cmd_ns_prefix = {} 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.config_db_map[DEFAULT_NAMESPACE].connect()
self.iptables_cmd_ns_prefix[DEFAULT_NAMESPACE] = "" 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) 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):
self.lock[front_asic_namespace] = threading.Lock() self.lock[front_asic_namespace] = threading.Lock()
self.num_changes[front_asic_namespace] = 0 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.config_db_map[front_asic_namespace].connect()
self.iptables_cmd_ns_prefix[front_asic_namespace] = "ip netns exec " + front_asic_namespace + " " 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], self.namespace_docker_mgmt_ip[front_asic_namespace] = self.get_namespace_mgmt_ip(self.iptables_cmd_ns_prefix[front_asic_namespace],

2
src/sonic-host-services/scripts/hostcfgd
View File

@ -9,7 +9,7 @@ import syslog
import jinja2 import jinja2
from sonic_py_common import device_info from sonic_py_common import device_info
from swsssdk import ConfigDBConnector from swsscommon.swsscommon import ConfigDBConnector
# FILE # FILE
PAM_AUTH_CONF = "/etc/pam.d/common-auth-sonic" PAM_AUTH_CONF = "/etc/pam.d/common-auth-sonic"

4
src/sonic-host-services/scripts/procdockerstatsd
View File

@ -12,7 +12,7 @@ import time
from datetime import datetime from datetime import datetime
from sonic_py_common import daemon_base from sonic_py_common import daemon_base
import swsssdk from swsscommon import swsscommon
VERSION = '1.0' VERSION = '1.0'
@ -25,7 +25,7 @@ class ProcDockerStats(daemon_base.DaemonBase):
def __init__(self, log_identifier): def __init__(self, log_identifier):
super(ProcDockerStats, self).__init__(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") self.state_db.connect("STATE_DB")
def run_command(self, cmd): def run_command(self, cmd):

4
src/sonic-host-services/scripts/process-reboot-cause
View File

@ -12,7 +12,7 @@ try:
import pwd import pwd
import sys import sys
import swsssdk from swsscommon import swsscommon
from sonic_py_common import logger from sonic_py_common import logger
except ImportError as err: except ImportError as err:
raise ImportError("%s - required module not found" % str(err)) raise ImportError("%s - required module not found" % str(err))
@ -39,7 +39,7 @@ sonic_logger = logger.Logger(SYSLOG_IDENTIFIER)
# ============================= Functions ============================= # ============================= Functions =============================
def read_reboot_cause_files_and_save_state_db(): def read_reboot_cause_files_and_save_state_db():
# Connect 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) state_db.connect(state_db.STATE_DB)
# Sort the previous reboot cause files by creation time # Sort the previous reboot cause files by creation time

1
src/sonic-host-services/setup.py
View File

@ -27,7 +27,6 @@ setup(
'Jinja2>=2.10', 'Jinja2>=2.10',
'PyGObject', 'PyGObject',
'sonic-py-common', 'sonic-py-common',
'swsssdk>=2.0.1',
'systemd-python', 'systemd-python',
], ],
setup_requires = [ setup_requires = [

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

@ -2,7 +2,7 @@ import sys
import os import os
import pytest import pytest
import swsssdk from swsscommon import swsscommon
from sonic_py_common.general import load_module_from_source from sonic_py_common.general import load_module_from_source
# TODO: Remove this if/else block once we no longer support Python 2 # TODO: Remove this if/else block once we no longer support Python 2
@ -21,7 +21,7 @@ else:
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)

4
src/sonic-host-services/tests/hostcfgd/hostcfgd_radius_test.py
View File

@ -5,7 +5,7 @@ import shutil
import os import os
import sys import sys
import subprocess import subprocess
import swsssdk from swsscommon import swsscommon
from parameterized import parameterized from parameterized import parameterized
from unittest import TestCase, mock from unittest import TestCase, mock
@ -13,7 +13,7 @@ from tests.hostcfgd.test_radius_vectors import HOSTCFGD_TEST_RADIUS_VECTOR
from tests.hostcfgd.mock_configdb import MockConfigDb 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__))) test_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
modules_path = os.path.dirname(test_path) modules_path = os.path.dirname(test_path)
scripts_path = os.path.join(modules_path, "scripts") scripts_path = os.path.join(modules_path, "scripts")

6
src/sonic-host-services/tests/hostcfgd/hostcfgd_test.py
View File

@ -1,6 +1,6 @@
import os import os
import sys import sys
import swsssdk import swsscommon
from parameterized import parameterized from parameterized import parameterized
from sonic_py_common.general import load_module_from_source from sonic_py_common.general import load_module_from_source
@ -12,7 +12,7 @@ from .mock_configdb import MockConfigDb
from pyfakefs.fake_filesystem_unittest import patchfs 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__))) test_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
modules_path = os.path.dirname(test_path) modules_path = os.path.dirname(test_path)
scripts_path = os.path.join(modules_path, "scripts") scripts_path = os.path.join(modules_path, "scripts")
@ -93,7 +93,7 @@ class TestHostcfgd(TestCase):
Returns: Returns:
None 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) fs.create_dir(hostcfgd.FeatureHandler.SYSTEMD_SYSTEM_DIR)
MockConfigDb.set_config_db(test_data["config_db"]) MockConfigDb.set_config_db(test_data["config_db"])
with mock.patch("hostcfgd.subprocess") as mocked_subprocess: with mock.patch("hostcfgd.subprocess") as mocked_subprocess:

4
src/sonic-host-services/tests/procdockerstatsd_test.py
View File

@ -2,12 +2,12 @@ import sys
import os import os
import pytest import pytest
import swsssdk from swsscommon import swsscommon
from sonic_py_common.general import load_module_from_source from sonic_py_common.general import load_module_from_source
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)