matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MultiDB] daemon base should use multiDB DBConnector (#4549)

Browse Source 
* [MultiDB] daemon base should use multiDB DBConnector
* [sonic-platform-daemon] update submodule for multiDB changes
This commit is contained in:
Dong Zhang 2020-06-08 13:36:56 -07:00 committed by GitHub
parent d491c02294
commit 7525fea666
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/sonic-daemon-base/sonic_daemon_base/daemon_base.py
View File

@ -14,11 +14,6 @@ except ImportError, e:
# Constants ==================================================================== # Constants ====================================================================
# #
# Redis DB information
REDIS_HOSTNAME = 'localhost'
REDIS_PORT = 6379
REDIS_TIMEOUT_MSECS = 0
# Platform root directory inside docker # Platform root directory inside docker
PLATFORM_ROOT_DOCKER = '/usr/share/sonic/platform' PLATFORM_ROOT_DOCKER = '/usr/share/sonic/platform'
SONIC_CFGGEN_PATH = '/usr/local/bin/sonic-cfggen' SONIC_CFGGEN_PATH = '/usr/local/bin/sonic-cfggen'
@ -36,12 +31,11 @@ EEPROM_CLASS_NAME = 'board'
# Helper functions ============================================================= # Helper functions =============================================================
# #
def db_connect(db): def db_connect(db_name):
from swsscommon import swsscommon from swsscommon import swsscommon
return swsscommon.DBConnector(db, return swsscommon.DBConnector(db_name,
REDIS_HOSTNAME, REDIS_TIMEOUT_MSECS,
REDIS_PORT, True)
REDIS_TIMEOUT_MSECS)
# #
# Helper classes =============================================================== # Helper classes ===============================================================

2
src/sonic-platform-daemons

@ -1 +1 @@
Subproject commit 6e975f5f61111d399f5f5b44177bba8b4be8162c Subproject commit 0f4fd835f324cb754a8b955f9a5fad6b54d7d6dc