From 591a55354db926199c8dd923b3c2fa70f89a23f2 Mon Sep 17 00:00:00 2001 From: Ariz Zubair Date: Thu, 31 Jul 2025 21:29:26 +0000 Subject: [PATCH 1/6] Check lp mode before vdm handling. --- sonic-xcvrd/xcvrd/dom/dom_mgr.py | 2 +- sonic-xcvrd/xcvrd/xcvrd_utilities/utils.py | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/sonic-xcvrd/xcvrd/dom/dom_mgr.py b/sonic-xcvrd/xcvrd/dom/dom_mgr.py index 85a2781bd..272c273ef 100644 --- a/sonic-xcvrd/xcvrd/dom/dom_mgr.py +++ b/sonic-xcvrd/xcvrd/dom/dom_mgr.py @@ -297,7 +297,7 @@ def task_worker(self): self.log_warning("Got exception {} while processing transceiver status hw flags for " "port {}, ignored".format(repr(e), logical_port_name)) continue - if self.vdm_utils.is_transceiver_vdm_supported(physical_port): + if self.vdm_utils.is_transceiver_vdm_supported(physical_port) and self.xcvrd_utils.is_transceiver_lpmode_on(physical_port): # Freeze VDM stats before reading VDM values with self.vdm_utils.vdm_freeze_context(physical_port) as vdm_frozen: if not vdm_frozen: diff --git a/sonic-xcvrd/xcvrd/xcvrd_utilities/utils.py b/sonic-xcvrd/xcvrd/xcvrd_utilities/utils.py index a8b736554..4a17a7d79 100644 --- a/sonic-xcvrd/xcvrd/xcvrd_utilities/utils.py +++ b/sonic-xcvrd/xcvrd/xcvrd_utilities/utils.py @@ -23,3 +23,14 @@ def is_transceiver_flat_memory(self, physical_port): except (KeyError, NotImplementedError): self.logger.log_error(f"Failed to check flat memory for port {physical_port}") return True + + def is_transceiver_lpmode_on(self, physical_port): + try: + api = self.sfp_obj_dict[physical_port].get_xcvr_api() + if not api: + return False + return api.get_lpmode() + + except (KeyError, NotImplementedError): + self.logger.log_error(f"Failed to get low power mode for port {physical_port}") + return False From 3dee240ca0a55fd73a65f2c7349702c229f055a5 Mon Sep 17 00:00:00 2001 From: Ariz Zubair Date: Thu, 31 Jul 2025 22:12:58 +0000 Subject: [PATCH 2/6] Check lp mode before vdm handling. --- sonic-xcvrd/xcvrd/dom/dom_mgr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonic-xcvrd/xcvrd/dom/dom_mgr.py b/sonic-xcvrd/xcvrd/dom/dom_mgr.py index 272c273ef..73bf4596d 100644 --- a/sonic-xcvrd/xcvrd/dom/dom_mgr.py +++ b/sonic-xcvrd/xcvrd/dom/dom_mgr.py @@ -297,7 +297,7 @@ def task_worker(self): self.log_warning("Got exception {} while processing transceiver status hw flags for " "port {}, ignored".format(repr(e), logical_port_name)) continue - if self.vdm_utils.is_transceiver_vdm_supported(physical_port) and self.xcvrd_utils.is_transceiver_lpmode_on(physical_port): + if self.vdm_utils.is_transceiver_vdm_supported(physical_port) and (not self.xcvrd_utils.is_transceiver_lpmode_on(physical_port)): # Freeze VDM stats before reading VDM values with self.vdm_utils.vdm_freeze_context(physical_port) as vdm_frozen: if not vdm_frozen: From b5aca01793f07f8cc30a5c8b91ec22518175db93 Mon Sep 17 00:00:00 2001 From: Ariz Zubair Date: Thu, 31 Jul 2025 22:37:51 +0000 Subject: [PATCH 3/6] Add unit tests. --- sonic-xcvrd/tests/test_xcvrd.py | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/sonic-xcvrd/tests/test_xcvrd.py b/sonic-xcvrd/tests/test_xcvrd.py index a0a55da76..38827a36c 100644 --- a/sonic-xcvrd/tests/test_xcvrd.py +++ b/sonic-xcvrd/tests/test_xcvrd.py @@ -4436,6 +4436,34 @@ def test_is_transceiver_flat_memory(self): mock_api.is_flat_memory = MagicMock(side_effect=NotImplementedError) assert xcvrd_util.is_transceiver_flat_memory(1) + def test_is_transceiver_lpmode_on(self): + from xcvrd.xcvrd_utilities.utils import XCVRDUtils + mock_sfp = MagicMock() + xcvrd_util = XCVRDUtils({1: mock_sfp}, MagicMock()) + + # Test case where get_xcvr_api returns None + mock_sfp.get_xcvr_api = MagicMock(return_value=None) + assert not xcvrd_util.is_transceiver_lpmode_on(1) + + # Test case where get_lpmode returns True + mock_api = MagicMock() + mock_api.get_lpmode = MagicMock(return_value=True) + mock_sfp.get_xcvr_api = MagicMock(return_value=mock_api) + assert xcvrd_util.is_transceiver_lpmode_on(1) + + # Test case where get_lpmode returns False + mock_api.get_lpmode = MagicMock(return_value=False) + assert not xcvrd_util.is_transceiver_lpmode_on(1) + + # Test case where get_xcvr_api raises KeyError + xcvrd_util.sfp_obj_dict = {} + assert not xcvrd_util.is_transceiver_lpmode_on(1) + + # Test case where is_flat_memory raises NotImplementedError + xcvrd_util.sfp_obj_dict = {1: mock_sfp} + mock_api.get_lpmode = MagicMock(side_effect=NotImplementedError) + assert not xcvrd_util.is_transceiver_lpmode_on(1) + @patch('time.sleep', MagicMock()) @patch('xcvrd.xcvrd.XcvrTableHelper', MagicMock()) @patch('xcvrd.xcvrd._wrapper_soak_sfp_insert_event', MagicMock()) From e11e6873054a4f024fcd05c1ac5a8194179aa681 Mon Sep 17 00:00:00 2001 From: Ariz Zubair Date: Fri, 1 Aug 2025 19:08:08 +0000 Subject: [PATCH 4/6] Fix failing unit tests. --- sonic-xcvrd/tests/test_xcvrd.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sonic-xcvrd/tests/test_xcvrd.py b/sonic-xcvrd/tests/test_xcvrd.py index 38827a36c..74728e2ca 100644 --- a/sonic-xcvrd/tests/test_xcvrd.py +++ b/sonic-xcvrd/tests/test_xcvrd.py @@ -3414,6 +3414,7 @@ def test_DomInfoUpdateTask_task_worker(self, mock_post_pm_info, task.status_db_utils.post_port_transceiver_hw_status_to_db = MagicMock() task.status_db_utils.post_port_transceiver_hw_status_flags_to_db = MagicMock() task.vdm_utils.is_transceiver_vdm_supported = MagicMock(return_value=True) + task.xcvrd_utils.is_transceiver_lpmode_on = MagicMock(return_value=False) task.vdm_db_utils = MagicMock() task.vdm_db_utils.post_port_vdm_real_values_to_db = MagicMock() task.task_worker() @@ -3478,6 +3479,7 @@ def test_DomInfoUpdateTask_task_worker_vdm_failure(self, mock_post_pm_info): task.vdm_utils._unfreeze_vdm_stats_and_confirm = MagicMock(return_value=True) task.vdm_db_utils.post_port_vdm_real_values_to_db = MagicMock() task.vdm_db_utils.post_port_vdm_flags_to_db = MagicMock() + task.xcvrd_utils.is_transceiver_lpmode_on = MagicMock(return_value=False) task.task_worker() assert task.vdm_utils._unfreeze_vdm_stats_and_confirm.call_count == 1 assert task.vdm_db_utils.post_port_vdm_real_values_to_db.call_count == 0 From a5a590e825b494ffeea51cbaa3e1612fde8c0ad4 Mon Sep 17 00:00:00 2001 From: Ariz Zubair Date: Fri, 15 Aug 2025 17:31:49 +0000 Subject: [PATCH 5/6] Get platform independent method to get lpmode --- sonic-xcvrd/xcvrd/xcvrd_utilities/utils.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sonic-xcvrd/xcvrd/xcvrd_utilities/utils.py b/sonic-xcvrd/xcvrd/xcvrd_utilities/utils.py index 4a17a7d79..51231bf02 100644 --- a/sonic-xcvrd/xcvrd/xcvrd_utilities/utils.py +++ b/sonic-xcvrd/xcvrd/xcvrd_utilities/utils.py @@ -26,11 +26,7 @@ def is_transceiver_flat_memory(self, physical_port): def is_transceiver_lpmode_on(self, physical_port): try: - api = self.sfp_obj_dict[physical_port].get_xcvr_api() - if not api: - return False - return api.get_lpmode() - - except (KeyError, NotImplementedError): - self.logger.log_error(f"Failed to get low power mode for port {physical_port}") + return self.sfp_obj_dict[physical_port].get_lpmode() + except Exception as e: + self.logger.log_error(f"Failed to get low power mode for port {physical_port}. Exception: {e}") return False From 58e81cfc15261aa13cc5f08c9a19e55aa9f86710 Mon Sep 17 00:00:00 2001 From: Ariz Zubair Date: Fri, 15 Aug 2025 17:36:29 +0000 Subject: [PATCH 6/6] Update test. --- sonic-xcvrd/tests/test_xcvrd.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sonic-xcvrd/tests/test_xcvrd.py b/sonic-xcvrd/tests/test_xcvrd.py index 74728e2ca..bedc6365f 100644 --- a/sonic-xcvrd/tests/test_xcvrd.py +++ b/sonic-xcvrd/tests/test_xcvrd.py @@ -4444,17 +4444,16 @@ def test_is_transceiver_lpmode_on(self): xcvrd_util = XCVRDUtils({1: mock_sfp}, MagicMock()) # Test case where get_xcvr_api returns None - mock_sfp.get_xcvr_api = MagicMock(return_value=None) + mock_sfp.get_lpmode = MagicMock(return_value=None) assert not xcvrd_util.is_transceiver_lpmode_on(1) # Test case where get_lpmode returns True - mock_api = MagicMock() - mock_api.get_lpmode = MagicMock(return_value=True) - mock_sfp.get_xcvr_api = MagicMock(return_value=mock_api) + mock_sfp.get_lpmode = MagicMock(return_value=True) assert xcvrd_util.is_transceiver_lpmode_on(1) # Test case where get_lpmode returns False - mock_api.get_lpmode = MagicMock(return_value=False) + + mock_sfp.get_lpmode = MagicMock(return_value=False) assert not xcvrd_util.is_transceiver_lpmode_on(1) # Test case where get_xcvr_api raises KeyError @@ -4463,7 +4462,7 @@ def test_is_transceiver_lpmode_on(self): # Test case where is_flat_memory raises NotImplementedError xcvrd_util.sfp_obj_dict = {1: mock_sfp} - mock_api.get_lpmode = MagicMock(side_effect=NotImplementedError) + mock_sfp.get_lpmode = MagicMock(side_effect=NotImplementedError) assert not xcvrd_util.is_transceiver_lpmode_on(1) @patch('time.sleep', MagicMock())