Skip to content

Commit

Permalink
Revert "[portconfig]: Remove try block for db config initialization (#…
Browse files Browse the repository at this point in the history
…10581)" (#10756)

This reverts commit 5cd6bc4.
  • Loading branch information
SuvarnaMeenakshi authored May 6, 2022
1 parent 7104664 commit 66c96ea
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
7 changes: 6 additions & 1 deletion src/sonic-config-engine/portconfig.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,12 @@ def db_connect_configdb(namespace=None):
"""
Connect to configdb
"""
config_db = swsscommon.ConfigDBConnector(use_unix_socket_path=True, namespace=namespace)
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)
except Exception as e:
return None
if config_db is None:
return None
try:
Expand Down
8 changes: 1 addition & 7 deletions src/sonic-config-engine/sonic-cfggen
Original file line number Diff line number Diff line change
Expand Up @@ -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 portconfig import get_port_config, get_breakout_mode
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 swsscommon.swsscommon import SonicV2Connector, ConfigDBConnector, SonicDBConfig, ConfigDBPipeConnector

Expand Down Expand Up @@ -296,12 +296,6 @@ def main():
'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:
hardware_data = {'DEVICE_METADATA': {'localhost': {
'hwsku': hwsku
Expand Down

0 comments on commit 66c96ea

Please sign in to comment.