Skip to content

Commit fd43d51

Browse files
authored
Fixes show interface transceiver info Ethernet0 command failure for CMIS SFP. (sonic-net#3795)
* Fix: show interface transceiver info Ethernet0 command fails for CMIS SFP * Fix variable name error.
1 parent 51a2e9e commit fd43d51

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

scripts/sfpshow

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ from utilities_common.sfp_helper import covert_application_advertisement_to_outp
1919
from utilities_common.sfp_helper import (
2020
QSFP_DATA_MAP,
2121
CMIS_DATA_MAP,
22+
C_CMIS_DATA_MAP,
2223
QSFP_STATUS_MAP,
2324
CMIS_STATUS_MAP,
2425
CCMIS_STATUS_MAP,
@@ -308,8 +309,15 @@ class SFPShow(object):
308309
indent = ' ' * 8
309310
output = ''
310311
is_sfp_cmis = 'cmis_rev' in sfp_info_dict
312+
is_sfp_c_cmis = 'supported_max_tx_power' in sfp_info_dict
313+
314+
if is_sfp_c_cmis:
315+
data_map = C_CMIS_DATA_MAP
316+
elif is_sfp_cmis:
317+
data_map = CMIS_DATA_MAP
318+
else:
319+
data_map = QSFP_DATA_MAP
311320

312-
data_map = CMIS_DATA_MAP if is_sfp_cmis else QSFP_DATA_MAP
313321
sorted_data_map_keys = sorted(data_map, key=data_map.get)
314322
for key in sorted_data_map_keys:
315323
if key == 'cable_type':

utilities_common/sfp_helper.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@
3535
'cmis_rev': 'CMIS Rev',
3636
'active_firmware': 'Active Firmware',
3737
'inactive_firmware': 'Inactive Firmware',
38-
'supported_max_tx_power': 'Supported Max TX Power',
39-
'supported_min_tx_power': 'Supported Min TX Power',
40-
'supported_max_laser_freq': 'Supported Max Laser Frequency',
41-
'supported_min_laser_freq': 'Supported Min Laser Frequency',
4238
'e1_active_firmware': 'E1 Active Firmware',
4339
'e1_inactive_firmware': 'E1 Inactive Firmware',
4440
'e1_server_firmware': 'E1 Server Firmware',
@@ -47,7 +43,15 @@
4743
'e2_server_firmware': 'E2 Server Firmware'
4844
}
4945

46+
C_CMIS_DELTA_DATA_MAP = {
47+
'supported_max_tx_power': 'Supported Max TX Power',
48+
'supported_min_tx_power': 'Supported Min TX Power',
49+
'supported_max_laser_freq': 'Supported Max Laser Frequency',
50+
'supported_min_laser_freq': 'Supported Min Laser Frequency',
51+
}
52+
5053
CMIS_DATA_MAP = {**QSFP_DATA_MAP, **QSFP_CMIS_DELTA_DATA_MAP}
54+
C_CMIS_DATA_MAP = {**CMIS_DATA_MAP, **C_CMIS_DELTA_DATA_MAP}
5155

5256
# Common fileds for all types:
5357
# For non-CMIS, only first 1 or 4 lanes are applicable.

0 commit comments

Comments
 (0)