Skip to content

Commit

Permalink
Replace pyswsssdk with sonic-py-common (sonic-net#45)
Browse files Browse the repository at this point in the history
**- What I did**
Replace sonic-py-swsssdk with sonic-py-common.

**- How I did it**
Update all sonic-py-swsssdk to use sonic-py-common.

**- How to verify it**
Pass all UT.
Pass all E2E test.

**- Description for the changelog**
Replace sonic-py-swsssdk with sonic-py-common.
  • Loading branch information
liuh-80 authored Jul 28, 2022
1 parent 265c833 commit 0d67faf
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
1 change: 1 addition & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ steps:
- script: |
set -xe
sudo pip3 install swsssdk-2.0.1-py3-none-any.whl
sudo pip3 install sonic_py_common-1.0-py3-none-any.whl
workingDirectory: $(Pipeline.Workspace)/target/python-wheels/buster/
displayName: 'Install Python dependencies'

Expand Down
5 changes: 2 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
from setuptools import setup, find_packages

dependencies = [
'swsssdk>=1.3.0',
]

test_deps = [
'pytest',
'mock>=2.0.0',
'mockredispy>=2.9.3'
'mockredispy>=2.9.3',
'swsssdk>=1.3.0'
]

high_performance_deps = [
'swsssdk[high_perf]>=1.1',
]

setup(
Expand Down
6 changes: 2 additions & 4 deletions src/lldp_syncd/__main__.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import logging.handlers
import sys

import swsssdk.util
import sonic_py_common.util

import lldp_syncd
import sonic_syncd

LOG_FORMAT = "lldp-syncd [%(name)s] %(levelname)s: %(message)s"

# import command line arguments
args = swsssdk.util.process_options("lldp_syncd")
args = sonic_py_common.util.process_options("lldp_syncd")

# configure logging. If debug is specified, logs to stdout at designated level. syslog otherwise.
log_level = args.get('log_level')
Expand All @@ -23,12 +23,10 @@
lldp_syncd.logger.addHandler(logging.StreamHandler(sys.stdout))

# set the log levels
swsssdk.logger.setLevel(log_level)
sonic_syncd.logger.setLevel(log_level)
lldp_syncd.logger.setLevel(log_level)

# inherit logging handlers in submodules
swsssdk.logger.handlers = lldp_syncd.logger.handlers
sonic_syncd.logger.handlers = lldp_syncd.logger.handlers

#
Expand Down

0 comments on commit 0d67faf

Please sign in to comment.