Merge branch 'master' into xsight-platform-dev

Author: prgeor

sonic_platform_base/sonic_sfp/sfputilhelper.py

@@ -90,7 +90,7 @@ def read_porttab_mappings(self, porttabfile, asic_inst=0):
             self.logical_to_asic[intf_name] = asic_inst
 
         self.logical.extend(logical)
-        self.logical = list(set(self.logical))
+        self.logical = list(OrderedDict.fromkeys(self.logical).keys())
         self.logical_to_physical.update(logical_to_physical)
         self.physical_to_logical.update(physical_to_logical)
 

sonic_platform_base/sonic_xcvr/api/public/cmis.py

@@ -43,6 +43,18 @@ def get_model(self):
         '''
         return self.xcvr_eeprom.read(consts.VENDOR_PART_NO_FIELD)
 
+    def get_cable_length_type(self):
+        '''
+        This function returns the cable type of the module
+        '''
+        return "Length Cable Assembly(m)"
+
+    def get_cable_length(self):
+        '''
+        This function returns the cable length of the module
+        '''
+        return self.xcvr_eeprom.read(consts.LENGTH_ASSEMBLY_FIELD)
+
     def get_vendor_rev(self):
         '''
         This function returns the revision level for part number provided by vendor
@@ -146,7 +158,6 @@ def get_transceiver_info(self):
             "encoding": "N/A", # Not supported
             "ext_identifier": "%s (%sW Max)" % (power_class, max_power),
             "ext_rateselect_compliance": "N/A", # Not supported
-            "cable_type": "Length Cable Assembly(m)",
             "cable_length": float(admin_info[consts.LENGTH_ASSEMBLY_FIELD]),
             "nominal_bit_rate": 0, # Not supported
             "vendor_date": admin_info[consts.VENDOR_DATE_FIELD],
@@ -160,6 +171,7 @@ def get_transceiver_info(self):
         xcvr_info['media_lane_count'] = self.get_media_lane_count()
         xcvr_info['host_lane_assignment_option'] = self.get_host_lane_assignment_option()
         xcvr_info['media_lane_assignment_option'] = self.get_media_lane_assignment_option()
+        xcvr_info['cable_type'] = self.get_cable_length_type()
         apsel_dict = self.get_active_apsel_hostlane()
         for lane in range(1, self.NUM_CHANNELS+1):
             xcvr_info["%s%d" % ("active_apsel_hostlane", lane)] = \

sonic_platform_base/sonic_xcvr/codes/public/sff8636.py

@@ -60,6 +60,7 @@ class Sff8636Codes(Sff8024):
         32: "10GBASE-LR",
         64: "10GBASE-LRM",
         128: "Extended",
