Merge pull request #26 from az-pz/ariz/catch-xcvrd-exception-when-eeprom-read-is-unsuccessful-202405

(202405) Catch the xcvrd exception returned by get_transceiver_info

Author: yejianquan

sonic-xcvrd/tests/test_xcvrd.py

@@ -3101,6 +3101,9 @@ def test_wrapper_get_transceiver_info(self, mock_sfputil, mock_chassis):
         mock_sfputil.get_transceiver_info_dict = MagicMock(return_value=False)
         assert not _wrapper_get_transceiver_info(1)
 
+        mock_chassis.get_sfp = MagicMock(side_effect=Exception)
+        assert not _wrapper_get_transceiver_info(1)
+
     @patch('xcvrd.xcvrd.platform_chassis')
     @patch('xcvrd.xcvrd.platform_sfputil')
     def test_wrapper_get_transceiver_firmware_info(self, mock_sfputil, mock_chassis):

sonic-xcvrd/xcvrd/xcvrd.py

@@ -268,6 +268,10 @@ def _wrapper_get_transceiver_info(physical_port):
             return platform_chassis.get_sfp(physical_port).get_transceiver_info()
         except NotImplementedError:
             pass
+        except Exception as e:
+            helper_logger.log_error("Failed to get transceiver info for physical port {}. Exception: {}".format(physical_port, e))
+            log_exception_traceback()
+            return None
     return platform_sfputil.get_transceiver_info_dict(physical_port)
 
 def _wrapper_get_transceiver_firmware_info(physical_port):