Use SonicV2Connector/ConfigDBConnector/SonicDBConfig from swsscommon …

…instread of swsssdk (#1392)

- What I did
Use SonicV2Connector/ConfigDBConnector/SonicDBConfig from swsscommon instread of swsssdk

- How to verify it
Unit test and test impacted command lines on DUT.

acl_loader/main.py

@@ -10,8 +10,7 @@
 import pyangbind.lib.pybindJSON as pybindJSON
 from natsort import natsorted
 from sonic_py_common import device_info
-from swsssdk import ConfigDBConnector, SonicDBConfig
-from swsscommon.swsscommon import SonicV2Connector
+from swsscommon.swsscommon import SonicV2Connector, ConfigDBConnector, SonicDBConfig
 
 
 def info(msg):

config/aaa.py

@@ -1,5 +1,5 @@
 import click
-from swsssdk import ConfigDBConnector
+from swsscommon.swsscommon import ConfigDBConnector
 import utilities_common.cli as clicommon
 
 def add_table_kv(table, entry, key, val):

config/config_mgmt.py

@@ -14,8 +14,8 @@
 
     # SONiC specific imports
     import sonic_yang
-    from swsssdk import ConfigDBConnector, port_util
-    from swsscommon.swsscommon import SonicV2Connector
+    from swsssdk import port_util
+    from swsscommon.swsscommon import SonicV2Connector, ConfigDBConnector
 
     # Using load_source to 'import /usr/local/bin/sonic-cfggen as sonic_cfggen'
     # since /usr/local/bin/sonic-cfggen does not have .py extension.
@@ -190,8 +190,8 @@ def readConfigDB(self):
         '''
         self.sysLog(doPrint=True, msg='Reading data from Redis configDb')
         # Read from config DB on sonic switch
-        db_kwargs = dict(); data = dict()
-        configdb = ConfigDBConnector(**db_kwargs)
+        data = dict()
+        configdb = ConfigDBConnector()
         configdb.connect()
         deep_update(data, FormatConverter.db_to_output(configdb.get_config()))
         self.configdbJsonIn =  FormatConverter.to_serialized(data)
@@ -211,8 +211,8 @@ def writeConfigDB(self, jDiff):
             void
         '''
         self.sysLog(doPrint=True, msg='Writing in Config DB')
-        db_kwargs = dict(); data = dict()
-        configdb = ConfigDBConnector(**db_kwargs)
+        data = dict()
+        configdb = ConfigDBConnector()
         configdb.connect(False)
         deep_update(data, FormatConverter.to_deserialized(jDiff))
         self.sysLog(msg="Write in DB: {}".format(data))

config/kdump.py

@@ -1,7 +1,7 @@
 import os
 import click
 import utilities_common.cli as clicommon
-from swsssdk import ConfigDBConnector
+from swsscommon.swsscommon import ConfigDBConnector
 
 @click.group(cls=clicommon.AbbreviationGroup, name="kdump")
 def kdump():

config/main.py

@@ -17,8 +17,7 @@
 from portconfig import get_child_ports
 from sonic_py_common import device_info, multi_asic
 from sonic_py_common.interface import get_interface_table_name, get_port_table_name
-from swsssdk import ConfigDBConnector, SonicDBConfig
-from swsscommon.swsscommon import SonicV2Connector
+from swsscommon.swsscommon import SonicV2Connector, ConfigDBConnector, SonicDBConfig
 from utilities_common.db import Db
 from utilities_common.intf_filter import parse_interface_in_filter
 import utilities_common.cli as clicommon
@@ -1882,14 +1881,14 @@ def is_dynamic_buffer_enabled(config_db):
 @click.option('-s', '--redis-unix-socket-path', help='unix socket path for redis connection')
 def warm_restart(ctx, redis_unix_socket_path):
     """warm_restart-related configuration tasks"""
-    kwargs = {}
-    if redis_unix_socket_path:
-        kwargs['unix_socket_path'] = redis_unix_socket_path
-    config_db = ConfigDBConnector(**kwargs)
+    # Note: redis_unix_socket_path is a path string, and the ground truth is now from database_config.json.
+    # We only use it as a bool indicator on either unix_socket_path or tcp port
+    use_unix_socket_path = bool(redis_unix_socket_path)
+    config_db = ConfigDBConnector(use_unix_socket_path=use_unix_socket_path)
     config_db.connect(wait_for_init=False)
 
     # warm restart enable/disable config is put in stateDB, not persistent across cold reboot, not saved to config_DB.json file
-    state_db = SonicV2Connector(host='127.0.0.1')
+    state_db = SonicV2Connector(use_unix_socket_path=use_unix_socket_path)
     state_db.connect(state_db.STATE_DB, False)
     TABLE_NAME_SEPARATOR = '|'
     prefix = 'WARM_RESTART_ENABLE_TABLE' + TABLE_NAME_SEPARATOR

config/muxcable.py

@@ -5,8 +5,7 @@
 import click
 import utilities_common.cli as clicommon
 from sonic_py_common import multi_asic
-from swsssdk import ConfigDBConnector
-from swsscommon import swsscommon
+from swsscommon.swsscommon import SonicV2Connector, ConfigDBConnector
 from tabulate import tabulate
 from utilities_common import platform_sfputil_helper
 
@@ -123,7 +122,7 @@ def mode(state, port, json_output):
         # replace these with correct macros
         per_npu_configdb[asic_id] = ConfigDBConnector(use_unix_socket_path=True, namespace=namespace)
         per_npu_configdb[asic_id].connect()
-        per_npu_statedb[asic_id] = swsscommon.SonicV2Connector(use_unix_socket_path=True, namespace=namespace)
+        per_npu_statedb[asic_id] = SonicV2Connector(use_unix_socket_path=True, namespace=namespace)
         per_npu_statedb[asic_id].connect(per_npu_statedb[asic_id].STATE_DB)
 
         mux_tbl_cfg_db[asic_id] = per_npu_configdb[asic_id].get_table("MUX_CABLE")

config/nat.py

@@ -1,8 +1,7 @@
 import ipaddress
 
 import click
-from swsssdk import ConfigDBConnector
-from swsscommon.swsscommon import SonicV2Connector
+from swsscommon.swsscommon import SonicV2Connector, ConfigDBConnector
 
 
 def is_valid_ipv4_address(address):

counterpoll/main.py

@@ -1,6 +1,6 @@
 import click
 import json
-import swsssdk
+from swsscommon.swsscommon import ConfigDBConnector
 from tabulate import tabulate
 
 BUFFER_POOL_WATERMARK = "BUFFER_POOL_WATERMARK"
@@ -24,7 +24,7 @@ def queue():
 @click.argument('poll_interval', type=click.IntRange(100, 30000))
 def interval(poll_interval):
     """ Set queue counter query interval """
-    configdb = swsssdk.ConfigDBConnector()
+    configdb = ConfigDBConnector()
     configdb.connect()
     queue_info = {}
     if poll_interval is not None:
@@ -34,7 +34,7 @@ def interval(poll_interval):
 @queue.command()
 def enable():
     """ Enable queue counter query """
-    configdb = swsssdk.ConfigDBConnector()
+    configdb = ConfigDBConnector()
     configdb.connect()
     queue_info = {}
     queue_info['FLEX_COUNTER_STATUS'] = 'enable'
@@ -43,7 +43,7 @@ def enable():
 @queue.command()
 def disable():
     """ Disable queue counter query """
-    configdb = swsssdk.ConfigDBConnector()
+    configdb = ConfigDBConnector()
     configdb.connect()
     queue_info = {}
     queue_info['FLEX_COUNTER_STATUS'] = 'disable'
@@ -58,7 +58,7 @@ def port():
 @click.argument('poll_interval', type=click.IntRange(100, 30000))
 def interval(poll_interval):
     """ Set queue counter query interval """
-    configdb = swsssdk.ConfigDBConnector()
+    configdb = ConfigDBConnector()
     configdb.connect()
     port_info = {}
     if poll_interval is not None:
@@ -68,7 +68,7 @@ def interval(poll_interval):
 @port.command()
 def enable():
     """ Enable port counter query """
-    configdb = swsssdk.ConfigDBConnector()
+    configdb = ConfigDBConnector()
     configdb.connect()
     port_info = {}
     port_info['FLEX_COUNTER_STATUS'] = 'enable'
@@ -77,7 +77,7 @@ def enable():
 @port.command()
 def disable():
     """ Disable port counter query """
-    configdb = swsssdk.ConfigDBConnector()
+    configdb = ConfigDBConnector()
     configdb.connect()
     port_info = {}
     port_info['FLEX_COUNTER_STATUS'] = 'disable'
@@ -98,7 +98,7 @@ def interval(poll_interval):
     This is a short term solution and
     should be changed once the performance is enhanced
     """
-    configdb = swsssdk.ConfigDBConnector()
+    configdb = ConfigDBConnector()
     configdb.connect()
     port_info = {}
     if poll_interval:
@@ -108,7 +108,7 @@ def interval(poll_interval):
 @port_buffer_drop.command()
 def enable():
     """ Enable port counter query """
-    configdb = swsssdk.ConfigDBConnector()
+    configdb = ConfigDBConnector()
     configdb.connect()
     port_info = {}
     port_info['FLEX_COUNTER_STATUS'] = ENABLE
@@ -117,7 +117,7 @@ def enable():
 @port_buffer_drop.command()
 def disable():
     """ Disable port counter query """
-    configdb = swsssdk.ConfigDBConnector()
+    configdb = ConfigDBConnector()
     configdb.connect()
     port_info = {}
     port_info['FLEX_COUNTER_STATUS'] = DISABLE
@@ -132,7 +132,7 @@ def rif():
 @click.argument('poll_interval')
 def interval(poll_interval):
     """ Set rif counter query interval """
-    configdb = swsssdk.ConfigDBConnector()
+    configdb = ConfigDBConnector()
     configdb.connect()
     rif_info = {}
     if poll_interval is not None:
@@ -142,7 +142,7 @@ def interval(poll_interval):
 @rif.command()
 def enable():
     """ Enable rif counter query """
-    configdb = swsssdk.ConfigDBConnector()
+    configdb = ConfigDBConnector()
     configdb.connect()
     rif_info = {}
     rif_info['FLEX_COUNTER_STATUS'] = 'enable'
@@ -151,7 +151,7 @@ def enable():
 @rif.command()
 def disable():
     """ Disable rif counter query """
-    configdb = swsssdk.ConfigDBConnector()
+    configdb = ConfigDBConnector()
     configdb.connect()
     rif_info = {}
     rif_info['FLEX_COUNTER_STATUS'] = 'disable'
@@ -166,7 +166,7 @@ def watermark():
 @click.argument('poll_interval', type=click.IntRange(1000, 30000))
 def interval(poll_interval):
     """ Set watermark counter query interval for both queue and PG watermarks """
-    configdb = swsssdk.ConfigDBConnector()
+    configdb = ConfigDBConnector()
     configdb.connect()
     queue_wm_info = {}
     pg_wm_info = {}
@@ -182,7 +182,7 @@ def interval(poll_interval):
 @watermark.command()
 def enable():
     """ Enable watermark counter query """
-    configdb = swsssdk.ConfigDBConnector()
+    configdb = ConfigDBConnector()
     configdb.connect()
     fc_info = {}
     fc_info['FLEX_COUNTER_STATUS'] = 'enable'
@@ -193,7 +193,7 @@ def enable():
 @watermark.command()
 def disable():
     """ Disable watermark counter query """
-    configdb = swsssdk.ConfigDBConnector()
+    configdb = ConfigDBConnector()
     configdb.connect()
     fc_info = {}
     fc_info['FLEX_COUNTER_STATUS'] = 'disable'
@@ -204,7 +204,7 @@ def disable():
 @cli.command()
 def show():
     """ Show the counter configuration """
-    configdb = swsssdk.ConfigDBConnector()
+    configdb = ConfigDBConnector()
     configdb.connect()
     queue_info = configdb.get_entry('FLEX_COUNTER_TABLE', 'QUEUE')
     port_info = configdb.get_entry('FLEX_COUNTER_TABLE', 'PORT')

crm/main.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 import click
-import swsssdk
+from swsscommon.swsscommon import ConfigDBConnector, SonicDBConfig
 from tabulate import tabulate
 from utilities_common import multi_asic as multi_asic_util
 from sonic_py_common import multi_asic
@@ -34,7 +34,7 @@ def show_summary(self):
             # Get the namespace list
             namespaces = multi_asic.get_namespace_list()
 
-            configdb = swsssdk.ConfigDBConnector(namespace=namespaces[0])
+            configdb = ConfigDBConnector(namespace=namespaces[0])
             configdb.connect()
 
         crm_info = configdb.get_entry('CRM', 'Config')
@@ -58,7 +58,7 @@ def show_thresholds(self, resource):
             # Get the namespace list
             namespaces = multi_asic.get_namespace_list()
 
-            configdb = swsssdk.ConfigDBConnector(namespace=namespaces[0])
+            configdb = ConfigDBConnector(namespace=namespaces[0])
             configdb.connect()
 
         crm_info = configdb.get_entry('CRM', 'Config')
@@ -218,7 +218,7 @@ def cli(ctx):
     ctx.obj = context
 
     # Load the global config file database_global.json once.
-    swsssdk.SonicDBConfig.load_sonic_global_db_config()
+    SonicDBConfig.load_sonic_global_db_config()
 
 @cli.group()
 @click.pass_context

pcieutil/main.py

@@ -13,7 +13,7 @@
 
     import click
     from sonic_py_common import device_info, logger
-    from swsssdk import SonicV2Connector
+    from swsscommon.swsscommon import SonicV2Connector
     from tabulate import tabulate
     import utilities_common.cli as clicommon
 except ImportError as e:

pfc/main.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 import click
-import swsssdk
+from swsscommon.swsscommon import ConfigDBConnector
 from tabulate import tabulate
 from natsort import natsorted
 
@@ -12,7 +12,7 @@ def configPfcAsym(interface, pfc_asym):
     """
     PFC handler to configure asymmentric PFC.
     """
-    configdb = swsssdk.ConfigDBConnector()
+    configdb = ConfigDBConnector()
     configdb.connect()
 
     configdb.mod_entry("PORT", interface, {'pfc_asym': pfc_asym})
@@ -24,7 +24,7 @@ def showPfcAsym(interface):
     """
     header = ('Interface', 'Asymmetric')
 
-    configdb = swsssdk.ConfigDBConnector()
+    configdb = ConfigDBConnector()
     configdb.connect()
 
     if interface:
@@ -50,7 +50,7 @@ def showPfcAsym(interface):
     click.echo()
 
 def configPfcPrio(status, interface, priority):
-    configdb = swsssdk.ConfigDBConnector()
+    configdb = ConfigDBConnector()
     configdb.connect()
 
     if interface not in configdb.get_keys('PORT_QOS_MAP'):
@@ -91,7 +91,7 @@ def showPfcPrio(interface):
     header = ('Interface', 'Lossless priorities')
     table = []
 
-    configdb = swsssdk.ConfigDBConnector()
+    configdb = ConfigDBConnector()
     configdb.connect()
 
     """Get all the interfaces with QoS map information"""

scripts/aclshow

@@ -20,7 +20,7 @@ optional arguments:
 import argparse
 import json
 import os
-import swsssdk
+from swsscommon.swsscommon import SonicV2Connector, ConfigDBConnector
 import sys
 
 from tabulate import tabulate
@@ -60,10 +60,10 @@ class AclStat(object):
             self.table_list = tables.split(",")
 
         # Set up db connections
-        self.db = swsssdk.SonicV2Connector(host="127.0.0.1")
+        self.db = SonicV2Connector(use_unix_socket_path=False)
         self.db.connect(self.db.COUNTERS_DB)
 
-        self.configdb = swsssdk.ConfigDBConnector()
+        self.configdb = ConfigDBConnector()
         self.configdb.connect()
 
     def previous_counters(self):