From 51759595a31c01083a278459f8759a4b4bead674 Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Wed, 19 May 2021 23:37:56 +0000
Subject: [PATCH 1/4] Replace swsssdk.ConfigDBConnector and SonicDBConfig with
 swsscommon implementation

---
 src/sonic-py-common/setup.py                       | 10 +---------
 src/sonic-py-common/sonic_py_common/device_info.py |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/sonic-py-common/setup.py b/src/sonic-py-common/setup.py
index bed64fe7fd22..38be7a95a0f8 100644
--- a/src/sonic-py-common/setup.py
+++ b/src/sonic-py-common/setup.py
@@ -2,12 +2,7 @@
 
 dependencies = [
     'natsort==6.2.1', # 6.2.1 is the last version which supports Python 2
-    'pyyaml',
-    'swsssdk>=2.0.1',
-]
-
-high_performance_deps = [
-    'swsssdk[high_perf]>=2.0.1',
+    'pyyaml'
 ]
 
 setup(
@@ -21,9 +16,6 @@
     maintainer='Joe LeVeque',
     maintainer_email='jolevequ@microsoft.com',
     install_requires=dependencies,
-    extras_require={
-        'high_perf': high_performance_deps,
-    },
     packages=[
         'sonic_py_common',
     ],
diff --git a/src/sonic-py-common/sonic_py_common/device_info.py b/src/sonic-py-common/sonic_py_common/device_info.py
index 4d1df6352284..ba3c0f41b272 100644
--- a/src/sonic-py-common/sonic_py_common/device_info.py
+++ b/src/sonic-py-common/sonic_py_common/device_info.py
@@ -8,7 +8,7 @@
 from natsort import natsorted
 
 # TODO: Replace with swsscommon
-from swsssdk import ConfigDBConnector, SonicDBConfig, SonicV2Connector
+from swsscommon.swsscommon import ConfigDBConnector, SonicDBConfig, SonicV2Connector
 
 USR_SHARE_SONIC_PATH = "/usr/share/sonic"
 HOST_DEVICE_PATH = USR_SHARE_SONIC_PATH + "/device"

From ec8033f794395a26f1c3649af6a4e87e923eed9d Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Thu, 20 May 2021 00:13:24 +0000
Subject: [PATCH 2/4] Add dependency in mk file

---
 rules/sonic-py-common.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rules/sonic-py-common.mk b/rules/sonic-py-common.mk
index 6afe9a826c68..9ee6bcad6b8f 100644
--- a/rules/sonic-py-common.mk
+++ b/rules/sonic-py-common.mk
@@ -3,6 +3,8 @@
 SONIC_PY_COMMON_PY2 = sonic_py_common-1.0-py2-none-any.whl
 $(SONIC_PY_COMMON_PY2)_SRC_PATH = $(SRC_PATH)/sonic-py-common
 $(SONIC_PY_COMMON_PY2)_DEPENDS += $(SWSSSDK_PY2)
+$(SONIC_PY_COMMON_PY2)_DEBS_DEPENDS = $(LIBSWSSCOMMON) \
+                                      $(PYTHON2_SWSSCOMMON)
 $(SONIC_PY_COMMON_PY2)_PYTHON_VERSION = 2
 SONIC_PYTHON_WHEELS += $(SONIC_PY_COMMON_PY2)
 
@@ -11,6 +13,8 @@ SONIC_PYTHON_WHEELS += $(SONIC_PY_COMMON_PY2)
 SONIC_PY_COMMON_PY3 = sonic_py_common-1.0-py3-none-any.whl
 $(SONIC_PY_COMMON_PY3)_SRC_PATH = $(SRC_PATH)/sonic-py-common
 $(SONIC_PY_COMMON_PY3)_DEPENDS += $(SWSSSDK_PY3)
+$(SONIC_PY_COMMON_PY3)_DEBS_DEPENDS = $(LIBSWSSCOMMON) \
+                                      $(PYTHON3_SWSSCOMMON)
 # Synthetic dependency to avoid building the Python 2 and 3 packages
 # simultaneously and any potential conflicts which may arise
 $(SONIC_PY_COMMON_PY3)_DEPENDS += $(SONIC_PY_COMMON_PY2)

From e7622667ff452f94dc39d6d7ea1898b4d73ed2a8 Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Thu, 20 May 2021 04:36:57 +0000
Subject: [PATCH 3/4] Fix py2 dependency macro name

---
 rules/sonic-py-common.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/sonic-py-common.mk b/rules/sonic-py-common.mk
index 9ee6bcad6b8f..297794a7deba 100644
--- a/rules/sonic-py-common.mk
+++ b/rules/sonic-py-common.mk
@@ -4,7 +4,7 @@ SONIC_PY_COMMON_PY2 = sonic_py_common-1.0-py2-none-any.whl
 $(SONIC_PY_COMMON_PY2)_SRC_PATH = $(SRC_PATH)/sonic-py-common
 $(SONIC_PY_COMMON_PY2)_DEPENDS += $(SWSSSDK_PY2)
 $(SONIC_PY_COMMON_PY2)_DEBS_DEPENDS = $(LIBSWSSCOMMON) \
-                                      $(PYTHON2_SWSSCOMMON)
+                                      $(PYTHON_SWSSCOMMON)
 $(SONIC_PY_COMMON_PY2)_PYTHON_VERSION = 2
 SONIC_PYTHON_WHEELS += $(SONIC_PY_COMMON_PY2)
 

From e643c4c5d2ea61a49e3176fed33969962986b98f Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Mon, 7 Jun 2021 05:56:57 +0000
Subject: [PATCH 4/4] system-health does not depend on swsssdk in runtime

---
 src/system-health/setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/system-health/setup.py b/src/system-health/setup.py
index b0cc998e482f..99b4c5187970 100644
--- a/src/system-health/setup.py
+++ b/src/system-health/setup.py
@@ -27,6 +27,7 @@
         'pytest-runner'
     ],
     tests_require=[
+        'swsssdk>=2.0.1',
         'pytest',
         'mock>=2.0.0'
     ],