Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SFP-Refactor: bug fixes #248

Merged
merged 4 commits into from
Dec 2, 2021
Merged

SFP-Refactor: bug fixes #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cc4ddfa
SFP-Refactor: bug fix
aravindmani-1 Nov 30, 2021
a595be7
update UT
aravindmani-1 Nov 30, 2021
e1adedf
Address comments
aravindmani-1 Nov 30, 2021
82992c0
Address comments
aravindmani-1 Nov 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions sonic_platform_base/sonic_xcvr/api/public/cmis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ def get_transceiver_info(self):
"ext_identifier": "%s (%sW Max)" % (power_class, max_power),
"ext_rateselect_compliance": "N/A", # Not supported
"cable_type": "Length Cable Assembly(m)",
"cable_length": admin_info[consts.LENGTH_ASSEMBLY_FIELD],
"cable_length": float(admin_info[consts.LENGTH_ASSEMBLY_FIELD]),
"nominal_bit_rate": 0, # Not supported
"specification_compliance": admin_info[consts.MEDIA_TYPE_FIELD],
"vendor_date": admin_info[consts.VENDOR_DATE_FIELD],
Expand Down Expand Up @@ -610,8 +610,6 @@ def get_module_media_type(self):
'''
This function returns module media type: MMF, SMF, Passive Copper Cable, Active Cable Assembly or Base-T.
'''
if self.is_flat_memory():
return 'N/A'
return self.xcvr_eeprom.read(consts.MEDIA_TYPE_FIELD)

def get_host_electrical_interface(self):
Expand All @@ -624,19 +622,16 @@ def get_module_media_interface(self):
'''
This function returns module media electrical interface. Table 4-6 ~ 4-10 in SFF-8024 Rev4.6
'''
if self.is_flat_memory():
return 'N/A'

media_type = self.get_module_media_type()
if media_type == 'Multimode Fiber (MMF)':
if media_type == 'nm_850_media_interface':
return self.xcvr_eeprom.read(consts.MODULE_MEDIA_INTERFACE_850NM)
elif media_type == 'Single Mode Fiber (SMF)':
elif media_type == 'sm_media_interface':
return self.xcvr_eeprom.read(consts.MODULE_MEDIA_INTERFACE_SM)
elif media_type == 'Passive Copper Cable':
elif media_type == 'passive_copper_media_interface':
return self.xcvr_eeprom.read(consts.MODULE_MEDIA_INTERFACE_PASSIVE_COPPER)
elif media_type == 'Active Cable Assembly':
elif media_type == 'active_cable_media_interface':
return self.xcvr_eeprom.read(consts.MODULE_MEDIA_INTERFACE_ACTIVE_CABLE)
elif media_type == 'BASE-T':
elif media_type == 'base_t_media_interface':
return self.xcvr_eeprom.read(consts.MODULE_MEDIA_INTERFACE_BASE_T)
else:
return 'Unknown media interface'
Expand Down
9 changes: 0 additions & 9 deletions sonic_platform_base/sonic_xcvr/codes/public/cmis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,6 @@ class CmisCodes(Sff8024):
7: "Power Class 8"
}

MEDIA_TYPES = {
0: "Undefined",
1: "nm_850_media_interface",
2: "sm_media_interface",
3: "passive_copper_media_interface",
4: "active_cable_media_interface",
5: "base_t_media_interface",
}

MEDIA_INTERFACE_TECH = {
0: '850 nm VCSEL',
1: '1310 nm VCSEL',
Expand Down
11 changes: 5 additions & 6 deletions sonic_platform_base/sonic_xcvr/codes/public/sff8024.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,14 +174,13 @@ class Sff8024(XcvrCodes):
129: 'Capable of 128GFC'
}


MODULE_MEDIA_TYPE = {
0: 'Undefined',
1: 'Multimode Fiber (MMF)',
2: 'Single Mode Fiber (SMF)',
3: 'Passive Copper Cable',
4: 'Active Cable Assembly',
5: 'BASE-T'
1: 'nm_850_media_interface',
2: 'sm_media_interface',
3: 'passive_copper_media_interface',
4: 'active_cable_media_interface',
5: 'base_t_media_interface'
}

HOST_ELECTRICAL_INTERFACE = {
Expand Down
18 changes: 9 additions & 9 deletions tests/sonic_xcvr/test_cmis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ def test_get_power_override_support(self, ):
assert result == False

@pytest.mark.parametrize("mock_response, expected", [
("Single Mode Fiber (SMF)", "Single Mode Fiber (SMF)")
("sm_media_interface", "sm_media_interface")
])
def test_get_module_media_type(self, mock_response, expected):
self.api.xcvr_eeprom.read = MagicMock()
Expand All @@ -516,11 +516,11 @@ def test_get_host_electrical_interface(self, mock_response, expected):
assert result == expected

@pytest.mark.parametrize("mock_response1, mock_response2, expected", [
("Single Mode Fiber (SMF)", "400ZR", "400ZR"),
("Multimode Fiber (MMF)", "100GE BiDi", "100GE BiDi"),
("Passive Copper Cable", "Copper cable", "Copper cable"),
("Active Cable Assembly", "Active Loopback module", "Active Loopback module"),
("BASE-T", "1000BASE-T (Clause 40)", "1000BASE-T (Clause 40)"),
("sm_media_interface", "400ZR", "400ZR"),
("nm_850_media_interface", "100GE BiDi", "100GE BiDi"),
("passive_copper_media_interface", "Copper cable", "Copper cable"),
("active_cable_media_interface", "Active Loopback module", "Active Loopback module"),
("base_t_media_interface", "1000BASE-T (Clause 40)", "1000BASE-T (Clause 40)"),
("ABCD", "ABCD", "Unknown media interface")
])
def test_get_module_media_interface(self, mock_response1, mock_response2, expected):
Expand Down Expand Up @@ -951,7 +951,7 @@ def test_module_fw_upgrade(self, input_param, mock_response, expected):
'VendorPN': 'ABCD',
'Connector': 'LC',
'Length Cable Assembly': 0.0,
'ModuleMediaType': 'Single Mode Fiber (SMF)',
'ModuleMediaType': 'sm_media_interface',
'VendorDate': '21010100',
'VendorOUI': 'xx-xx-xx'
},
Expand All @@ -965,7 +965,7 @@ def test_module_fw_upgrade(self, input_param, mock_response, expected):
'5.0',
'0.1',
'0.0',
'Single Mode Fiber (SMF)'
'sm_media_interface'
],
{ 'type': 'QSFP-DD Double Density 8X Pluggable Transceiver',
'type_abbrv_name': 'QSFP-DD',
Expand All @@ -976,7 +976,7 @@ def test_module_fw_upgrade(self, input_param, mock_response, expected):
'cable_type': 'Length Cable Assembly(m)',
'cable_length': 0.0,
'nominal_bit_rate': 0,
'specification_compliance': 'Single Mode Fiber (SMF)',
'specification_compliance': 'sm_media_interface',
'application_advertisement': 'N/A',
'active_firmware': '0.1',
'media_lane_count': 1,
Expand Down