Skip to content

Replace swsssdk.SonicV2Connector with swsscommon.SonicV2Connector (SWIG wrapper of C++ implementation) in production code #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
qiluo-msft merged 7 commits into from
Nov 6, 2020
Merged

Replace swsssdk.SonicV2Connector with swsscommon.SonicV2Connector (SWIG wrapper of C++ implementation) in production code #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d7f003c
Copy DBInterface implementation from sonic-py-swsssdk repo
qiluo-msft Oct 4, 2020
c08971b
Use repo-local SonicV2Connector in mock tests
qiluo-msft Oct 4, 2020
5851fb3
Replace SonicV2Connector of swsssdk with the one of swsscommon in
qiluo-msft Oct 5, 2020
448de07
Revert "Copy DBInterface implementation from sonic-py-swsssdk repo"
qiluo-msft Oct 5, 2020
0a882e5
Import the vanilla redis module
qiluo-msft Oct 5, 2020
4468bdb
Remove dup import statement
qiluo-msft Oct 24, 2020
ca85cf8
Remove extra statement
qiluo-msft Nov 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/sonic_ax_impl/mibs/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import re
import os

from swsssdk import SonicV2Connector
from swsscommon.swsscommon import SonicV2Connector
from swsssdk import SonicDBConfig
from swsssdk import port_util
from swsssdk.port_util import get_index_from_str
Expand Down
13 changes: 11 additions & 2 deletions tests/mock_tables/dbconnector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@
import sys

import mockredis
from swsssdk.interface import redis, DBInterface
import redis
import swsssdk
from swsssdk import SonicV2Connector
from swsssdk import SonicDBConfig
from swsssdk.interface import DBInterface
from swsscommon import swsscommon


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

Expand Down Expand Up @@ -143,3 +146,9 @@ def keys(self, pattern='*'):
mockredis.MockRedis.config_set = config_set
redis.StrictRedis = SwssSyncClient
SonicV2Connector.connect = connect_SonicV2Connector
swsscommon.SonicV2Connector = SonicV2Connector

# pytest case collecting will import some module before monkey patch, so reload
from importlib import reload
import sonic_ax_impl.mibs
reload(sonic_ax_impl.mibs)