mirror of
				https://github.com/Telecominfraproject/ols-nos.git
				synced 2025-10-31 18:17:52 +00:00 
			
		
		
		
	[SFP-Refactor] Modify transceiver key name (#9447)
* Modify transceiever key name * fix alignment
This commit is contained in:
		| @@ -151,7 +151,7 @@ class Sfp(SfpBase): | ||||
|         for x in range(self.PORT_START, self.PORT_END + 1): | ||||
|             self.port_to_eeprom_mapping[x] = eeprom_path.format(self._port_to_i2c_mapping[x]) | ||||
|  | ||||
|         self.info_dict_keys = ['type', 'hardware_rev', 'serial', 'manufacturer', 'model', 'connector', 'encoding', 'ext_identifier', | ||||
|         self.info_dict_keys = ['type', 'vendor_rev', 'serial', 'manufacturer', 'model', 'connector', 'encoding', 'ext_identifier', | ||||
|                                'ext_rateselect_compliance', 'cable_type', 'cable_length', 'nominal_bit_rate', 'specification_compliance', 'vendor_date', 'vendor_oui'] | ||||
|  | ||||
|         self.dom_dict_keys = ['rx_los', 'tx_fault', 'reset_status', 'power_lpmode', 'tx_disable', 'tx_disable_channel', 'temperature', 'voltage', | ||||
| @@ -234,7 +234,7 @@ class Sfp(SfpBase): | ||||
|         keys                       |Value Format   |Information | ||||
|         ---------------------------|---------------|---------------------------- | ||||
|         type                       |1*255VCHAR     |type of SFP | ||||
|         hardware_rev                |1*255VCHAR     |hardware version of SFP | ||||
|         vendor_rev                 |1*255VCHAR     |vendor revision of SFP | ||||
|         serial                     |1*255VCHAR     |serial number of the SFP | ||||
|         manufacturer               |1*255VCHAR     |SFP vendor name | ||||
|         model                      |1*255VCHAR     |SFP model name | ||||
| @@ -321,7 +321,7 @@ class Sfp(SfpBase): | ||||
|         transceiver_info_dict['manufacturer'] = sfp_vendor_name_data[ | ||||
|             'data']['Vendor Name']['value'] if sfp_vendor_name_data else 'N/A' | ||||
|         transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] if sfp_vendor_pn_data else 'N/A' | ||||
|         transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] if sfp_vendor_rev_data else 'N/A' | ||||
|         transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] if sfp_vendor_rev_data else 'N/A' | ||||
|         transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] if sfp_vendor_sn_data else 'N/A' | ||||
|         transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data['data']['Vendor OUI']['value'] if sfp_vendor_oui_data else 'N/A' | ||||
|         transceiver_info_dict['vendor_date'] = sfp_vendor_date_data[ | ||||
|   | ||||
| @@ -205,7 +205,7 @@ class Sfp(SfpBase): | ||||
|         for x in range(self.PORT_START, self.PORT_END + 1): | ||||
|             self.port_to_eeprom_mapping[x] = eeprom_path.format(self._port_to_i2c_mapping[x]) | ||||
|          | ||||
|         self.info_dict_keys = ['type', 'hardware_rev', 'serial', 'manufacturer', 'model', 'connector', 'encoding', 'ext_identifier', | ||||
|         self.info_dict_keys = ['type', 'vendor_rev', 'serial', 'manufacturer', 'model', 'connector', 'encoding', 'ext_identifier', | ||||
|                                'ext_rateselect_compliance', 'cable_type', 'cable_length', 'nominal_bit_rate', 'specification_compliance', 'vendor_date', 'vendor_oui', | ||||
|                                'application_advertisement', 'type_abbrv_name'] | ||||
|  | ||||
| @@ -286,7 +286,7 @@ class Sfp(SfpBase): | ||||
|         keys                       |Value Format   |Information | ||||
|         ---------------------------|---------------|---------------------------- | ||||
|         type                       |1*255VCHAR     |type of SFP | ||||
|         hardware_rev               |1*255VCHAR     |hardware version of SFP | ||||
|         vendor_rev                 |1*255VCHAR     |vendor revision of SFP | ||||
|         serial                     |1*255VCHAR     |serial number of the SFP | ||||
|         manufacturer               |1*255VCHAR     |SFP vendor name | ||||
|         model                      |1*255VCHAR     |SFP model name | ||||
| @@ -372,7 +372,7 @@ class Sfp(SfpBase): | ||||
|         transceiver_info_dict['manufacturer'] = sfp_vendor_name_data[ | ||||
|             'data']['Vendor Name']['value'] if sfp_vendor_name_data else 'N/A' | ||||
|         transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] if sfp_vendor_pn_data else 'N/A' | ||||
|         transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] if sfp_vendor_rev_data else 'N/A' | ||||
|         transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] if sfp_vendor_rev_data else 'N/A' | ||||
|         transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] if sfp_vendor_sn_data else 'N/A' | ||||
|         transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data['data']['Vendor OUI']['value'] if sfp_vendor_oui_data else 'N/A' | ||||
|         transceiver_info_dict['vendor_date'] = sfp_vendor_date_data[ | ||||
|   | ||||
| @@ -192,7 +192,7 @@ class Sfp(SfpBase): | ||||
|             self.port_to_eeprom_mapping[p_num] = eeprom_path.format( | ||||
|                 self.port_to_i2c_mapping[p_num]) | ||||
|  | ||||
|         self.info_dict_keys = ['type', 'hardware_rev', 'serial', 'manufacturer', 'model', 'connector', 'encoding', 'ext_identifier', | ||||
|         self.info_dict_keys = ['type', 'vendor_rev', 'serial', 'manufacturer', 'model', 'connector', 'encoding', 'ext_identifier', | ||||
|                                'ext_rateselect_compliance', 'cable_type', 'cable_length', 'nominal_bit_rate', 'specification_compliance', 'vendor_date', 'vendor_oui'] | ||||
|  | ||||
|         self.dom_dict_keys = ['rx_los', 'tx_fault', 'reset_status', 'power_lpmode', 'tx_disable', 'tx_disable_channel', 'temperature', 'voltage', | ||||
| @@ -305,7 +305,7 @@ class Sfp(SfpBase): | ||||
|         keys                       |Value Format   |Information | ||||
|         ---------------------------|---------------|---------------------------- | ||||
|         type                       |1*255VCHAR     |type of SFP | ||||
|         hardware_rev               |1*255VCHAR     |hardware version of SFP | ||||
|         vendor_rev                 |1*255VCHAR     |vendor revision of SFP | ||||
|         serial                     |1*255VCHAR     |serial number of the SFP | ||||
|         manufacturer               |1*255VCHAR     |SFP vendor name | ||||
|         model                      |1*255VCHAR     |SFP model name | ||||
| @@ -377,7 +377,7 @@ class Sfp(SfpBase): | ||||
|         transceiver_info_dict['manufacturer'] = sfp_vendor_name_data[ | ||||
|             'data']['Vendor Name']['value'] if sfp_vendor_name_data else 'N/A' | ||||
|         transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] if sfp_vendor_pn_data else 'N/A' | ||||
|         transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] if sfp_vendor_rev_data else 'N/A' | ||||
|         transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] if sfp_vendor_rev_data else 'N/A' | ||||
|         transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] if sfp_vendor_sn_data else 'N/A' | ||||
|         transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data['data']['Vendor OUI']['value'] if sfp_vendor_oui_data else 'N/A' | ||||
|         transceiver_info_dict['vendor_date'] = sfp_vendor_date_data[ | ||||
| @@ -559,7 +559,7 @@ class Sfp(SfpBase): | ||||
|         keys                       |Value Format   |Information | ||||
|         ---------------------------|---------------|---------------------------- | ||||
|         type                       |1*255VCHAR     |type of SFP | ||||
|         hardware_rev               |1*255VCHAR     |hardware version of SFP | ||||
|         vendor_rev               |1*255VCHAR     |hardware version of SFP | ||||
|         serial                     |1*255VCHAR     |serial number of the SFP | ||||
|         manufacturer               |1*255VCHAR     |SFP vendor name | ||||
|         model                      |1*255VCHAR     |SFP model name | ||||
| @@ -631,7 +631,7 @@ class Sfp(SfpBase): | ||||
|         transceiver_info_dict['manufacturer'] = sfp_vendor_name_data[ | ||||
|             'data']['Vendor Name']['value'] if sfp_vendor_name_data else 'N/A' | ||||
|         transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] if sfp_vendor_pn_data else 'N/A' | ||||
|         transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] if sfp_vendor_rev_data else 'N/A' | ||||
|         transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] if sfp_vendor_rev_data else 'N/A' | ||||
|         transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] if sfp_vendor_sn_data else 'N/A' | ||||
|         transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data['data']['Vendor OUI']['value'] if sfp_vendor_oui_data else 'N/A' | ||||
|         transceiver_info_dict['vendor_date'] = sfp_vendor_date_data[ | ||||
|   | ||||
| @@ -205,7 +205,7 @@ class Sfp(SfpBase): | ||||
|         for x in range(self.PORT_START, self.PORT_END + 1): | ||||
|             self.port_to_eeprom_mapping[x] = eeprom_path.format(self._port_to_i2c_mapping[x]) | ||||
|          | ||||
|         self.info_dict_keys = ['type', 'hardware_rev', 'serial', 'manufacturer', 'model', 'connector', 'encoding', 'ext_identifier', | ||||
|         self.info_dict_keys = ['type', 'vendor_rev', 'serial', 'manufacturer', 'model', 'connector', 'encoding', 'ext_identifier', | ||||
|                                'ext_rateselect_compliance', 'cable_type', 'cable_length', 'nominal_bit_rate', 'specification_compliance', 'vendor_date', 'vendor_oui'] | ||||
|  | ||||
|         self.dom_dict_keys = ['rx_los', 'tx_fault', 'reset_status', 'power_lpmode', 'tx_disable', 'tx_disable_channel', 'temperature', 'voltage', | ||||
| @@ -300,7 +300,7 @@ class Sfp(SfpBase): | ||||
|         keys                       |Value Format   |Information | ||||
|         ---------------------------|---------------|---------------------------- | ||||
|         type                       |1*255VCHAR     |type of SFP | ||||
|         hardware_rev               |1*255VCHAR     |hardware version of SFP | ||||
|         vendor_rev                 |1*255VCHAR     |vendor revision of SFP | ||||
|         serial                     |1*255VCHAR     |serial number of the SFP | ||||
|         manufacturer               |1*255VCHAR     |SFP vendor name | ||||
|         model                      |1*255VCHAR     |SFP model name | ||||
| @@ -385,7 +385,7 @@ class Sfp(SfpBase): | ||||
|         transceiver_info_dict['manufacturer'] = sfp_vendor_name_data[ | ||||
|             'data']['Vendor Name']['value'] if sfp_vendor_name_data else 'N/A' | ||||
|         transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] if sfp_vendor_pn_data else 'N/A' | ||||
|         transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] if sfp_vendor_rev_data else 'N/A' | ||||
|         transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] if sfp_vendor_rev_data else 'N/A' | ||||
|         transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] if sfp_vendor_sn_data else 'N/A' | ||||
|         transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data['data']['Vendor OUI']['value'] if sfp_vendor_oui_data else 'N/A' | ||||
|         transceiver_info_dict['vendor_date'] = sfp_vendor_date_data[ | ||||
|   | ||||
| @@ -210,7 +210,7 @@ qsfp_compliance_code_tup = ( | ||||
| ) | ||||
|  | ||||
| info_dict_keys = [ | ||||
|     'type', 'hardware_rev', 'serial', 'manufacturer', | ||||
|     'type', 'vendor_rev', 'serial', 'manufacturer', | ||||
|     'model', 'connector', 'encoding', 'ext_identifier', | ||||
|     'ext_rateselect_compliance', 'cable_type', 'cable_length', | ||||
|     'nominal_bit_rate', 'specification_compliance', 'vendor_date', | ||||
| @@ -551,7 +551,7 @@ class Sfp(SfpBase): | ||||
|         keys                       |Value Format   |Information | ||||
|         ---------------------------|---------------|---------------------------- | ||||
|         type                       |1*255VCHAR     |type of SFP | ||||
|         hardware_rev               |1*255VCHAR     |hardware version of SFP | ||||
|         vendor_rev                 |1*255VCHAR     |vendor revision of SFP | ||||
|         serial                     |1*255VCHAR     |serial number of the SFP | ||||
|         manufacturer               |1*255VCHAR     |SFP vendor name | ||||
|         model                      |1*255VCHAR     |SFP model name | ||||
| @@ -627,7 +627,7 @@ class Sfp(SfpBase): | ||||
|             transceiver_info_dict['type'] = sfp_type_data['data']['type']['value'] | ||||
|             transceiver_info_dict['manufacturer'] = sfp_vendor_name_data['data']['Vendor Name']['value'] | ||||
|             transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] | ||||
|             transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] | ||||
|  | ||||
|         elif self.sfp_type == QSFP_TYPE: | ||||
| @@ -770,7 +770,7 @@ class Sfp(SfpBase): | ||||
|                 sfp_vendor_name_data['data']['Vendor Name']['value']) | ||||
|             transceiver_info_dict['model'] = str( | ||||
|                 sfp_vendor_pn_data['data']['Vendor PN']['value']) | ||||
|             transceiver_info_dict['hardware_rev'] = str( | ||||
|             transceiver_info_dict['vendor_rev'] = str( | ||||
|                 sfp_vendor_rev_data['data']['Vendor Rev']['value']) | ||||
|             transceiver_info_dict['serial'] = str( | ||||
|                 sfp_vendor_sn_data['data']['Vendor SN']['value']) | ||||
| @@ -845,7 +845,7 @@ class Sfp(SfpBase): | ||||
|             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['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] | ||||
|             transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] | ||||
|             transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data['data']['Vendor OUI']['value'] | ||||
|             transceiver_info_dict['vendor_date'] = sfp_vendor_date_data[ | ||||
|   | ||||
| @@ -194,7 +194,7 @@ class Sfp(SfpBase): | ||||
|             self.port_to_eeprom_mapping[x] = eeprom_path.format( | ||||
|                 self.port_to_i2c_mapping[x]) | ||||
|  | ||||
|         self.info_dict_keys = ['type', 'hardware_rev', 'serial', 'manufacturer', 'model', 'connector', 'encoding', 'ext_identifier', | ||||
|         self.info_dict_keys = ['type', 'vendor_rev', 'serial', 'manufacturer', 'model', 'connector', 'encoding', 'ext_identifier', | ||||
|                                'ext_rateselect_compliance', 'cable_type', 'cable_length', 'nominal_bit_rate', 'specification_compliance', | ||||
|                                'vendor_date', 'vendor_oui', "application_advertisement", "type_abbrv_name"] | ||||
|  | ||||
| @@ -364,7 +364,7 @@ class Sfp(SfpBase): | ||||
|         keys                       |Value Format   |Information | ||||
|         ---------------------------|---------------|---------------------------- | ||||
|         type                       |1*255VCHAR     |type of SFP | ||||
|         hardware_rev               |1*255VCHAR     |hardware version of SFP | ||||
|         vendor_rev                 |1*255VCHAR     |vendor revision of SFP | ||||
|         serial                     |1*255VCHAR     |serial number of the SFP | ||||
|         manufacturer               |1*255VCHAR     |SFP vendor name | ||||
|         model                      |1*255VCHAR     |SFP model name | ||||
| @@ -438,7 +438,7 @@ class Sfp(SfpBase): | ||||
|             transceiver_info_dict['type'] = sfp_type_data['data']['type']['value'] | ||||
|             transceiver_info_dict['manufacturer'] = sfp_vendor_name_data['data']['Vendor Name']['value'] | ||||
|             transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] | ||||
|             transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] | ||||
|             transceiver_info_dict['vendor_oui'] = 'N/A' | ||||
|             transceiver_info_dict['vendor_date'] = 'N/A' | ||||
| @@ -515,7 +515,7 @@ class Sfp(SfpBase): | ||||
|             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['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] | ||||
|             transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] | ||||
|             transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data['data']['Vendor OUI']['value'] | ||||
|             transceiver_info_dict['vendor_date'] = sfp_vendor_date_data[ | ||||
|   | ||||
| @@ -204,7 +204,7 @@ qsfp_compliance_code_tup = ( | ||||
| ) | ||||
|  | ||||
| info_dict_keys = [ | ||||
|     'type', 'hardware_rev', 'serial', 'manufacturer', | ||||
|     'type', 'vendor_rev', 'serial', 'manufacturer', | ||||
|     'model', 'connector', 'encoding', 'ext_identifier', | ||||
|     'ext_rateselect_compliance', 'cable_type', 'cable_length', | ||||
|     'nominal_bit_rate', 'specification_compliance', 'vendor_date', | ||||
| @@ -532,7 +532,7 @@ class Sfp(SfpBase): | ||||
|         keys                       |Value Format   |Information | ||||
|         ---------------------------|---------------|---------------------------- | ||||
|         type                       |1*255VCHAR     |type of SFP | ||||
|         hardware_rev               |1*255VCHAR     |hardware version of SFP | ||||
|         vendor_rev                 |1*255VCHAR     |vendor revision of SFP | ||||
|         serial                     |1*255VCHAR     |serial number of the SFP | ||||
|         manufacturer               |1*255VCHAR     |SFP vendor name | ||||
|         model                      |1*255VCHAR     |SFP model name | ||||
| @@ -608,7 +608,7 @@ class Sfp(SfpBase): | ||||
|             transceiver_info_dict['type'] = sfp_type_data['data']['type']['value'] | ||||
|             transceiver_info_dict['manufacturer'] = sfp_vendor_name_data['data']['Vendor Name']['value'] | ||||
|             transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] | ||||
|             transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] | ||||
|  | ||||
|         elif self.sfp_type == QSFP_TYPE: | ||||
| @@ -751,7 +751,7 @@ class Sfp(SfpBase): | ||||
|                 sfp_vendor_name_data['data']['Vendor Name']['value']) | ||||
|             transceiver_info_dict['model'] = str( | ||||
|                 sfp_vendor_pn_data['data']['Vendor PN']['value']) | ||||
|             transceiver_info_dict['hardware_rev'] = str( | ||||
|             transceiver_info_dict['vendor_rev'] = str( | ||||
|                 sfp_vendor_rev_data['data']['Vendor Rev']['value']) | ||||
|             transceiver_info_dict['serial'] = str( | ||||
|                 sfp_vendor_sn_data['data']['Vendor SN']['value']) | ||||
| @@ -826,7 +826,7 @@ class Sfp(SfpBase): | ||||
|             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['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] | ||||
|             transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] | ||||
|             transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data['data']['Vendor OUI']['value'] | ||||
|             transceiver_info_dict['vendor_date'] = sfp_vendor_date_data[ | ||||
|   | ||||
| @@ -225,7 +225,7 @@ class Sfp(SfpBase): | ||||
|             port_eeprom_path = eeprom_path.format(self.port_to_i2c_mapping[x]) | ||||
|             self.port_to_eeprom_mapping[x] = port_eeprom_path | ||||
|  | ||||
|         self.info_dict_keys = ['type', 'hardware_rev', 'serial', 'manufacturer', 'model', 'connector', 'encoding', 'ext_identifier', | ||||
|         self.info_dict_keys = ['type', 'vendor_rev', 'serial', 'manufacturer', 'model', 'connector', 'encoding', 'ext_identifier', | ||||
|                                'ext_rateselect_compliance', 'cable_type', 'cable_length', 'nominal_bit_rate', 'specification_compliance', 'vendor_date', 'vendor_oui'] | ||||
|  | ||||
|         self.dom_dict_keys = ['rx_los', 'tx_fault', 'reset_status', 'power_lpmode', 'tx_disable', 'tx_disable_channel', 'temperature', 'voltage', | ||||
| @@ -409,7 +409,7 @@ class Sfp(SfpBase): | ||||
|         keys                       |Value Format   |Information | ||||
|         ---------------------------|---------------|---------------------------- | ||||
|         type                       |1*255VCHAR     |type of SFP | ||||
|         hardware_rev               |1*255VCHAR     |hardware version of SFP | ||||
|         vendor_rev                 |1*255VCHAR     |vendor revision of SFP | ||||
|         serial                     |1*255VCHAR     |serial number of the SFP | ||||
|         manufacturer               |1*255VCHAR     |SFP vendor name | ||||
|         model                      |1*255VCHAR     |SFP model name | ||||
| @@ -482,7 +482,7 @@ class Sfp(SfpBase): | ||||
|             transceiver_info_dict['type'] = sfp_type_data['data']['type']['value'] | ||||
|             transceiver_info_dict['manufacturer'] = sfp_vendor_name_data['data']['Vendor Name']['value'] | ||||
|             transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] | ||||
|             transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] | ||||
|             transceiver_info_dict['vendor_oui'] = 'N/A' | ||||
|             transceiver_info_dict['vendor_date'] = 'N/A' | ||||
| @@ -561,7 +561,7 @@ class Sfp(SfpBase): | ||||
|             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['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] | ||||
|             transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] | ||||
|             transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data['data']['Vendor OUI']['value'] | ||||
|             transceiver_info_dict['vendor_date'] = sfp_vendor_date_data[ | ||||
|   | ||||
| @@ -662,7 +662,7 @@ class SfpUtil(SfpUtilBase): | ||||
|             transceiver_info_dict['type_abbrv_name'] = sfp_type_data['data']['type_abbrv_name']['value'] | ||||
|             transceiver_info_dict['manufacturer'] = sfp_vendor_name_data['data']['Vendor Name']['value'] | ||||
|             transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] | ||||
|             transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] | ||||
|             # Below part is added to avoid fail the xcvrd, shall be implemented later | ||||
|             transceiver_info_dict['vendor_oui'] = 'N/A' | ||||
| @@ -769,7 +769,7 @@ class SfpUtil(SfpUtilBase): | ||||
|             transceiver_info_dict['type_abbrv_name'] = sfp_interface_bulk_data['data']['type_abbrv_name']['value'] | ||||
|             transceiver_info_dict['manufacturer'] = sfp_vendor_name_data['data']['Vendor Name']['value'] | ||||
|             transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] | ||||
|             transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] | ||||
|             transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data['data']['Vendor OUI']['value'] | ||||
|             transceiver_info_dict['vendor_date'] = sfp_vendor_date_data[ | ||||
|   | ||||
| @@ -374,7 +374,7 @@ class SfpUtil(SfpUtilBase): | ||||
|             transceiver_info_dict['type_abbrv_name'] = sfp_type_data['data']['type_abbrv_name']['value'] | ||||
|             transceiver_info_dict['manufacturer'] = sfp_vendor_name_data['data']['Vendor Name']['value'] | ||||
|             transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] | ||||
|             transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] | ||||
|             # Below part is added to avoid fail the xcvrd, shall be implemented later | ||||
|             transceiver_info_dict['vendor_oui'] = 'N/A' | ||||
| @@ -483,7 +483,7 @@ class SfpUtil(SfpUtilBase): | ||||
|             transceiver_info_dict['type_abbrv_name'] = sfp_interface_bulk_data['data']['type_abbrv_name']['value'] | ||||
|             transceiver_info_dict['manufacturer'] = sfp_vendor_name_data['data']['Vendor Name']['value'] | ||||
|             transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] | ||||
|             transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] | ||||
|             transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data['data']['Vendor OUI']['value'] | ||||
|             transceiver_info_dict['vendor_date'] = sfp_vendor_date_data[ | ||||
|   | ||||
| @@ -349,7 +349,7 @@ class SfpUtil(SfpUtilBase): | ||||
|             transceiver_info_dict['type'] = sfp_type_data['data']['type']['value'] | ||||
|             transceiver_info_dict['manufacturer'] = sfp_vendor_name_data['data']['Vendor Name']['value'] | ||||
|             transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] | ||||
|             transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] | ||||
|             # Below part is added to avoid fail the xcvrd, shall be implemented later | ||||
|             transceiver_info_dict['vendor_oui'] = 'N/A' | ||||
| @@ -438,7 +438,7 @@ class SfpUtil(SfpUtilBase): | ||||
|             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['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] | ||||
|             transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] | ||||
|             transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data['data']['Vendor OUI']['value'] | ||||
|             transceiver_info_dict['vendor_date'] = sfp_vendor_date_data[ | ||||
|   | ||||
| @@ -345,7 +345,7 @@ class Sfp(SfpBase): | ||||
|         self._detect_sfp_type(sfp_type) | ||||
|         self._dom_capability_detect() | ||||
|  | ||||
|         self.info_dict_keys = ['type', 'hardware_rev', 'serial', 'manufacturer', 'model', 'connector', 'encoding', 'ext_identifier', | ||||
|         self.info_dict_keys = ['type', 'vendor_rev', 'serial', 'manufacturer', 'model', 'connector', 'encoding', 'ext_identifier', | ||||
|             'ext_rateselect_compliance', 'cable_type', 'cable_length', 'nominal_bit_rate', 'specification_compliance', 'vendor_date',  | ||||
|             'vendor_oui', 'application_advertisement', 'type_abbrv_name'] | ||||
|  | ||||
| @@ -607,7 +607,7 @@ class Sfp(SfpBase): | ||||
|         keys                       |Value Format   |Information | ||||
|         ---------------------------|---------------|---------------------------- | ||||
|         type                       |1*255VCHAR     |type of SFP | ||||
|         hardware_rev               |1*255VCHAR     |hardware version of SFP | ||||
|         vendor_rev                 |1*255VCHAR     |vendor revision of SFP | ||||
|         serial                     |1*255VCHAR     |serial number of the SFP | ||||
|         manufacturer               |1*255VCHAR     |SFP vendor name | ||||
|         model                      |1*255VCHAR     |SFP model name | ||||
| @@ -683,7 +683,7 @@ class Sfp(SfpBase): | ||||
|             transceiver_info_dict['type_abbrv_name'] = sfp_type_abbrv_name_data['data']['type_abbrv_name']['value'] | ||||
|             transceiver_info_dict['manufacturer'] = sfp_vendor_name_data['data']['Vendor Name']['value'] | ||||
|             transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] | ||||
|             transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] | ||||
|             transceiver_info_dict['vendor_oui'] = 'N/A' | ||||
|             transceiver_info_dict['vendor_date'] = 'N/A' | ||||
| @@ -810,7 +810,7 @@ class Sfp(SfpBase): | ||||
|             transceiver_info_dict['type_abbrv_name'] = str(sfp_type_abbrv_name_data['data']['type_abbrv_name']['value']) | ||||
|             transceiver_info_dict['manufacturer'] = str(sfp_vendor_name_data['data']['Vendor Name']['value']) | ||||
|             transceiver_info_dict['model'] = str(sfp_vendor_pn_data['data']['Vendor PN']['value']) | ||||
|             transceiver_info_dict['hardware_rev'] = str(sfp_vendor_rev_data['data']['Vendor Rev']['value']) | ||||
|             transceiver_info_dict['vendor_rev'] = str(sfp_vendor_rev_data['data']['Vendor Rev']['value']) | ||||
|             transceiver_info_dict['serial'] = str(sfp_vendor_sn_data['data']['Vendor SN']['value']) | ||||
|             transceiver_info_dict['vendor_oui'] = str(sfp_vendor_oui_data['data']['Vendor OUI']['value']) | ||||
|             transceiver_info_dict['vendor_date'] = str(sfp_vendor_date_data['data']['VendorDataCode(YYYY-MM-DD Lot)']['value']) | ||||
| @@ -885,7 +885,7 @@ class Sfp(SfpBase): | ||||
|             transceiver_info_dict['type_abbrv_name'] = sfp_interface_bulk_data['data']['type_abbrv_name']['value'] | ||||
|             transceiver_info_dict['manufacturer'] = sfp_vendor_name_data['data']['Vendor Name']['value'] | ||||
|             transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] | ||||
|             transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['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'] | ||||
|   | ||||
| @@ -528,7 +528,7 @@ class Sfp(SfpBase): | ||||
|         keys                       |Value Format   |Information	 | ||||
|         ---------------------------|---------------|---------------------------- | ||||
|         type                       |1*255VCHAR     |type of SFP | ||||
|         hardware_rev               |1*255VCHAR     |hardware version of SFP | ||||
|         vendor_rev                 |1*255VCHAR     |vendor revision of SFP | ||||
|         serial                     |1*255VCHAR     |serial number of the SFP | ||||
|         manufacturer               |1*255VCHAR     |SFP vendor name | ||||
|         model                      |1*255VCHAR     |SFP model name | ||||
| @@ -603,7 +603,7 @@ class Sfp(SfpBase): | ||||
|             transceiver_info_dict['type'] = sfp_type_data['data']['type']['value'] | ||||
|             transceiver_info_dict['manufacturer'] = sfp_vendor_name_data['data']['Vendor Name']['value'] | ||||
|             transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] | ||||
|             transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] | ||||
|  | ||||
|         elif self.sfp_type == QSFP_TYPE: | ||||
| @@ -746,7 +746,7 @@ class Sfp(SfpBase): | ||||
|                 sfp_vendor_name_data['data']['Vendor Name']['value']) | ||||
|             transceiver_info_dict['model'] = str( | ||||
|                 sfp_vendor_pn_data['data']['Vendor PN']['value']) | ||||
|             transceiver_info_dict['hardware_rev'] = str( | ||||
|             transceiver_info_dict['vendor_rev'] = str( | ||||
|                 sfp_vendor_rev_data['data']['Vendor Rev']['value']) | ||||
|             transceiver_info_dict['serial'] = str( | ||||
|                 sfp_vendor_sn_data['data']['Vendor SN']['value']) | ||||
| @@ -821,7 +821,7 @@ class Sfp(SfpBase): | ||||
|             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['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] | ||||
|             transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] | ||||
|             transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data['data']['Vendor OUI']['value'] | ||||
|             transceiver_info_dict['vendor_date'] = sfp_vendor_date_data[ | ||||
|   | ||||
| @@ -362,7 +362,7 @@ class QSfp(SfpBase): | ||||
|  | ||||
|         transceiver_info_dict['manufacturer'] = sfp_vendor_name_data['data']['Vendor Name']['value'] if sfp_vendor_name_data else 'N/A' | ||||
|         transceiver_info_dict['model']       = sfp_vendor_pn_data['data']['Vendor PN']['value'] if sfp_vendor_pn_data else 'N/A' | ||||
|         transceiver_info_dict['hardware_rev']     = sfp_vendor_rev_data['data']['Vendor Rev']['value'] if sfp_vendor_rev_data else 'N/A' | ||||
|         transceiver_info_dict['vendor_rev']     = sfp_vendor_rev_data['data']['Vendor Rev']['value'] if sfp_vendor_rev_data else 'N/A' | ||||
|         transceiver_info_dict['serial']       = sfp_vendor_sn_data['data']['Vendor SN']['value'] if sfp_vendor_sn_data else 'N/A' | ||||
|         transceiver_info_dict['vendor_oui']      = sfp_vendor_oui_data['data']['Vendor OUI']['value'] if sfp_vendor_oui_data else 'N/A' | ||||
|         transceiver_info_dict['vendor_date']     = sfp_vendor_date_data['data']['VendorDataCode(YYYY-MM-DD Lot)']['value'] if sfp_vendor_date_data else 'N/A' | ||||
|   | ||||
| @@ -240,7 +240,7 @@ class QSfp(SfpBase): | ||||
|         keys                       |Value Format   |Information	 | ||||
|         ---------------------------|---------------|---------------------------- | ||||
|         type                       |1*255VCHAR     |type of SFP | ||||
|         hardware_rev               |1*255VCHAR     |hardware version of SFP | ||||
|         vendor_rev                 |1*255VCHAR     |vendor revision of SFP | ||||
|         serial                     |1*255VCHAR     |serial number of the SFP | ||||
|         manufacturer               |1*255VCHAR     |SFP vendor name | ||||
|         model                      |1*255VCHAR     |SFP model name | ||||
| @@ -256,7 +256,7 @@ class QSfp(SfpBase): | ||||
|         ======================================================================== | ||||
|         """ | ||||
|  | ||||
|         transceiver_info_dict_keys = ['type',                      'hardware_rev', | ||||
|         transceiver_info_dict_keys = ['type',                      'vendor_rev', | ||||
|                                       'serial',                    'manufacturer', | ||||
|                                       'model',                     'connector', | ||||
|                                       'encoding',                  'ext_identifier', | ||||
| @@ -314,7 +314,7 @@ class QSfp(SfpBase): | ||||
|  | ||||
|         transceiver_info_dict['manufacturer'] = sfp_vendor_name_data['data']['Vendor Name']['value'] if sfp_vendor_name_data else 'N/A' | ||||
|         transceiver_info_dict['model']        = sfp_vendor_pn_data['data']['Vendor PN']['value'] if sfp_vendor_pn_data else 'N/A' | ||||
|         transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] if sfp_vendor_rev_data else 'N/A' | ||||
|         transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] if sfp_vendor_rev_data else 'N/A' | ||||
|         transceiver_info_dict['serial']       = sfp_vendor_sn_data['data']['Vendor SN']['value'] if sfp_vendor_sn_data else 'N/A' | ||||
|         transceiver_info_dict['vendor_oui']   = sfp_vendor_oui_data['data']['Vendor OUI']['value'] if sfp_vendor_oui_data else 'N/A' | ||||
|         transceiver_info_dict['vendor_date']  = sfp_vendor_date_data['data']['VendorDataCode(YYYY-MM-DD Lot)']['value'] if sfp_vendor_date_data else 'N/A' | ||||
|   | ||||
| @@ -227,7 +227,7 @@ class Sfp(SfpBase): | ||||
|         keys                       |Value Format   |Information	 | ||||
|         ---------------------------|---------------|---------------------------- | ||||
|         type                       |1*255VCHAR     |type of SFP | ||||
|         hardware_rev               |1*255VCHAR     |hardware version of SFP | ||||
|         vendor_rev                 |1*255VCHAR     |vendor revision of SFP | ||||
|         serial                     |1*255VCHAR     |serial number of the SFP | ||||
|         manufacturer               |1*255VCHAR     |SFP vendor name | ||||
|         model                      |1*255VCHAR     |SFP model name | ||||
| @@ -243,7 +243,7 @@ class Sfp(SfpBase): | ||||
|         ======================================================================== | ||||
|         """ | ||||
|  | ||||
|         transceiver_info_dict_keys = ['type',                      'hardware_rev', | ||||
|         transceiver_info_dict_keys = ['type',                      'vendor_rev', | ||||
|                                       'serial',                    'manufacturer', | ||||
|                                       'model',                     'connector', | ||||
|                                       'encoding',                  'ext_identifier', | ||||
| @@ -303,7 +303,7 @@ class Sfp(SfpBase): | ||||
|  | ||||
|         transceiver_info_dict['manufacturer'] = sfp_vendor_name_data['data']['Vendor Name']['value'] if sfp_vendor_name_data else 'N/A' | ||||
|         transceiver_info_dict['model']        = sfp_vendor_pn_data['data']['Vendor PN']['value'] if sfp_vendor_pn_data else 'N/A' | ||||
|         transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] if sfp_vendor_rev_data else 'N/A' | ||||
|         transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] if sfp_vendor_rev_data else 'N/A' | ||||
|         transceiver_info_dict['serial']       = sfp_vendor_sn_data['data']['Vendor SN']['value'] if sfp_vendor_sn_data else 'N/A' | ||||
|         transceiver_info_dict['vendor_oui']   = sfp_vendor_oui_data['data']['Vendor OUI']['value'] if sfp_vendor_oui_data else 'N/A' | ||||
|         transceiver_info_dict['vendor_date']  = sfp_vendor_date_data['data']['VendorDataCode(YYYY-MM-DD Lot)']['value'] if sfp_vendor_date_data else 'N/A' | ||||
|   | ||||
| @@ -231,7 +231,7 @@ class Sfp(SfpBase): | ||||
|             port_eeprom_path = eeprom_path.format(self.port_to_i2c_mapping[x]) | ||||
|             self.port_to_eeprom_mapping[x] = port_eeprom_path | ||||
|  | ||||
|         self.info_dict_keys = ['type', 'hardware_rev', 'serial', 'manufacturer', 'model', 'connector', 'encoding', 'ext_identifier', | ||||
|         self.info_dict_keys = ['type', 'vendor_rev', 'serial', 'manufacturer', 'model', 'connector', 'encoding', 'ext_identifier', | ||||
|                                'ext_rateselect_compliance', 'cable_type', 'cable_length', 'nominal_bit_rate', 'specification_compliance', 'vendor_date', 'vendor_oui'] | ||||
|  | ||||
|         self.dom_dict_keys = ['rx_los', 'tx_fault', 'reset_status', 'power_lpmode', 'tx_disable', 'tx_disable_channel', 'temperature', 'voltage', | ||||
| @@ -425,7 +425,7 @@ class Sfp(SfpBase): | ||||
|         keys                       |Value Format   |Information | ||||
|         ---------------------------|---------------|---------------------------- | ||||
|         type                       |1*255VCHAR     |type of SFP | ||||
|         hardware_rev               |1*255VCHAR     |hardware version of SFP | ||||
|         vendor_rev                 |1*255VCHAR     |vendor revision of SFP | ||||
|         serial                     |1*255VCHAR     |serial number of the SFP | ||||
|         manufacturer               |1*255VCHAR     |SFP vendor name | ||||
|         model                      |1*255VCHAR     |SFP model name | ||||
| @@ -487,7 +487,7 @@ class Sfp(SfpBase): | ||||
|             transceiver_info_dict['type'] = sfp_type_data['data']['type']['value'] | ||||
|             transceiver_info_dict['manufacturer'] = sfp_vendor_name_data['data']['Vendor Name']['value'] | ||||
|             transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] | ||||
|             transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] | ||||
|             transceiver_info_dict['vendor_oui'] = 'N/A' | ||||
|             transceiver_info_dict['vendor_date'] = 'N/A' | ||||
| @@ -558,7 +558,7 @@ class Sfp(SfpBase): | ||||
|             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['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] | ||||
|             transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['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'] | ||||
|   | ||||
| @@ -221,7 +221,7 @@ class Sfp(SfpBase): | ||||
|             port_eeprom_path = eeprom_path.format(self.port_to_i2c_mapping[x]) | ||||
|             self.port_to_eeprom_mapping[x] = port_eeprom_path | ||||
|  | ||||
|         self.info_dict_keys = ['type', 'hardware_rev', 'serial', 'manufacturer', | ||||
|         self.info_dict_keys = ['type', 'vendor_rev', 'serial', 'manufacturer', | ||||
|             'model', 'connector', 'encoding', 'ext_identifier', | ||||
|             'ext_rateselect_compliance', 'cable_type', 'cable_length', | ||||
|             'nominal_bit_rate', 'specification_compliance', 'vendor_date', | ||||
| @@ -447,7 +447,7 @@ class Sfp(SfpBase): | ||||
|         keys                       |Value Format   |Information | ||||
|         ---------------------------|---------------|---------------------------- | ||||
|         type                       |1*255VCHAR     |type of SFP | ||||
|         hardware_rev               |1*255VCHAR     |hardware version of SFP | ||||
|         vendor_rev                 |1*255VCHAR     |vendor revision of SFP | ||||
|         serial                     |1*255VCHAR     |serial number of the SFP | ||||
|         manufacturer               |1*255VCHAR     |SFP vendor name | ||||
|         model                      |1*255VCHAR     |SFP model name | ||||
| @@ -544,7 +544,7 @@ class Sfp(SfpBase): | ||||
|             ['data']['Vendor Name']['value'] | ||||
|         transceiver_info_dict['model'] = sfp_vendor_pn_data \ | ||||
|             ['data']['Vendor PN']['value'] | ||||
|         transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data \ | ||||
|         transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data \ | ||||
|             ['data']['Vendor Rev']['value'] | ||||
|         transceiver_info_dict['serial'] = sfp_vendor_sn_data \ | ||||
|             ['data']['Vendor SN']['value'] | ||||
|   | ||||
| @@ -221,7 +221,7 @@ class Sfp(SfpBase): | ||||
|             port_eeprom_path = eeprom_path.format(self.port_to_i2c_mapping[x]) | ||||
|             self.port_to_eeprom_mapping[x] = port_eeprom_path | ||||
|  | ||||
|         self.info_dict_keys = ['type', 'hardware_rev', 'serial', 'manufacturer', | ||||
|         self.info_dict_keys = ['type', 'vendor_rev', 'serial', 'manufacturer', | ||||
|             'model', 'connector', 'encoding', 'ext_identifier', | ||||
|             'ext_rateselect_compliance', 'cable_type', 'cable_length', | ||||
|             'nominal_bit_rate', 'specification_compliance', 'vendor_date', | ||||
| @@ -447,7 +447,7 @@ class Sfp(SfpBase): | ||||
|         keys                       |Value Format   |Information | ||||
|         ---------------------------|---------------|---------------------------- | ||||
|         type                       |1*255VCHAR     |type of SFP | ||||
|         hardware_rev               |1*255VCHAR     |hardware version of SFP | ||||
|         vendor_rev                 |1*255VCHAR     |vendor revision of SFP | ||||
|         serial                     |1*255VCHAR     |serial number of the SFP | ||||
|         manufacturer               |1*255VCHAR     |SFP vendor name | ||||
|         model                      |1*255VCHAR     |SFP model name | ||||
| @@ -544,7 +544,7 @@ class Sfp(SfpBase): | ||||
|             ['data']['Vendor Name']['value'] | ||||
|         transceiver_info_dict['model'] = sfp_vendor_pn_data \ | ||||
|             ['data']['Vendor PN']['value'] | ||||
|         transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data \ | ||||
|         transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data \ | ||||
|             ['data']['Vendor Rev']['value'] | ||||
|         transceiver_info_dict['serial'] = sfp_vendor_sn_data \ | ||||
|             ['data']['Vendor SN']['value'] | ||||
|   | ||||
| @@ -243,7 +243,7 @@ class Sfp(SfpBase): | ||||
|             port_eeprom_path = eeprom_path.format(self.port_to_i2c_mapping[x]) | ||||
|             self.port_to_eeprom_mapping[x] = port_eeprom_path | ||||
|  | ||||
|         self.info_dict_keys = ['type', 'hardware_rev', 'serial', 'manufacturer', | ||||
|         self.info_dict_keys = ['type', 'vendor_rev', 'serial', 'manufacturer', | ||||
|             'model', 'connector', 'encoding', 'ext_identifier', | ||||
|             'ext_rateselect_compliance', 'cable_type', 'cable_length', | ||||
|             'nominal_bit_rate', 'specification_compliance', 'vendor_date', | ||||
| @@ -477,7 +477,7 @@ class Sfp(SfpBase): | ||||
|         keys                       |Value Format   |Information | ||||
|         ---------------------------|---------------|---------------------------- | ||||
|         type                       |1*255VCHAR     |type of SFP | ||||
|         hardware_rev               |1*255VCHAR     |hardware version of SFP | ||||
|         vendor_rev                 |1*255VCHAR     |vendor revision of SFP | ||||
|         serial                     |1*255VCHAR     |serial number of the SFP | ||||
|         manufacturer               |1*255VCHAR     |SFP vendor name | ||||
|         model                      |1*255VCHAR     |SFP model name | ||||
| @@ -574,7 +574,7 @@ class Sfp(SfpBase): | ||||
|             ['data']['Vendor Name']['value'] | ||||
|         transceiver_info_dict['model'] = sfp_vendor_pn_data \ | ||||
|             ['data']['Vendor PN']['value'] | ||||
|         transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data \ | ||||
|         transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data \ | ||||
|             ['data']['Vendor Rev']['value'] | ||||
|         transceiver_info_dict['serial'] = sfp_vendor_sn_data \ | ||||
|             ['data']['Vendor SN']['value'] | ||||
|   | ||||
| @@ -243,7 +243,7 @@ class Sfp(SfpBase): | ||||
|             port_eeprom_path = eeprom_path.format(self.port_to_i2c_mapping[x]) | ||||
|             self.port_to_eeprom_mapping[x] = port_eeprom_path | ||||
|  | ||||
|         self.info_dict_keys = ['type', 'hardware_rev', 'serial', 'manufacturer', | ||||
|         self.info_dict_keys = ['type', 'vendor_rev', 'serial', 'manufacturer', | ||||
|             'model', 'connector', 'encoding', 'ext_identifier', | ||||
|             'ext_rateselect_compliance', 'cable_type', 'cable_length', | ||||
|             'nominal_bit_rate', 'specification_compliance', 'vendor_date', | ||||
| @@ -477,7 +477,7 @@ class Sfp(SfpBase): | ||||
|         keys                       |Value Format   |Information | ||||
|         ---------------------------|---------------|---------------------------- | ||||
|         type                       |1*255VCHAR     |type of SFP | ||||
|         hardware_rev               |1*255VCHAR     |hardware version of SFP | ||||
|         vendor_rev                 |1*255VCHAR     |vendor revision of SFP | ||||
|         serial                     |1*255VCHAR     |serial number of the SFP | ||||
|         manufacturer               |1*255VCHAR     |SFP vendor name | ||||
|         model                      |1*255VCHAR     |SFP model name | ||||
| @@ -574,7 +574,7 @@ class Sfp(SfpBase): | ||||
|             ['data']['Vendor Name']['value'] | ||||
|         transceiver_info_dict['model'] = sfp_vendor_pn_data \ | ||||
|             ['data']['Vendor PN']['value'] | ||||
|         transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data \ | ||||
|         transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data \ | ||||
|             ['data']['Vendor Rev']['value'] | ||||
|         transceiver_info_dict['serial'] = sfp_vendor_sn_data \ | ||||
|             ['data']['Vendor SN']['value'] | ||||
|   | ||||
| @@ -243,7 +243,7 @@ class Sfp(SfpBase): | ||||
|             port_eeprom_path = eeprom_path.format(self.port_to_i2c_mapping[x]) | ||||
|             self.port_to_eeprom_mapping[x] = port_eeprom_path | ||||
|  | ||||
|         self.info_dict_keys = ['type', 'hardware_rev', 'serialnum', 'manufacturer', | ||||
|         self.info_dict_keys = ['type', 'vendor_rev', 'serialnum', 'manufacturer', | ||||
|             'model', 'connector', 'encoding', 'ext_identifier', | ||||
|             'ext_rateselect_compliance', 'cable_type', 'cable_length', | ||||
|             'nominal_bit_rate', 'specification_compliance', 'vendor_date', | ||||
| @@ -477,7 +477,7 @@ class Sfp(SfpBase): | ||||
|         keys                       |Value Format   |Information | ||||
|         ---------------------------|---------------|---------------------------- | ||||
|         type                       |1*255VCHAR     |type of SFP | ||||
|         hardware_rev                |1*255VCHAR     |hardware version of SFP | ||||
|         vendor_rev                 |1*255VCHAR     |vendor revision of SFP | ||||
|         serialnum                  |1*255VCHAR     |serial number of the SFP | ||||
|         manufacturer            |1*255VCHAR     |SFP vendor name | ||||
|         model                  |1*255VCHAR     |SFP model name | ||||
| @@ -574,7 +574,7 @@ class Sfp(SfpBase): | ||||
|             ['data']['Vendor Name']['value'] | ||||
|         transceiver_info_dict['model'] = sfp_vendor_pn_data \ | ||||
|             ['data']['Vendor PN']['value'] | ||||
|         transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data \ | ||||
|         transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data \ | ||||
|             ['data']['Vendor Rev']['value'] | ||||
|         transceiver_info_dict['serial'] = sfp_vendor_sn_data \ | ||||
|             ['data']['Vendor SN']['value'] | ||||
|   | ||||
| @@ -326,7 +326,7 @@ class Sfp(SfpBase): | ||||
|  | ||||
|         self._detect_sfp_type(sfp_type) | ||||
|  | ||||
|         self.info_dict_keys = ['type', 'hardware_rev', 'serial', 'manufacturer', | ||||
|         self.info_dict_keys = ['type', 'vendor_rev', 'serial', 'manufacturer', | ||||
|             'model', 'connector', 'encoding', 'ext_identifier', | ||||
|             'ext_rateselect_compliance', 'cable_type', 'cable_length', | ||||
|             'nominal_bit_rate', 'specification_compliance', 'vendor_date', 'vendor_oui', 'application_advertisement'] | ||||
| @@ -595,7 +595,7 @@ class Sfp(SfpBase): | ||||
|         keys                       |Value Format   |Information | ||||
|         ---------------------------|---------------|---------------------------- | ||||
|         type                       |1*255VCHAR     |type of SFP | ||||
|         hardware_rev               |1*255VCHAR     |hardware version of SFP | ||||
|         vendor_rev                 |1*255VCHAR     |vendor revision of SFP | ||||
|         serial                     |1*255VCHAR     |serial number of the SFP | ||||
|         manufacturer               |1*255VCHAR     |SFP vendor name | ||||
|         model                      |1*255VCHAR     |SFP model name | ||||
| @@ -668,7 +668,7 @@ class Sfp(SfpBase): | ||||
|             transceiver_info_dict['type'] = sfp_type_data['data']['type']['value'] | ||||
|             transceiver_info_dict['manufacturer'] = sfp_vendor_name_data['data']['Vendor Name']['value'] | ||||
|             transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] | ||||
|             transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] | ||||
|             transceiver_info_dict['vendor_oui'] = 'N/A' | ||||
|             transceiver_info_dict['vendor_date'] = 'N/A' | ||||
| @@ -793,7 +793,7 @@ class Sfp(SfpBase): | ||||
|             transceiver_info_dict['type'] = str(sfp_type_data['data']['type']['value']) | ||||
|             transceiver_info_dict['manufacturer'] = str(sfp_vendor_name_data['data']['Vendor Name']['value']) | ||||
|             transceiver_info_dict['model'] = str(sfp_vendor_pn_data['data']['Vendor PN']['value']) | ||||
|             transceiver_info_dict['hardware_rev'] = str(sfp_vendor_rev_data['data']['Vendor Rev']['value']) | ||||
|             transceiver_info_dict['vendor_rev'] = str(sfp_vendor_rev_data['data']['Vendor Rev']['value']) | ||||
|             transceiver_info_dict['serial'] = str(sfp_vendor_sn_data['data']['Vendor SN']['value']) | ||||
|             transceiver_info_dict['vendor_oui'] = str(sfp_vendor_oui_data['data']['Vendor OUI']['value']) | ||||
|             transceiver_info_dict['vendor_date'] = str(sfp_vendor_date_data['data']['VendorDataCode(YYYY-MM-DD Lot)']['value']) | ||||
| @@ -867,7 +867,7 @@ class Sfp(SfpBase): | ||||
|             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['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] | ||||
|             transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['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'] | ||||
|   | ||||
| @@ -179,7 +179,7 @@ class Sfp(SfpBase): | ||||
|         for x in range(PORT_START, PORTS_IN_BLOCK): | ||||
|             self.port_to_i2cbus_mapping[x] = (x + EEPROM_OFFSET) | ||||
|  | ||||
|         self.info_dict_keys = ['type', 'hardware_rev', 'serial', 'manufacturer', 'model', 'connector', 'encoding', 'ext_identifier', | ||||
|         self.info_dict_keys = ['type', 'vendor_rev', 'serial', 'manufacturer', 'model', 'connector', 'encoding', 'ext_identifier', | ||||
|                                'ext_rateselect_compliance', 'cable_type', 'cable_length', 'nominal_bit_rate', 'specification_compliance', 'vendor_date', 'vendor_oui'] | ||||
|  | ||||
|         self.dom_dict_keys = ['rx_los', 'tx_fault', 'reset_status', 'lp_mode', 'tx_disable', 'tx_disabled_channel', 'temperature', 'voltage', | ||||
| @@ -437,7 +437,7 @@ class Sfp(SfpBase): | ||||
|         keys                       |Value Format   |Information | ||||
|         ---------------------------|---------------|---------------------------- | ||||
|         type                       |1*255VCHAR     |type of SFP | ||||
|         hardware_rev               |1*255VCHAR     |hardware version of SFP | ||||
|         vendor_rev                 |1*255VCHAR     |vendor revision of SFP | ||||
|         serial                     |1*255VCHAR     |serial number of the SFP | ||||
|         manufacturer               |1*255VCHAR     |SFP vendor name | ||||
|         model                      |1*255VCHAR     |SFP model name | ||||
| @@ -526,7 +526,7 @@ class Sfp(SfpBase): | ||||
|         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['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] | ||||
|         transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|         transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|         transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] | ||||
|         transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data['data']['Vendor OUI']['value'] | ||||
|         transceiver_info_dict['vendor_date'] = sfp_vendor_date_data[ | ||||
|   | ||||
| @@ -475,7 +475,7 @@ class Sfp(SfpBase): | ||||
|         keys                       |Value Format   |Information | ||||
|         ---------------------------|---------------|---------------------------- | ||||
|         type                       |1*255VCHAR     |type of SFP | ||||
|         hardware_rev               |1*255VCHAR     |hardware version of SFP | ||||
|         vendor_rev                 |1*255VCHAR     |vendor revision of SFP | ||||
|         serial                     |1*255VCHAR     |serial number of the SFP | ||||
|         manufacturer               |1*255VCHAR     |SFP vendor name | ||||
|         model                      |1*255VCHAR     |SFP model name | ||||
| @@ -491,7 +491,7 @@ class Sfp(SfpBase): | ||||
|         ======================================================================== | ||||
|          """ | ||||
|         transceiver_info_dict_keys = [ | ||||
|             'type',                      'hardware_rev', | ||||
|             'type',                      'vendor_rev', | ||||
|             'serial',                 'manufacturer', | ||||
|             'model',                 'connector', | ||||
|             'encoding',                  'ext_identifier', | ||||
| @@ -571,7 +571,7 @@ class Sfp(SfpBase): | ||||
|         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['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] | ||||
|         transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|         transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|         transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] | ||||
|         transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data['data']['Vendor OUI']['value'] | ||||
|         transceiver_info_dict['vendor_date'] = sfp_vendor_date_data[ | ||||
|   | ||||
| @@ -138,7 +138,7 @@ class Sfp(SfpBase): | ||||
|  | ||||
|         self.port_to_eeprom_mapping[index] = eeprom_path | ||||
|  | ||||
|         self.info_dict_keys = ['type', 'hardware_rev', 'serial', 'manufacturer', | ||||
|         self.info_dict_keys = ['type', 'vendor_rev', 'serial', 'manufacturer', | ||||
|                                'model', 'connector', 'encoding', 'ext_identifier', | ||||
|                                'ext_rateselect_compliance', 'cable_type', 'cable_length', | ||||
|                                'nominal_bit_rate', 'specification_compliance', | ||||
| @@ -262,7 +262,7 @@ class Sfp(SfpBase): | ||||
|         keys                       |Value Format   |Information | ||||
|         ---------------------------|---------------|---------------------------- | ||||
|         type                       |1*255VCHAR     |type of SFP | ||||
|         hardware_rev               |1*255VCHAR     |hardware version of SFP | ||||
|         vendor_rev                 |1*255VCHAR     |vendor revision of SFP | ||||
|         serial                     |1*255VCHAR     |serial number of the SFP | ||||
|         manufacturer               |1*255VCHAR     |SFP vendor name | ||||
|         model                      |1*255VCHAR     |SFP model name | ||||
| @@ -345,7 +345,7 @@ class Sfp(SfpBase): | ||||
|                 ['data']['Vendor Name']['value'] | ||||
|             transceiver_info_dict['model'] = sfp_vendor_pn_data \ | ||||
|                 ['data']['Vendor PN']['value'] | ||||
|             transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data \ | ||||
|             transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data \ | ||||
|                 ['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['serial'] = sfp_vendor_sn_data \ | ||||
|                 ['data']['Vendor SN']['value'] | ||||
|   | ||||
| @@ -705,7 +705,7 @@ class SFP(SfpBase): | ||||
|         keys                       |Value Format   |Information | ||||
|         ---------------------------|---------------|---------------------------- | ||||
|         type                       |1*255VCHAR     |type of SFP | ||||
|         hardware_rev               |1*255VCHAR     |hardware version of SFP | ||||
|         vendor_rev                 |1*255VCHAR     |vendor revision of SFP | ||||
|         serial                     |1*255VCHAR     |serial number of the SFP | ||||
|         manufacturer               |1*255VCHAR     |SFP vendor name | ||||
|         model                      |1*255VCHAR     |SFP model name | ||||
| @@ -768,7 +768,7 @@ class SFP(SfpBase): | ||||
|             transceiver_info_dict['type'] = sfp_type_data['data']['type']['value'] | ||||
|             transceiver_info_dict['manufacturer'] = sfp_vendor_name_data['data']['Vendor Name']['value'] | ||||
|             transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] | ||||
|             transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] | ||||
|             transceiver_info_dict['vendor_oui'] = 'N/A' | ||||
|             transceiver_info_dict['vendor_date'] = 'N/A' | ||||
| @@ -893,7 +893,7 @@ class SFP(SfpBase): | ||||
|             transceiver_info_dict['type'] = str(sfp_type_data['data']['type']['value']) | ||||
|             transceiver_info_dict['manufacturer'] = str(sfp_vendor_name_data['data']['Vendor Name']['value']) | ||||
|             transceiver_info_dict['model'] = str(sfp_vendor_pn_data['data']['Vendor PN']['value']) | ||||
|             transceiver_info_dict['hardware_rev'] = str(sfp_vendor_rev_data['data']['Vendor Rev']['value']) | ||||
|             transceiver_info_dict['vendor_rev'] = str(sfp_vendor_rev_data['data']['Vendor Rev']['value']) | ||||
|             transceiver_info_dict['serial'] = str(sfp_vendor_sn_data['data']['Vendor SN']['value']) | ||||
|             transceiver_info_dict['vendor_oui'] = str(sfp_vendor_oui_data['data']['Vendor OUI']['value']) | ||||
|             transceiver_info_dict['vendor_date'] = str(sfp_vendor_date_data['data']['VendorDataCode(YYYY-MM-DD Lot)']['value']) | ||||
| @@ -953,7 +953,7 @@ class SFP(SfpBase): | ||||
|             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['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] | ||||
|             transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] | ||||
|             transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['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'] | ||||
|   | ||||
| @@ -187,7 +187,7 @@ class PddfSfp(SfpBase): | ||||
|         self.is_osfp_port = True if (self.sfp_type == 'OSFP' or self.sfp_type == 'QSFP-DD') else False | ||||
|         self.eeprom_path = self.pddf_obj.get_path(self.device, 'eeprom') | ||||
|  | ||||
|         self.info_dict_keys = ['type', 'hardware_rev', 'serial', 'manufacturer', 'model', 'connector', 'encoding', | ||||
|         self.info_dict_keys = ['type', 'vendor_rev', 'serial', 'manufacturer', 'model', 'connector', 'encoding', | ||||
|                                'ext_identifier', 'ext_rateselect_compliance', 'cable_type', 'cable_length', | ||||
|                                'nominal_bit_rate', 'specification_compliance', 'vendor_date', 'vendor_oui', | ||||
|                                'application_advertisement'] | ||||
| @@ -213,7 +213,7 @@ class PddfSfp(SfpBase): | ||||
|         keys                       |Value Format   |Information | ||||
|         ---------------------------|---------------|---------------------------- | ||||
|         type                       |1*255VCHAR     |type of SFP | ||||
|         hardware_rev                |1*255VCHAR     |hardware version of SFP | ||||
|         vendor_rev                 |1*255VCHAR     |vendor revision of SFP | ||||
|         serial                  |1*255VCHAR     |serial number of the SFP | ||||
|         manufacturer            |1*255VCHAR     |SFP vendor name | ||||
|         model                  |1*255VCHAR     |SFP model name | ||||
| @@ -330,7 +330,7 @@ class PddfSfp(SfpBase): | ||||
|         xcvr_info_dict['manufacturer'] = sfp_vendor_name_data['data']['Vendor Name']['value'] \ | ||||
|             if sfp_vendor_name_data else 'N/A' | ||||
|         xcvr_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] if sfp_vendor_pn_data else 'N/A' | ||||
|         xcvr_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] \ | ||||
|         xcvr_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] \ | ||||
|             if sfp_vendor_rev_data else 'N/A' | ||||
|         xcvr_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] if sfp_vendor_sn_data else 'N/A' | ||||
|         xcvr_info_dict['vendor_oui'] = sfp_vendor_oui_data['data']['Vendor OUI']['value'] \ | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Aravind Mani
					Aravind Mani