Skip to content

Commit 6b94ec3

Browse files
authored
Replace swsssdk.SonicV2Connector with swsscommon.SonicV2Connector (SWIG wrapper of C++ implementation) in production code (sonic-net#162)
This is the following step for merging sonic-py-swsssdk into sonic-swss-common sonic-net/sonic-swss-common#387 Note: Test code could still using old python implementation
1 parent 57e54d9 commit 6b94ec3

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

src/sonic_ax_impl/mibs/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import re
33
import os
44

5-
from swsssdk import SonicV2Connector
5+
from swsscommon.swsscommon import SonicV2Connector
66
from swsssdk import SonicDBConfig
77
from swsssdk import port_util
88
from swsssdk.port_util import get_index_from_str

tests/mock_tables/dbconnector.py

+11-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@
44
import sys
55

66
import mockredis
7-
from swsssdk.interface import redis, DBInterface
7+
import redis
8+
import swsssdk
89
from swsssdk import SonicV2Connector
910
from swsssdk import SonicDBConfig
11+
from swsssdk.interface import DBInterface
12+
from swsscommon import swsscommon
1013

1114

1215
if sys.version_info >= (3, 0):
@@ -91,7 +94,7 @@ def __init__(self, *args, **kwargs):
9194
# to identify the file path to load the db json files.
9295
namespace = kwargs.pop('namespace')
9396
db_name = kwargs.pop('db_name')
94-
self.decode_responses = kwargs.pop('decode_responses') == True
97+
self.decode_responses = kwargs.pop('decode_responses', False) == True
9598
fname = db_name.lower() + ".json"
9699
self.pubsub = MockPubSub()
97100

@@ -143,3 +146,9 @@ def keys(self, pattern='*'):
143146
mockredis.MockRedis.config_set = config_set
144147
redis.StrictRedis = SwssSyncClient
145148
SonicV2Connector.connect = connect_SonicV2Connector
149+
swsscommon.SonicV2Connector = SonicV2Connector
150+
151+
# pytest case collecting will import some module before monkey patch, so reload
152+
from importlib import reload
153+
import sonic_ax_impl.mibs
154+
reload(sonic_ax_impl.mibs)

0 commit comments

Comments
 (0)