Skip to content

Commit 514f432

Browse files
Fix sfputil CLI failure for multi-asic platforms (#3168) (#3181)
Fix sfputil CLI failure for multi-asic platforms
1 parent 1c5c134 commit 514f432

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

sfputil/main.py

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
from utilities_common.sfp_helper import covert_application_advertisement_to_output_string
2424
from utilities_common.sfp_helper import QSFP_DATA_MAP
2525
from tabulate import tabulate
26+
from utilities_common.general import load_db_config
2627

2728
VERSION = '3.0'
2829

@@ -548,6 +549,7 @@ def load_sfputilhelper():
548549

549550

550551
def load_port_config():
552+
load_db_config()
551553
try:
552554
if multi_asic.is_multi_asic():
553555
# For multi ASIC platforms we pass DIR of port_config_file_path and the number of asics

tests/sfputil_test.py

+11-1
Original file line numberDiff line numberDiff line change
@@ -999,4 +999,14 @@ def test_target_firmware(self, mock_chassis):
999999
assert result.output == 'Target Mode set failed!\n'
10001000
assert result.exit_code == EXIT_FAIL
10011001

1002-
1002+
@patch('sfputil.main.multi_asic.is_multi_asic')
1003+
@patch('sfputil.main.platform_sfputil', MagicMock())
1004+
@patch('sfputil.main.device_info.get_paths_to_platform_and_hwsku_dirs',
1005+
MagicMock(return_value=(None, None)))
1006+
@patch('sfputil.main.device_info.get_path_to_port_config_file', MagicMock(return_value=('')))
1007+
def test_load_port_config(self, mock_is_multi_asic):
1008+
mock_is_multi_asic.return_value = True
1009+
assert sfputil.load_port_config() == True
1010+
1011+
mock_is_multi_asic.return_value = False
1012+
assert sfputil.load_port_config() == True

0 commit comments

Comments
 (0)