Skip to content

Commit bf865c6

Browse files
authored
Remove redundant xcvr_table_helper init during CmisManagerTask init (#521)
Signed-off-by: Mihir Patel <patelmi@microsoft.com>
1 parent d6a4635 commit bf865c6

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

sonic-xcvrd/tests/test_xcvrd.py

+10
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@ def test_CmisManagerTask_get_xcvr_api_exception(self, mock_platform_chassis, moc
204204
task.get_host_tx_status = MagicMock(return_value='true')
205205
task.get_port_admin_status = MagicMock(return_value='up')
206206
task.get_cfg_port_tbl = MagicMock()
207+
task.xcvr_table_helper = XcvrTableHelper(DEFAULT_NAMESPACE)
207208
task.xcvr_table_helper.get_status_tbl.return_value = mock_get_status_tbl
208209
port_change_event = PortChangeEvent('Ethernet0', 1, 0, PortChangeEvent.PORT_SET,
209210
{'speed':'400000', 'lanes':'1,2,3,4,5,6,7,8'})
@@ -1460,6 +1461,7 @@ def test_CmisManagerTask_update_port_transceiver_status_table_sw_cmis_state(self
14601461
port_change_event = PortChangeEvent('Ethernet0', 1, 0, PortChangeEvent.PORT_SET)
14611462
task.on_port_update_event(port_change_event)
14621463

1464+
task.xcvr_table_helper = XcvrTableHelper(DEFAULT_NAMESPACE)
14631465
task.xcvr_table_helper.get_status_tbl = MagicMock(return_value=None)
14641466
task.update_port_transceiver_status_table_sw_cmis_state("Ethernet0", CMIS_STATE_INSERTED)
14651467

@@ -1505,6 +1507,7 @@ def test_CmisManagerTask_get_configured_freq(self, mock_table_helper):
15051507
cfg_port_tbl = MagicMock()
15061508
cfg_port_tbl.get = MagicMock(return_value=(True, (('laser_freq', 193100),)))
15071509
mock_table_helper.get_cfg_port_tbl = MagicMock(return_value=cfg_port_tbl)
1510+
task.xcvr_table_helper = XcvrTableHelper(DEFAULT_NAMESPACE)
15081511
task.xcvr_table_helper.get_cfg_port_tbl = mock_table_helper.get_cfg_port_tbl
15091512
assert task.get_configured_laser_freq_from_db('Ethernet0') == 193100
15101513

@@ -1516,6 +1519,7 @@ def test_CmisManagerTask_get_configured_tx_power_from_db(self, mock_table_helper
15161519
cfg_port_tbl = MagicMock()
15171520
cfg_port_tbl.get = MagicMock(return_value=(True, (('tx_power', -10),)))
15181521
mock_table_helper.get_cfg_port_tbl = MagicMock(return_value=cfg_port_tbl)
1522+
task.xcvr_table_helper = XcvrTableHelper(DEFAULT_NAMESPACE)
15191523
task.xcvr_table_helper.get_cfg_port_tbl = mock_table_helper.get_cfg_port_tbl
15201524
assert task.get_configured_tx_power_from_db('Ethernet0') == -10
15211525

@@ -1690,6 +1694,7 @@ def test_CmisManagerTask_post_port_active_apsel_to_db_error_cases(self, mock_fie
16901694
host_lanes_mask = 0xff
16911695

16921696
# Case: table does not exist
1697+
task.xcvr_table_helper = XcvrTableHelper(DEFAULT_NAMESPACE)
16931698
task.xcvr_table_helper.get_intf_tbl = MagicMock(return_value=None)
16941699
task.post_port_active_apsel_to_db(mock_xcvr_api, lport, host_lanes_mask)
16951700
assert mock_field_value_pairs.call_count == 0
@@ -1747,6 +1752,7 @@ def test_CmisManagerTask_post_port_active_apsel_to_db(self):
17471752
port_mapping = PortMapping()
17481753
stop_event = threading.Event()
17491754
task = CmisManagerTask(DEFAULT_NAMESPACE, port_mapping, stop_event)
1755+
task.xcvr_table_helper = XcvrTableHelper(DEFAULT_NAMESPACE)
17501756
task.xcvr_table_helper.get_intf_tbl = MagicMock(return_value=int_tbl)
17511757

17521758
# case: partial lanes update
@@ -1893,6 +1899,7 @@ def test_CmisManagerTask_task_worker(self, mock_chassis, mock_get_status_tbl):
18931899
stop_event = threading.Event()
18941900
task = CmisManagerTask(DEFAULT_NAMESPACE, port_mapping, stop_event)
18951901
task.port_mapping.logical_port_list = ['Ethernet0']
1902+
task.xcvr_table_helper = XcvrTableHelper(DEFAULT_NAMESPACE)
18961903
task.xcvr_table_helper.get_status_tbl.return_value = mock_get_status_tbl
18971904
task.task_stopping_event.is_set = MagicMock(side_effect=[False, False, True])
18981905
task.task_worker()
@@ -1959,6 +1966,7 @@ def test_CmisManagerTask_task_worker(self, mock_chassis, mock_get_status_tbl):
19591966
stop_event = threading.Event()
19601967
task = CmisManagerTask(DEFAULT_NAMESPACE, port_mapping, stop_event)
19611968
task.port_mapping.logical_port_list = ['Ethernet1']
1969+
task.xcvr_table_helper = XcvrTableHelper(DEFAULT_NAMESPACE)
19621970
task.xcvr_table_helper.get_status_tbl.return_value = mock_get_status_tbl
19631971
task.task_stopping_event.is_set = MagicMock(side_effect=[False, False, True])
19641972
task.task_worker()
@@ -2095,6 +2103,7 @@ def test_CmisManagerTask_task_worker_fastboot(self, mock_chassis, mock_get_statu
20952103
stop_event = threading.Event()
20962104
task = CmisManagerTask(DEFAULT_NAMESPACE, port_mapping, stop_event)
20972105
task.port_mapping.logical_port_list = ['Ethernet0']
2106+
task.xcvr_table_helper = XcvrTableHelper(DEFAULT_NAMESPACE)
20982107
task.xcvr_table_helper.get_status_tbl.return_value = mock_get_status_tbl
20992108
task.task_stopping_event.is_set = MagicMock(side_effect=[False, False, True])
21002109
task.task_worker()
@@ -2230,6 +2239,7 @@ def test_CmisManagerTask_task_worker_host_tx_ready_false(self, mock_chassis, moc
22302239
stop_event = threading.Event()
22312240
task = CmisManagerTask(DEFAULT_NAMESPACE, port_mapping, stop_event)
22322241
task.port_mapping.logical_port_list = ['Ethernet0']
2242+
task.xcvr_table_helper = XcvrTableHelper(DEFAULT_NAMESPACE)
22332243
task.xcvr_table_helper.get_status_tbl.return_value = mock_get_status_tbl
22342244
task.task_stopping_event.is_set = MagicMock(side_effect=[False, False, True])
22352245
task.task_worker()

sonic-xcvrd/xcvrd/xcvrd.py

-1
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,6 @@ def __init__(self, namespaces, port_mapping, main_thread_stop_event, skip_cmis_m
821821
self.main_thread_stop_event = main_thread_stop_event
822822
self.port_dict = {}
823823
self.port_mapping = copy.deepcopy(port_mapping)
824-
self.xcvr_table_helper = XcvrTableHelper(namespaces)
825824
self.isPortInitDone = False
826825
self.isPortConfigDone = False
827826
self.skip_cmis_mgr = skip_cmis_mgr

0 commit comments

Comments
 (0)