diff --git a/scripts/port2alias b/scripts/port2alias index 5a4ff8dd79..c993890699 100755 --- a/scripts/port2alias +++ b/scripts/port2alias @@ -7,6 +7,7 @@ from io import StringIO from portconfig import get_port_config from sonic_py_common import device_info from sonic_py_common import multi_asic +from utilities_common.general import load_db_config # mock the redis for unit test purposes # try: @@ -50,6 +51,7 @@ def translate_line(line, ports): def main(): (platform, hwsku) = device_info.get_platform_and_hwsku() ports = {} + load_db_config() for ns in multi_asic.get_namespace_list(): (ports_ns, _, _) = get_port_config(hwsku=hwsku, platform=platform, asic_name=ns) ports.update(ports_ns) diff --git a/sfputil/main.py b/sfputil/main.py index 42630de7e3..514bc3a4af 100644 --- a/sfputil/main.py +++ b/sfputil/main.py @@ -23,6 +23,7 @@ from utilities_common.sfp_helper import covert_application_advertisement_to_output_string from utilities_common.sfp_helper import QSFP_DATA_MAP from tabulate import tabulate +from utilities_common.general import load_db_config VERSION = '3.0' @@ -548,6 +549,7 @@ def load_sfputilhelper(): def load_port_config(): + load_db_config() try: if multi_asic.is_multi_asic(): # For multi ASIC platforms we pass DIR of port_config_file_path and the number of asics diff --git a/tests/sfputil_test.py b/tests/sfputil_test.py index 6224cef51b..5bd14180d6 100644 --- a/tests/sfputil_test.py +++ b/tests/sfputil_test.py @@ -839,3 +839,15 @@ def test_update_firmware_info_to_state_db(self, mock_chassis): mock_sfp.get_transceiver_info_firmware_versions.return_value = ['a.b.c', 'd.e.f'] sfputil.update_firmware_info_to_state_db("Ethernet0") + + @patch('sfputil.main.multi_asic.is_multi_asic') + @patch('sfputil.main.platform_sfputil', MagicMock()) + @patch('sfputil.main.device_info.get_paths_to_platform_and_hwsku_dirs', + MagicMock(return_value=(None, None))) + @patch('sfputil.main.device_info.get_path_to_port_config_file', MagicMock(return_value=(''))) + def test_load_port_config(self, mock_is_multi_asic): + mock_is_multi_asic.return_value = True + assert sfputil.load_port_config() == True + + mock_is_multi_asic.return_value = False + assert sfputil.load_port_config() == True \ No newline at end of file