Lazy load CDB FW handler

Author: Junchao-Mellanox

sonic_platform_base/sonic_xcvr/api/public/c_cmis.py

@@ -55,8 +55,8 @@
 })
 
 class CCmisApi(CmisApi):
-    def __init__(self, xcvr_eeprom, init_cdb=False):
-        super(CCmisApi, self).__init__(xcvr_eeprom, init_cdb)
+    def __init__(self, xcvr_eeprom, init_cdb_fw_handler=False):
+        super(CCmisApi, self).__init__(xcvr_eeprom, init_cdb_fw_handler)
 
     def _get_vdm_key_to_db_prefix_map(self):
         combined_map = {**CMIS_VDM_KEY_TO_DB_PREFIX_KEY_MAP, **C_CMIS_DELTA_VDM_KEY_TO_DB_PREFIX_KEY_MAP}

sonic_platform_base/sonic_xcvr/api/public/cmis.py

@@ -138,14 +138,25 @@ def set_cache_enabled(cls, enabled: bool):
         """
         cls.cache_enabled = bool(enabled)
 
-    def __init__(self, xcvr_eeprom, init_cdb=False):
+    def __init__(self, xcvr_eeprom, init_cdb_fw_handler=False):
         super(CmisApi, self).__init__(xcvr_eeprom)
         self.vdm = CmisVdmApi(xcvr_eeprom) if not self.is_flat_memory() else None
         self.cdb = CmisCdbApi(xcvr_eeprom) if self.is_cdb_supported() else None
-        self.cdb_fw_hdlr = self._create_cdb_fw_handler() if init_cdb else None
+        self._init_cdb_fw_handler = init_cdb_fw_handler
+        self._cdb_fw_hdlr = None
+
+    @property
+    def cdb_fw_hdlr(self):
+        if not self._init_cdb_fw_handler:
+            return None
+        
+        if self._cdb_fw_hdlr is None:
+            self._cdb_fw_hdlr = self._create_cdb_fw_handler()
+        return self._cdb_fw_hdlr
 
     def _create_cdb_fw_handler(self):
         if not self.is_cdb_supported():
+            self._init_cdb_fw_handler = False
             return None
         cdb_mem_map = CdbMemMap(CdbCodes)
         return CdbFw(self.xcvr_eeprom.reader, self.xcvr_eeprom.writer, cdb_mem_map)

sonic_platform_base/sonic_xcvr/xcvr_api_factory.py

@@ -87,10 +87,10 @@ def _create_cmis_api(self):
             api = self._create_api(CmisCodes, CmisMemMap, CmisFr800gApi)
         else:
             xcvr_eeprom = XcvrEeprom(self.reader, self.writer, CmisMemMap(CmisCodes))
-            api = CmisApi(xcvr_eeprom, init_cdb=True)
+            api = CmisApi(xcvr_eeprom, init_cdb_fw_handler=True)
             if api.is_coherent_module():
                 xcvr_eeprom = XcvrEeprom(self.reader, self.writer, CCmisMemMap(CmisCodes))
-                api = CCmisApi(xcvr_eeprom, init_cdb=True)
+                api = CCmisApi(xcvr_eeprom, init_cdb_fw_handler=True)
         return api
 
     def _create_qsfp_api(self):

tests/sonic_xcvr/test_ccmis.py

@@ -14,7 +14,7 @@ class TestCCmis(object):
     writer = MagicMock()
     eeprom = XcvrEeprom(reader, writer, mem_map)
 
-    api = CCmisApi(eeprom, init_cdb=False)
+    api = CCmisApi(eeprom, init_cdb_fw_handler=False)
 
     @pytest.mark.parametrize("mock_response, expected", [
         (8, 150),

tests/sonic_xcvr/test_sfp_optoe_base.py

@@ -19,8 +19,8 @@ class TestSfpOptoeBase(object):
     writer = MagicMock() 
     eeprom = XcvrEeprom(reader, writer, mem_map) 
     sfp_optoe_api = SfpOptoeBase() 
-    ccmis_api = CCmisApi(eeprom, init_cdb=False) 
-    cmis_api = CmisApi(eeprom, init_cdb=False) 
+    ccmis_api = CCmisApi(eeprom, init_cdb_fw_handler=False) 
+    cmis_api = CmisApi(eeprom, init_cdb_fw_handler=False) 
     sff8472_api = Sff8472Api(eeprom)
 
     def test_is_transceiver_vdm_supported_non_cmis(self):