Replace pyswsssdk with swsscommon

README.md

@@ -26,11 +26,11 @@ Currently, this list of dependencies is as follows:
 - libyang-cpp_1.0.73_amd64.deb
 - python3-yang_1.0.73_amd64.deb
 - redis_dump_load-1.1-py3-none-any.whl
-- swsssdk-2.0.1-py3-none-any.whl
 - sonic_py_common-1.0-py3-none-any.whl
 - sonic_config_engine-1.0-py3-none-any.whl
 - sonic_yang_mgmt-1.0-py3-none-any.whl
 - sonic_yang_models-1.0-py3-none-any.whl
+- python-swsscommon_1.0.0_amd64.deb
 
 
 A convenient alternative is to let the SONiC build system configure a build enviroment for you. This can be done by cloning the [sonic-buildimage](https://github.com/Azure/sonic-buildimage) repo, building the sonic-utilities package inside the Debian Buster slave container, and staying inside the container once the build finishes. During the build process, the SONiC build system will build and install all the necessary dependencies inside the container. After following the instructions to clone and initialize the sonic-buildimage repo, this can be done as follows:

config/config_mgmt.py

@@ -15,7 +15,7 @@
 
 import sonic_yang
 from jsondiff import diff
-from swsssdk import port_util
+from sonic_py_common import port_util
 from swsscommon.swsscommon import SonicV2Connector, ConfigDBConnector
 from utilities_common.general import load_module_from_source
 

config/main.py

@@ -6539,7 +6539,7 @@ def rate():
 @click.argument('rates_type', type=click.Choice(['all', 'port', 'rif', 'flowcnt-trap']), default='all')
 def smoothing_interval(interval, rates_type):
     """Set rates smoothing interval """
-    counters_db = swsssdk.SonicV2Connector()
+    counters_db = SonicV2Connector()
     counters_db.connect('COUNTERS_DB')
 
     alpha = 2.0/(interval + 1)

scripts/fdbshow

@@ -56,7 +56,7 @@ try: # pragma: no cover
 except KeyError: # pragma: no cover
     pass
 
-from swsssdk import port_util
+from sonic_py_common import port_util
 from swsscommon.swsscommon import SonicV2Connector
 from tabulate import tabulate
 

scripts/nbrshow

@@ -33,7 +33,7 @@ import subprocess
 import re
 
 from natsort import natsorted
-from swsssdk import port_util
+from sonic_py_common import port_util
 from swsscommon.swsscommon import SonicV2Connector
 from tabulate import tabulate
 

setup.py

@@ -211,7 +211,6 @@
         'sonic-platform-common',
         'sonic-py-common',
         'sonic-yang-mgmt',
-        'swsssdk>=2.0.1',
         'tabulate==0.8.2',
         'toposort==1.6',
         'www-authenticate==0.9.2',

tests/config_test.py

@@ -1486,3 +1486,31 @@ def teardown_class(cls):
         from .mock_tables import mock_single_asic
         importlib.reload(mock_single_asic)
         dbconnector.load_namespace_config()
+
+class TestConfigRate(object):
+    @classmethod
+    def setup_class(cls):
+        os.environ['UTILITIES_UNIT_TESTING'] = "1"
+        print("SETUP")
+
+        import config.main
+        importlib.reload(config.main)
+
+    def test_config_rate(self, get_cmd_module, setup_single_broadcom_asic):
+        with mock.patch("utilities_common.cli.run_command", mock.MagicMock(side_effect=mock_run_command_side_effect)) as mock_run_command:
+            (config, show) = get_cmd_module
+
+            runner = CliRunner()
+            result = runner.invoke(config.config.commands["rate"], ["smoothing-interval", "500"])
+
+            print(result.exit_code)
+            print(result.output)
+            traceback.print_tb(result.exc_info[2])
+
+            assert result.exit_code == 0
+            assert result.output == ""
+
+    @classmethod
+    def teardown_class(cls):
+        print("TEARDOWN")
+        os.environ['UTILITIES_UNIT_TESTING'] = "0"

tests/db_migrator_test.py

@@ -4,7 +4,7 @@
 
 from deepdiff import DeepDiff
 
-from swsssdk import SonicV2Connector
+from swsscommon.swsscommon import SonicV2Connector
 from sonic_py_common import device_info
 
 from .mock_tables import dbconnector

tests/null_route_helper_test.py

@@ -3,7 +3,7 @@
 import imp
 
 from click.testing import CliRunner
-from swsssdk import ConfigDBConnector
+from swsscommon.swsscommon import ConfigDBConnector
 
 null_route_helper = imp.load_source('null_route_helper', os.path.join(os.path.dirname(__file__), '..', 'scripts','null_route_helper'))
 null_route_helper.ConfigDBConnector = ConfigDBConnector

tests/show_snmp_test.py

@@ -3,7 +3,6 @@
 import click
 from click.testing import CliRunner
 import pytest
-import swsssdk
 import traceback
 
 test_path = os.path.dirname(os.path.abspath(__file__))

tests/tpid_test.py

@@ -3,7 +3,6 @@
 import click
 from click.testing import CliRunner
 import pytest
-import swsssdk
 import traceback
 
 test_path = os.path.dirname(os.path.abspath(__file__))