Skip to content

Commit 76cf1dc

Browse files
authored
Fix for #19116 [xcvrd] typo "log_notifce" results in port oper down (sonic-net#493)
* Update xcvrd.py * Update test_xcvrd.py
1 parent f41ecca commit 76cf1dc

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

sonic-xcvrd/tests/test_xcvrd.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1945,11 +1945,12 @@ def test_CmisManagerTask_task_worker(self, mock_chassis, mock_get_status_tbl):
19451945
task.configure_tx_output_power = MagicMock(return_value=1)
19461946
task.configure_laser_frequency = MagicMock(return_value=1)
19471947

1948+
# Shouldn't proceed to DP_DEINIT on error
19481949
task.is_appl_reconfigure_required = MagicMock(return_value=True)
19491950
mock_xcvr_api.decommission_all_datapaths = MagicMock(return_value=False)
19501951
task.task_stopping_event.is_set = MagicMock(side_effect=[False, False, True])
19511952
task.task_worker()
1952-
assert get_cmis_state_from_state_db('Ethernet1', task.xcvr_table_helper.get_status_tbl(task.port_mapping.get_asic_id_for_logical_port('Ethernet1'))) == CMIS_STATE_FAILED
1953+
assert not get_cmis_state_from_state_db('Ethernet1', task.xcvr_table_helper.get_status_tbl(task.port_mapping.get_asic_id_for_logical_port('Ethernet1'))) == CMIS_STATE_DP_DEINIT
19531954

19541955
@pytest.mark.parametrize("lport, expected_dom_polling", [
19551956
('Ethernet0', 'disabled'),

sonic-xcvrd/xcvrd/xcvrd.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1479,7 +1479,7 @@ def task_worker(self):
14791479
if True == self.is_appl_reconfigure_required(api, appl):
14801480
self.log_notice("{}: Decommissioning all lanes/datapaths to default AppSel=0".format(lport))
14811481
if True != api.decommission_all_datapaths():
1482-
self.log_notifce("{}: Failed to default to AppSel=0".format(lport))
1482+
self.log_notice("{}: Failed to default to AppSel=0".format(lport))
14831483
self.force_cmis_reinit(lport, retries + 1)
14841484
continue
14851485

0 commit comments

Comments
 (0)