From 748c40422dff1f60b43ca237bb067772e1dcb10d Mon Sep 17 00:00:00 2001 From: Dong Zhang <41927498+dzhangalibaba@users.noreply.github.com> Date: Wed, 28 Oct 2020 09:29:10 -0700 Subject: [PATCH] [MultiDB] add new API to get instance name from db name (#90) * [MultiDB] add new API to get instance name from db name * [MultiDB] reuse get_instancename in get_instance --- src/swsssdk/dbconnector.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/swsssdk/dbconnector.py b/src/swsssdk/dbconnector.py index d946061eeebb..6ad1a57a4452 100644 --- a/src/swsssdk/dbconnector.py +++ b/src/swsssdk/dbconnector.py @@ -170,13 +170,19 @@ def get_ns_list(): @staticmethod def get_instance(db_name, namespace=None): + namespace = SonicDBConfig.EMPTY_NAMESPACE(namespace) + inst_name = SonicDBConfig.get_instancename(db_name, namespace) + return SonicDBConfig._sonic_db_config[namespace]["INSTANCES"][inst_name] + + @staticmethod + def get_instancename(db_name, namespace=None): namespace = SonicDBConfig.EMPTY_NAMESPACE(namespace) if not SonicDBConfig._sonic_db_config_init: SonicDBConfig.load_sonic_db_config() SonicDBConfig.db_name_validation(db_name, namespace) inst_name = SonicDBConfig._sonic_db_config[namespace]["DATABASES"][db_name]["instance"] SonicDBConfig.inst_name_validation(inst_name, namespace) - return SonicDBConfig._sonic_db_config[namespace]["INSTANCES"][inst_name] + return inst_name @staticmethod def get_instancelist(namespace=None):