Skip to content

fix for non-coherent cmis modules #2163

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 4 commits into from
May 26, 2022
Merged

fix for non-coherent cmis modules #2163

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
67824b1
fix for non-coherent cmis modules
qinchuanares May 11, 2022
7eb616a
addressing comments
qinchuanares May 13, 2022
7d0b9d8
add back application_advertisement
qinchuanares May 23, 2022
b38e54f
fixing test failure
qinchuanares May 26, 2022
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
49 changes: 15 additions & 34 deletions sfputil/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,27 +325,13 @@ def convert_sfp_info_to_output_string(sfp_info_dict):
elif key == 'cable_length':
pass
elif key == 'specification_compliance':
if sfp_info_dict['type'] == "QSFP-DD Double Density 8X Pluggable Transceiver" or \
sfp_info_dict['type'] == "OSFP 8X Pluggable Transceiver" or \
sfp_info_dict['type'] == "QSFP+ or later with CMIS":
output += '{}{}: {}\n'.format(indent, QSFP_DD_DATA_MAP[key], sfp_info_dict[key])
else:
output += '{}{}:\n'.format(indent, QSFP_DD_DATA_MAP['specification_compliance'])

spec_compliance_dict = {}
try:
spec_compliance_dict = ast.literal_eval(sfp_info_dict['specification_compliance'])
sorted_compliance_key_table = natsorted(spec_compliance_dict)
for compliance_key in sorted_compliance_key_table:
output += '{}{}: {}\n'.format((indent * 2), compliance_key, spec_compliance_dict[compliance_key])
except ValueError as e:
output += '{}N/A\n'.format((indent * 2))
elif key == 'application_advertisement':
pass
output += '{}{}: {}\n'.format(indent, QSFP_DD_DATA_MAP[key], sfp_info_dict[key])
elif key == 'supported_max_tx_power' or key == 'supported_min_tx_power':
output += '{}{}: {}dBm\n'.format(indent, QSFP_DD_DATA_MAP[key], sfp_info_dict[key])
if key in sfp_info_dict: # C-CMIS compliant / coherent modules
output += '{}{}: {}dBm\n'.format(indent, QSFP_DD_DATA_MAP[key], sfp_info_dict[key])
elif key == 'supported_max_laser_freq' or key == 'supported_min_laser_freq':
output += '{}{}: {}GHz\n'.format(indent, QSFP_DD_DATA_MAP[key], sfp_info_dict[key])
if key in sfp_info_dict: # C-CMIS compliant / coherent modules
output += '{}{}: {}GHz\n'.format(indent, QSFP_DD_DATA_MAP[key], sfp_info_dict[key])
else:
try:
output += '{}{}: {}\n'.format(indent, QSFP_DD_DATA_MAP[key], sfp_info_dict[key])
Expand All @@ -360,21 +346,16 @@ def convert_sfp_info_to_output_string(sfp_info_dict):
elif key == 'cable_length':
pass
elif key == 'specification_compliance':
if sfp_info_dict['type'] == "QSFP-DD Double Density 8X Pluggable Transceiver" or \
sfp_info_dict['type'] == "OSFP 8X Pluggable Transceiver" or \
sfp_info_dict['type'] == "QSFP+ or later with CMIS":
output += '{}{}: {}\n'.format(indent, QSFP_DATA_MAP[key], sfp_info_dict[key])
else:
output += '{}{}:\n'.format(indent, QSFP_DATA_MAP['specification_compliance'])

spec_compliance_dict = {}
try:
spec_compliance_dict = ast.literal_eval(sfp_info_dict['specification_compliance'])
sorted_compliance_key_table = natsorted(spec_compliance_dict)
for compliance_key in sorted_compliance_key_table:
output += '{}{}: {}\n'.format((indent * 2), compliance_key, spec_compliance_dict[compliance_key])
except ValueError as e:
output += '{}N/A\n'.format((indent * 2))
output += '{}{}:\n'.format(indent, QSFP_DATA_MAP['specification_compliance'])

spec_compliance_dict = {}
try:
spec_compliance_dict = ast.literal_eval(sfp_info_dict['specification_compliance'])
sorted_compliance_key_table = natsorted(spec_compliance_dict)
for compliance_key in sorted_compliance_key_table:
output += '{}{}: {}\n'.format((indent * 2), compliance_key, spec_compliance_dict[compliance_key])
except ValueError as e:
output += '{}N/A\n'.format((indent * 2))
else:
output += '{}{}: {}\n'.format(indent, QSFP_DATA_MAP[key], sfp_info_dict[key])

Expand Down
1 change: 1 addition & 0 deletions tests/sfputil_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ def test_format_dict_value_to_string(self):
" Active App Selection Host Lane 7: 1\n"
" Active App Selection Host Lane 8: 1\n"
" Active Firmware Version: 0.1\n"
" Application Advertisement: N/A\n"
" CMIS Revision: 5.0\n"
" Connector: LC\n"
" Encoding: N/A\n"
Expand Down