From 8ece4e007234959ee25b671ea0d450ef472c699a Mon Sep 17 00:00:00 2001
From: Abhishek Dosi <abdosi@microsoft.com>
Date: Fri, 14 Aug 2020 17:51:48 -0700
Subject: [PATCH] Two fixes: a) we should use get_platform() with new
 sonic_py-common package b) In 201911 DB Connector is still using db id based
 constructor as following PR
 https://github.com/Azure/sonic-buildimage/pull/4549 is not cherry-picked yet.
 So revert the change to use db is insatead of db_name for now.

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
---
 src/sonic-py-common/sonic_py_common/daemon_base.py | 11 +++++++++--
 src/sonic-py-common/sonic_py_common/device_info.py |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/sonic-py-common/sonic_py_common/daemon_base.py b/src/sonic-py-common/sonic_py_common/daemon_base.py
index 6a2c6a22d2a..b873ca375ea 100644
--- a/src/sonic-py-common/sonic_py_common/daemon_base.py
+++ b/src/sonic-py-common/sonic_py_common/daemon_base.py
@@ -8,8 +8,12 @@
 #
 # Constants ====================================================================
 #
+# Redis DB information
+REDIS_HOSTNAME = 'localhost'
+REDIS_PORT = 6379
 REDIS_TIMEOUT_MSECS = 0
 
+
 EEPROM_MODULE_NAME = 'eeprom'
 EEPROM_CLASS_NAME = 'board'
 
@@ -17,9 +21,12 @@
 # Helper functions =============================================================
 #
 
-def db_connect(db_name):
+def db_connect(db):
     from swsscommon import swsscommon
-    return swsscommon.DBConnector(db_name, REDIS_TIMEOUT_MSECS, True)
+    return swsscommon.DBConnector(db,
+                                  REDIS_HOSTNAME,
+                                  REDIS_PORT,
+                                  REDIS_TIMEOUT_MSECS)
 
 #
 # DaemonBase ===================================================================
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 56ae1755fe8..60fbabe56f1 100644
--- a/src/sonic-py-common/sonic_py_common/device_info.py
+++ b/src/sonic-py-common/sonic_py_common/device_info.py
@@ -248,7 +248,7 @@ def get_npu_id_from_name(npu_name):
 
 
 def get_npu_device_id(npu_id):
-    platform = get_platform_info(get_machine_info())
+    platform = get_platform()
     if not platform:
         return None