Skip to content

[sfp-refactor] Fix is_xcvr_optical for QSFP28/CMIS #4749

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

Merged
prgeor merged 2 commits into from
Feb 2, 2022
Merged

[sfp-refactor] Fix is_xcvr_optical for QSFP28/CMIS #4749

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97965ec
Fix is_xcvr_optical for QSFP28
andywongarista Nov 18, 2021
bea1e53
Fix is_xcvr_optical for CMIS
andywongarista Nov 26, 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
13 changes: 9 additions & 4 deletions tests/platform_tests/api/test_sfp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@
def setup(request, duthosts, enum_rand_one_per_hwsku_hostname, xcvr_skip_list, conn_graph_facts):
sfp_setup = {}
duthost = duthosts[enum_rand_one_per_hwsku_hostname]

if duthost.is_supervisor_node():
pytest.skip("skipping for supervisor node")

# We are interested only in ports that are used for device connection
physical_intfs = conn_graph_facts["device_conn"][duthost.hostname]

physical_port_index_map = get_physical_port_indices(duthost, physical_intfs)

sfp_port_indices = set([physical_port_index_map[intf] \
for intf in physical_port_index_map.keys()])
sfp_setup["sfp_port_indices"] = sorted(sfp_port_indices)
Expand Down Expand Up @@ -148,8 +148,9 @@ class TestSfpApi(PlatformApiTestBase):
def is_xcvr_optical(self, xcvr_info_dict):
"""Returns True if transceiver is optical, False if copper (DAC)"""
#For QSFP-DD specification compliance will return type as passive or active
if xcvr_info_dict["type_abbrv_name"] == "QSFP-DD" or xcvr_info_dict["type_abbrv_name"] == "OSFP-8X":
if xcvr_info_dict["specification_compliance"] == "passive_copper_media_interface":
if xcvr_info_dict["type_abbrv_name"] == "QSFP-DD" or xcvr_info_dict["type_abbrv_name"] == "OSFP-8X" \
or xcvr_info_dict["type_abbrv_name"] == "QSFP+C":
if xcvr_info_dict["specification_compliance"] == "Passive Copper Cable":
return False
else:
spec_compliance_dict = ast.literal_eval(xcvr_info_dict["specification_compliance"])
Expand All @@ -161,6 +162,10 @@ def is_xcvr_optical(self, xcvr_info_dict):
compliance_code = spec_compliance_dict.get("10/40G Ethernet Compliance Code")
if compliance_code == "40GBASE-CR4":
return False
if compliance_code == "Extended":
extended_code = spec_compliance_dict.get("Extended Specification Compliance")
if "CR" in extended_code:
return False
return True

def is_xcvr_resettable(self, xcvr_info_dict):
Expand Down