+        136: "40GBASE-CR4,Extended"
     }
 
     SONET_COMPLIANCE = {

sonic_platform_base/sonic_xcvr/mem_maps/public/sff8636.py

@@ -50,9 +50,7 @@ def __init__(self, codes):
             ),
             CodeRegField(consts.CONNECTOR_FIELD, self.get_addr(0, 130), self.codes.CONNECTORS),
             RegGroupField(consts.SPEC_COMPLIANCE_FIELD, 
-                CodeRegField(consts.ETHERNET_10_40G_COMPLIANCE_FIELD, self.get_addr(0, 131), self.codes.ETHERNET_10_40G_COMPLIANCE,
-                    *(RegBitField("%s_%d" % (consts.ETHERNET_10_40G_COMPLIANCE_FIELD, bit), bit) for bit in range(0, 7))
-                ),
+                CodeRegField(consts.ETHERNET_10_40G_COMPLIANCE_FIELD, self.get_addr(0, 131), self.codes.ETHERNET_10_40G_COMPLIANCE),
                 CodeRegField(consts.SONET_COMPLIANCE_FIELD, self.get_addr(0, 132), self.codes.SONET_COMPLIANCE),
                 CodeRegField(consts.SAS_SATA_COMPLIANCE_FIELD, self.get_addr(0, 133), self.codes.SAS_SATA_COMPLIANCE),
                 CodeRegField(consts.GIGABIT_ETHERNET_COMPLIANCE_FIELD, self.get_addr(0, 134), self.codes.GIGABIT_ETHERNET_COMPLIANCE),

sonic_platform_base/sonic_xcvr/sfp_optoe_base.py

@@ -230,6 +230,15 @@ def set_optoe_write_max(self, write_max):
         except (OSError, IOError):
             pass
 
+    def set_optoe_write_timeout(self, write_timeout):
+        sys_path = self.get_eeprom_path()
+        sys_path = sys_path.replace("eeprom", "write_timeout")
+        try:
+            with open(sys_path, mode='w') as f:
+                f.write(str(write_timeout))
+        except (OSError, IOError):
+            pass
+
     def read_eeprom(self, offset, num_bytes):
         try:
             with open(self.get_eeprom_path(), mode='rb', buffering=0) as f:

sonic_platform_base/sonic_xcvr/xcvr_api_factory.py

@@ -34,6 +34,8 @@
 VENDOR_NAME_LENGTH = 16
 VENDOR_PART_NUM_LENGTH = 16
 
+CREDO_800G_AEC_VENDOR_PN_LIST = ["CAC81X321M2MC1MS", "CAC815321M2MC1MS", "CAC82X321M2MC1MS"]
+
 class XcvrApiFactory(object):
     def __init__(self, reader, writer):
         self.reader = reader
@@ -72,7 +74,7 @@ def create_xcvr_api(self):
         if id == 0x18 or id == 0x19 or id == 0x1e:
             vendor_name = self._get_vendor_name()
             vendor_pn = self._get_vendor_part_num()
-            if vendor_name == 'Credo' and vendor_pn == 'CAC81X321M2MC1MS':
+            if vendor_name == 'Credo' and vendor_pn in CREDO_800G_AEC_VENDOR_PN_LIST:
                 codes = CmisAec800gCodes
                 mem_map = CmisAec800gMemMap(CmisAec800gCodes)
                 xcvr_eeprom = XcvrEeprom(self.reader, self.writer, mem_map)

sonic_y_cable/credo/y_cable_credo.py

@@ -3254,7 +3254,10 @@ def debug_dump_registers(self, option=None):
             if api_ver >= 0x18:
                 result['queue_info'] = self.queue_info()
 
-            lanes = [0,1,2,3,12,13,14,15,20,21,22,23]
+            if '1MS' in result['pn']:
+                lanes = [0,1,12,13,16,17]
+            else:
+                lanes = [0,1,2,3,12,13,14,15,20,21,22,23]
 
             for ln in list(lanes):
                 data = self.get_serdes_params(ln)

tests/sfputilhelper_test.py

@@ -78,10 +78,11 @@ def test_read_port_mappings(self):
         sfputil_helper.read_porttab_mappings(self.port_config_file, 0)
 
         logical_port_list = sfputil_helper.logical
+
         assert len(logical_port_list) == len(PORT_LIST)
 
-        for logical_port_name in logical_port_list:
-            assert logical_port_name in PORT_LIST
+        for logical_port, port in zip(logical_port_list, PORT_LIST):
+            assert logical_port == port
 
 
     @mock.patch('portconfig.get_hwsku_file_name', mock.MagicMock(return_value=hwsku_json_file))
@@ -90,28 +91,30 @@ def test_read_all_port_mappings(self):
         sfputil_helper = sfputilhelper.SfpUtilHelper()
         sfputil_helper.logical = []
         sfputil_helper.logical_to_physical = {}
-        sfputil_helper.physical_to_logica = {}
+        sfputil_helper.physical_to_logical = {}
         sfputil_helper.read_all_porttab_mappings(self.platform_dir, 2)
         logical_port_list = sfputil_helper.logical
 
         assert len(logical_port_list) == len(PORT_LIST)
-        for logical_port_name in logical_port_list:
-            assert logical_port_name in PORT_LIST
+
+        for logical_port, port in zip(logical_port_list, PORT_LIST):
+            assert logical_port == port
+
         assert sfputil_helper.logical_to_physical == LOGICAL_TO_PHYSICAL
         assert sfputil_helper.physical_to_logical == PHYSICAL_TO_LOGICAL
 
         # test platform.json case
 
         sfputil_helper.logical = []
         sfputil_helper.logical_to_physical = {}
-        sfputil_helper.physical_to_logica = {}
+        sfputil_helper.physical_to_logical = {}
         sfputil_helper.read_all_porttab_mappings(self.platform_json_dir, 2)
         logical_port_list = sfputil_helper.logical
 
         assert len(logical_port_list) == len(PORT_LIST)
 
-        for logical_port_name in logical_port_list:
-            assert logical_port_name in PORT_LIST
+        for logical_port, port in zip(logical_port_list, PORT_LIST):
+            assert logical_port == port
 
         assert sfputil_helper.logical_to_physical == LOGICAL_TO_PHYSICAL
         assert sfputil_helper.physical_to_logical == PHYSICAL_TO_LOGICAL

tests/sonic_xcvr/test_cmis.py

@@ -32,6 +32,19 @@ def test_get_model(self, mock_response, expected):
         result = self.api.get_model()
         assert result == expected
 
+    def test_get_cable_length_type(self):
+        assert self.api.get_cable_length_type() == "Length Cable Assembly(m)"
+
+    @pytest.mark.parametrize("mock_response, expected", [
+        ("0.0", "0.0"),
+        ("1.2", "1.2")
+    ])
+    def test_get_cable_length(self, mock_response, expected):
+        self.api.xcvr_eeprom.read = MagicMock()
+        self.api.xcvr_eeprom.read.return_value = mock_response
+        result = self.api.get_cable_length()
+        assert result == expected
+
     @pytest.mark.parametrize("mock_response, expected", [
         ("0.0", "0.0"),
         ("1.2", "1.2")

tests/sonic_xcvr/test_sfp_optoe_base.py

@@ -1,3 +1,4 @@
+from unittest.mock import mock_open
 from mock import MagicMock 
 from mock import patch 
 import pytest 
@@ -79,3 +80,36 @@ def test_get_vdm_unfreeze_status(self, mock_response1, mock_response2, expected)
         result = self.sfp_optoe_api.get_vdm_unfreeze_status()
         assert result == expected
 
+    @patch("builtins.open", new_callable=mock_open)
+    @patch.object(SfpOptoeBase, 'get_eeprom_path')
+    def test_set_optoe_write_timeout_success(self, mock_get_eeprom_path, mock_open):
+        mock_get_eeprom_path.return_value = "/sys/bus/i2c/devices/1-0050/eeprom"
+        expected_path = "/sys/bus/i2c/devices/1-0050/write_timeout"
+        expected_timeout = 1
+
+        self.sfp_optoe_api.set_optoe_write_timeout(expected_timeout)
+
+        mock_open.assert_called_once_with(expected_path, mode='w')
+        mock_open().write.assert_called_once_with(str(expected_timeout))
+
+    @patch("builtins.open", new_callable=mock_open)
+    @patch.object(SfpOptoeBase, 'get_eeprom_path')
+    def test_set_optoe_write_timeout_ioerror(self, mock_get_eeprom_path, mock_open):
+        mock_get_eeprom_path.return_value = "/sys/bus/i2c/devices/1-0050/eeprom"
+        expected_timeout = 1
+        mock_open.side_effect = IOError
+
+        self.sfp_optoe_api.set_optoe_write_timeout(expected_timeout)
+
+        mock_open.assert_called()
+
+    @patch("builtins.open", new_callable=mock_open)
+    @patch.object(SfpOptoeBase, 'get_eeprom_path')
+    def test_set_optoe_write_timeout_oserror(self, mock_get_eeprom_path, mock_open):
+        mock_get_eeprom_path.return_value = "/sys/bus/i2c/devices/1-0050/eeprom"
+        expected_timeout = 1
+        mock_open.side_effect = OSError
+
+        self.sfp_optoe_api.set_optoe_write_timeout(expected_timeout)
+
+        mock_open.assert_called()