resolve comments, add more functions in sfp_optoe_base for use in xcvrd and sonic-utilities repo

Author: qinchuanares

sonic_platform_base/sonic_xcvr/api/public/cmis.py

@@ -224,7 +224,7 @@ def get_transceiver_threshold_info(self):
         if thresh is None:
             return None
         tx_bias_scale_raw = self.xcvr_eeprom.read(consts.TX_BIAS_SCALE)
-        tx_bias_scale = 2**tx_bias_scale_raw
+        tx_bias_scale = 2**tx_bias_scale_raw if tx_bias_scale_raw < 3 else 1
         threshold_info_dict =  {
             "temphighalarm": float("{:.3f}".format(thresh[consts.TEMP_HIGH_ALARM_FIELD])),
             "templowalarm": float("{:.3f}".format(thresh[consts.TEMP_LOW_ALARM_FIELD])),
@@ -587,9 +587,6 @@ def set_power_override(self, power_override, power_set):
     def get_transceiver_thresholds_support(self):
         return not self.is_flat_memory()
 
-    def get_transceiver_loopback_support(self):
-        return not self.is_flat_memory()
-
     def get_lpmode_support(self):
         power_class = self.xcvr_eeprom.read(consts.POWER_CLASS_FIELD)
         if power_class is None:
@@ -879,6 +876,9 @@ def set_loopback_mode(self, loopback_mode):
         The function will look at 13h:128 to check advertized loopback capabilities.
         Return True if the provision succeeds, False if it fails
         '''
+        loopback_support = not self.is_flat_memory()
+        if loopback_support is None:
+            return None
         loopback_capability = self.get_loopback_capability()
         if loopback_capability is None:
             return None
@@ -1658,13 +1658,20 @@ def get_transceiver_loopback(self):
         host_input_loopback_lane8   = BOOLEAN                          ; host side input loopback enable lane8
         ========================================================================
         """
-        loopback_support = self.get_transceiver_loopback_support()
+        loopback_support = not self.is_flat_memory()
         if loopback_support is None:
             return None
         loopback_capability = self.get_loopback_capability()
         if loopback_capability is None:
             return None        
         trans_loopback = dict()
+        trans_loopback['simultaneous_host_media_loopback_supported'] = loopback_capability['simultaneous_host_media_loopback_supported']
+        trans_loopback['per_lane_media_loopback_supported'] = loopback_capability['per_lane_media_loopback_supported']
+        trans_loopback['per_lane_host_loopback_supported'] = loopback_capability['per_lane_host_loopback_supported']
+        trans_loopback['host_side_input_loopback_supported'] = loopback_capability['host_side_input_loopback_supported']
+        trans_loopback['host_side_output_loopback_supported'] = loopback_capability['host_side_output_loopback_supported']
+        trans_loopback['media_side_input_loopback_supported'] = loopback_capability['media_side_input_loopback_supported']
+        trans_loopback['media_side_output_loopback_supported'] = loopback_capability['media_side_output_loopback_supported']
         if loopback_capability['media_side_output_loopback_supported']:
             trans_loopback['media_output_loopback'] = self.get_media_output_loopback()
         else:

sonic_platform_base/sonic_xcvr/sfp_optoe_base.py

@@ -31,6 +31,50 @@ def get_transceiver_threshold_info(self):
         api = self.get_xcvr_api()
         return api.get_transceiver_threshold_info() if api is not None else None
 
+    def get_transceiver_status(self):
+        api = self.get_xcvr_api()
+        return api.get_transceiver_status() if api is not None else None
+
+    def get_transceiver_loopback(self):
+        api = self.get_xcvr_api()
+        return api.get_transceiver_loopback() if api is not None else None
+
+    def is_coherent_module(self):
+        api = self.get_xcvr_api()
+        return api.is_coherent_module() if api is not None else None
+
+    def get_transceiver_pm(self):
+        api = self.get_xcvr_api()
+        return api.get_transceiver_pm() if api is not None else None
+    
+    def get_module_fw_upgrade_feature(self):
+        api = self.get_xcvr_api()
+        return api.get_module_fw_upgrade_feature() if api is not None else None
+
+    def get_module_fw_info(self):
+        api = self.get_xcvr_api()
+        return api.get_module_fw_info() if api is not None else None
+
+    def module_fw_run(self):
+        api = self.get_xcvr_api()
+        return api.module_fw_run() if api is not None else None
+
+    def module_fw_commit(self):
+        api = self.get_xcvr_api()
+        return api.module_fw_commit() if api is not None else None
+
+    def module_fw_download(self):
+        api = self.get_xcvr_api()
+        return api.module_fw_download() if api is not None else None
+
+    def module_fw_upgrade(self):
+        api = self.get_xcvr_api()
+        return api.module_fw_upgrade() if api is not None else None
+
+    def module_fw_switch(self):
+        api = self.get_xcvr_api()
+        return api.module_fw_switch() if api is not None else None
+
     def get_rx_los(self):
         api = self.get_xcvr_api()
         if api is not None:

tests/sonic_xcvr/test_cmis.py

@@ -532,15 +532,6 @@ def test_get_transceiver_thresholds_support(self, mock_response, expected):
         result = self.api.get_transceiver_thresholds_support()
         assert result == expected
 
-    @pytest.mark.parametrize("mock_response, expected", [
-        (False, True)
-    ])
-    def test_get_transceiver_loopback_support(self, mock_response, expected):
-        self.api.is_flat_memory = MagicMock()
-        self.api.is_flat_memory.return_value = mock_response
-        result = self.api.get_transceiver_loopback_support()
-        assert result == expected
-
     @pytest.mark.parametrize("mock_response, expected", [
         (None, False),
         ('Power Class 1', False),
@@ -1669,6 +1660,13 @@ def test_get_transceiver_status(self, mock_response, expected):
                 [False, False, False, False, False, False, False, False]
             ],
             {
+                'simultaneous_host_media_loopback_supported': True,
+                'per_lane_media_loopback_supported': True,
+                'per_lane_host_loopback_supported': True,
+                'host_side_input_loopback_supported': True,
+                'host_side_output_loopback_supported': True,
+                'media_side_input_loopback_supported': True,
+                'media_side_output_loopback_supported': True,
                 'media_output_loopback': False,
                 'media_input_loopback': False,
                 'host_output_loopback_lane1': False,
@@ -1711,6 +1709,13 @@ def test_get_transceiver_status(self, mock_response, expected):
                 [False, False, False, False, False, False, False, False]
             ],
             {
+                'simultaneous_host_media_loopback_supported': False,
+                'per_lane_media_loopback_supported': False,
+                'per_lane_host_loopback_supported': False,
+                'host_side_input_loopback_supported': False,
+                'host_side_output_loopback_supported': False,
+                'media_side_input_loopback_supported': False,
+                'media_side_output_loopback_supported': False,
                 'media_output_loopback': 'N/A',
                 'media_input_loopback': 'N/A',
                 'host_output_loopback_lane1': 'N/A',
@@ -1733,8 +1738,8 @@ def test_get_transceiver_status(self, mock_response, expected):
         )
     ])
     def test_get_transceiver_loopback(self, mock_response, expected):
-        self.api.get_transceiver_loopback_support = MagicMock()
-        self.api.get_transceiver_loopback_support.return_value = mock_response[0]
+        self.api.is_flat_memory = MagicMock()
+        self.api.is_flat_memory.return_value = mock_response[0]
         self.api.get_loopback_capability = MagicMock()
         self.api.get_loopback_capability.return_value = mock_response[1]
         self.api.get_media_output_loopback = MagicMock()