matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Nokia ixs7215] Add support for SFP eeprom type_abbrv_name attribute (#8772)

Browse Source
This commit is contained in:
dflynn-Nokia 2021-09-16 05:07:06 -04:00 committed by GitHub
parent 13ec43bc68
commit 83e78761e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 52 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/fan_drawer.py
View File

@ -54,9 +54,25 @@ class NokiaFanDrawer(FanDrawerBase):
return 'intake' return 'intake'
def set_status_led(self, color): def set_status_led(self, color):
"""
Sets the state of the fan drawer status LED
Args:
color: A string representing the color with which to set the
fan drawer status LED
Returns:
bool: True if status LED state is set successfully, False if not
"""
return self._fan_list[0].set_status_led(color) return self._fan_list[0].set_status_led(color)
def get_status_led(self, color): def get_status_led(self):
"""
Gets the state of the fan drawer LED
Returns:
A string, one of the predefined STATUS_LED_COLOR_* strings
"""
return self._fan_list[0].get_status_led() return self._fan_list[0].get_status_led()
def is_replaceable(self): def is_replaceable(self):

55
platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp.py
View File

@ -143,7 +143,7 @@ class Sfp(SfpBase):
'model', 'connector', 'encoding', 'ext_identifier', 'model', 'connector', 'encoding', 'ext_identifier',
'ext_rateselect_compliance', 'cable_type', 'cable_length', 'ext_rateselect_compliance', 'cable_type', 'cable_length',
'nominal_bit_rate', 'specification_compliance', 'nominal_bit_rate', 'specification_compliance',
'vendor_date', 'vendor_oui'] 'type_abbrv_name', 'vendor_date', 'vendor_oui']
self.dom_dict_keys = ['rx_los', 'tx_fault', 'reset_status', 'power_lpmode', self.dom_dict_keys = ['rx_los', 'tx_fault', 'reset_status', 'power_lpmode',
'tx_disable', 'tx_disable_channel', 'temperature', 'tx_disable', 'tx_disable_channel', 'temperature',
@ -274,6 +274,7 @@ class Sfp(SfpBase):
cable_length |INT |cable length in m cable_length |INT |cable length in m
nominal_bit_rate |INT |nominal bit rate by 100Mbs nominal_bit_rate |INT |nominal bit rate by 100Mbs
specification_compliance |1*255VCHAR |specification compliance specification_compliance |1*255VCHAR |specification compliance
type_abbrv_name |1*255VCHAR |type of SFP (abbreviated)
vendor_date |1*255VCHAR |vendor date vendor_date |1*255VCHAR |vendor date
vendor_oui |1*255VCHAR |vendor OUI vendor_oui |1*255VCHAR |vendor OUI
application_advertisement |1*255VCHAR |supported applications advertisement application_advertisement |1*255VCHAR |supported applications advertisement
@ -338,33 +339,47 @@ class Sfp(SfpBase):
end = start + XCVR_VENDOR_DATE_WIDTH end = start + XCVR_VENDOR_DATE_WIDTH
sfp_vendor_date_data = sfpi_obj.parse_vendor_date( sfp_vendor_date_data = sfpi_obj.parse_vendor_date(
sfp_interface_bulk_raw[start: end], 0) sfp_interface_bulk_raw[start: end], 0)
transceiver_info_dict['type'] = sfp_interface_bulk_data['data']['type']['value']
transceiver_info_dict['manufacturer'] = sfp_vendor_name_data['data']['Vendor Name']['value'] transceiver_info_dict['type'] = sfp_interface_bulk_data \
transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] ['data']['type']['value']
transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] transceiver_info_dict['manufacturer'] = sfp_vendor_name_data \
transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] ['data']['Vendor Name']['value']
transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data['data']['Vendor OUI']['value'] transceiver_info_dict['model'] = sfp_vendor_pn_data \
transceiver_info_dict['vendor_date'] = sfp_vendor_date_data[ ['data']['Vendor PN']['value']
'data']['VendorDataCode(YYYY-MM-DD Lot)']['value'] transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data \
transceiver_info_dict['connector'] = sfp_interface_bulk_data['data']['Connector']['value'] ['data']['Vendor Rev']['value']
transceiver_info_dict['encoding'] = sfp_interface_bulk_data['data']['EncodingCodes']['value'] transceiver_info_dict['serial'] = sfp_vendor_sn_data \
transceiver_info_dict['ext_identifier'] = sfp_interface_bulk_data['data']['Extended Identifier']['value'] ['data']['Vendor SN']['value']
transceiver_info_dict['ext_rateselect_compliance'] = sfp_interface_bulk_data['data']['RateIdentifier']['value'] transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data \
['data']['Vendor OUI']['value']
transceiver_info_dict['vendor_date'] = sfp_vendor_date_data \
['data']['VendorDataCode(YYYY-MM-DD Lot)']['value']
transceiver_info_dict['connector'] = sfp_interface_bulk_data \
['data']['Connector']['value']
transceiver_info_dict['encoding'] = sfp_interface_bulk_data \
['data']['EncodingCodes']['value']
transceiver_info_dict['ext_identifier'] = sfp_interface_bulk_data \
['data']['Extended Identifier']['value']
transceiver_info_dict['ext_rateselect_compliance'] = sfp_interface_bulk_data \
['data']['RateIdentifier']['value']
transceiver_info_dict['type_abbrv_name'] = sfp_interface_bulk_data \
['data']['type_abbrv_name']['value']
for key in sfp_cable_length_tup: for key in sfp_cable_length_tup:
if key in sfp_interface_bulk_data['data']: if key in sfp_interface_bulk_data['data']:
transceiver_info_dict['cable_type'] = key transceiver_info_dict['cable_type'] = key
transceiver_info_dict['cable_length'] = str( transceiver_info_dict['cable_length'] = \
sfp_interface_bulk_data['data'][key]['value']) str(sfp_interface_bulk_data['data'][key]['value'])
for key in sfp_compliance_code_tup: for key in sfp_compliance_code_tup:
if key in sfp_interface_bulk_data['data']['Specification compliance']['value']: if key in sfp_interface_bulk_data['data']['Specification compliance']['value']:
compliance_code_dict[key] = sfp_interface_bulk_data['data']['Specification compliance']['value'][key]['value'] compliance_code_dict[key] = sfp_interface_bulk_data \
transceiver_info_dict['specification_compliance'] = str( ['data']['Specification compliance']['value'][key]['value']
compliance_code_dict)
transceiver_info_dict['nominal_bit_rate'] = str( transceiver_info_dict['specification_compliance'] = \
sfp_interface_bulk_data['data']['NominalSignallingRate(UnitsOf100Mbd)']['value']) str(compliance_code_dict)
transceiver_info_dict['nominal_bit_rate'] = \
str(sfp_interface_bulk_data['data']['NominalSignallingRate(UnitsOf100Mbd)']['value'])
transceiver_info_dict['application_advertisement'] = 'N/A' transceiver_info_dict['application_advertisement'] = 'N/A'
return transceiver_info_dict return transceiver_info_dict