This reverts commit 5cd6bc4ce2
.
This commit is contained in:
parent
7104664c05
commit
66c96eaf4c
@ -72,7 +72,12 @@ def db_connect_configdb(namespace=None):
|
|||||||
"""
|
"""
|
||||||
Connect to configdb
|
Connect to configdb
|
||||||
"""
|
"""
|
||||||
|
try:
|
||||||
|
if namespace is not None:
|
||||||
|
swsscommon.SonicDBConfig.load_sonic_global_db_config(namespace=namespace)
|
||||||
config_db = swsscommon.ConfigDBConnector(use_unix_socket_path=True, namespace=namespace)
|
config_db = swsscommon.ConfigDBConnector(use_unix_socket_path=True, namespace=namespace)
|
||||||
|
except Exception as e:
|
||||||
|
return None
|
||||||
if config_db is None:
|
if config_db is None:
|
||||||
return None
|
return None
|
||||||
try:
|
try:
|
||||||
|
@ -32,7 +32,7 @@ from functools import partial
|
|||||||
from minigraph import minigraph_encoder, parse_xml, parse_device_desc_xml, parse_asic_sub_role, parse_asic_switch_type
|
from minigraph import minigraph_encoder, parse_xml, parse_device_desc_xml, parse_asic_sub_role, parse_asic_switch_type
|
||||||
from portconfig import get_port_config, get_breakout_mode
|
from portconfig import get_port_config, get_breakout_mode
|
||||||
from redis_bcc import RedisBytecodeCache
|
from redis_bcc import RedisBytecodeCache
|
||||||
from sonic_py_common.multi_asic import get_asic_id_from_name, get_asic_device_id, is_multi_asic
|
from sonic_py_common.multi_asic import get_asic_id_from_name, get_asic_device_id
|
||||||
from sonic_py_common import device_info
|
from sonic_py_common import device_info
|
||||||
from swsscommon.swsscommon import SonicV2Connector, ConfigDBConnector, SonicDBConfig, ConfigDBPipeConnector
|
from swsscommon.swsscommon import SonicV2Connector, ConfigDBConnector, SonicDBConfig, ConfigDBPipeConnector
|
||||||
|
|
||||||
@ -296,12 +296,6 @@ def main():
|
|||||||
'localhost': {'namespace_id': namespace_id}
|
'localhost': {'namespace_id': namespace_id}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
# load db config
|
|
||||||
if not SonicDBConfig.isInit():
|
|
||||||
if is_multi_asic():
|
|
||||||
SonicDBConfig.load_sonic_global_db_config(namespace=asic_name)
|
|
||||||
else:
|
|
||||||
SonicDBConfig.load_sonic_db_config()
|
|
||||||
if hwsku is not None:
|
if hwsku is not None:
|
||||||
hardware_data = {'DEVICE_METADATA': {'localhost': {
|
hardware_data = {'DEVICE_METADATA': {'localhost': {
|
||||||
'hwsku': hwsku
|
'hwsku': hwsku
|
||||||
|
Loading…
Reference in New Issue
Block a user