Replace swsssdk's SonicV2Connector with swsscommon's implementation

src/lldp_syncd/daemon.py

@@ -6,7 +6,7 @@
 from collections import defaultdict
 
 from enum import unique, Enum
-from swsssdk import SonicV2Connector
+from swsscommon.swsscommon import SonicV2Connector
 
 from sonic_syncd import SonicSyncDaemon
 from . import logger

tests/mock_tables/dbconnector.py

@@ -4,9 +4,12 @@
 import sys
 
 import mockredis
-import swsssdk.interface
-from swsssdk.interface import redis
+import redis
 from swsssdk import SonicV2Connector
+from swsssdk import SonicDBConfig
+from swsssdk.interface import DBInterface
+from swsscommon import swsscommon
+
 
 if sys.version_info >= (3, 0):
     long = int
@@ -79,8 +82,8 @@ def _encode(self, value):
         value = super(SwssSyncClient, self)._encode(value)
 
         if self.decode_responses:
-           return value.decode('utf-8')
-    
+            return value.decode('utf-8')
+
     # Patch mockredis/mockredis/client.py
     # The official implementation will filter out keys with a slash '/'
     # ref: https://github.com/locationlabs/mockredis/blob/master/mockredis/client.py
@@ -105,7 +108,8 @@ def keys(self, pattern='*'):
         return [key for key in self.redis.keys() if regex.match(key)]
 
 
-swsssdk.interface.DBInterface._subscribe_keyspace_notification = _subscribe_keyspace_notification
+DBInterface._subscribe_keyspace_notification = _subscribe_keyspace_notification
 mockredis.MockRedis.config_set = config_set
 redis.StrictRedis = SwssSyncClient
 SonicV2Connector.connect = connect_SonicV2Connector
+swsscommon.SonicV2Connector = SonicV2Connector

tests/test_lldpSyncDaemon.py

@@ -14,7 +14,7 @@
 import lldp_syncd
 import lldp_syncd.conventions
 import lldp_syncd.daemon
-from swsssdk import SonicV2Connector, ConfigDBConnector
+from swsssdk import SonicV2Connector
 
 INPUT_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'subproc_outputs')