Skip to content

Commit 656ade1

Browse files
aravindmani-1aravindmani-1
authored
SFP-Refactor: Vendor revision is not displayed properly (sonic-net#1950)
* SFP: Vendor revision is not displayed properly
1 parent 67466cb commit 656ade1

File tree

8 files changed

+41
-41
lines changed

8 files changed

+41
-41
lines changed

‎scripts/sfpshow

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ QSFP_DATA_MAP = {
3838
'vendor_oui': 'Vendor OUI',
3939
'vendor_date': 'Vendor Date Code(YYYY-MM-DD Lot)',
4040
'manufacturer': 'Vendor Name',
41-
'hardware_rev': 'Vendor Rev',
41+
'vendor_rev': 'Vendor Rev',
4242
'serial': 'Vendor SN',
4343
'type': 'Identifier',
4444
'ext_identifier': 'Extended Identifier',

‎sfputil/main.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
'vendor_oui': 'Vendor OUI',
4040
'vendor_date': 'Vendor Date Code(YYYY-MM-DD Lot)',
4141
'manufacturer': 'Vendor Name',
42-
'hardware_rev': 'Vendor Rev',
42+
'vendor_rev': 'Vendor Rev',
4343
'serial': 'Vendor SN',
4444
'type': 'Identifier',
4545
'ext_identifier': 'Extended Identifier',

‎tests/mock_tables/asic0/state_db.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"TRANSCEIVER_INFO|Ethernet0": {
33
"type": "QSFP28 or later",
4-
"hardware_rev": "AC",
4+
"vendor_rev": "AC",
55
"serial": "MT1706FT02064",
66
"manufacturer": "Mellanox",
77
"model": "MFA1A00-C003",

‎tests/mock_tables/asic1/state_db.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"TRANSCEIVER_INFO|Ethernet64": {
33
"type": "QSFP28 or later",
4-
"hardware_rev": "AC",
4+
"vendor_rev": "AC",
55
"serial": "MT1706FT02064",
66
"manufacturer": "Mellanox",
77
"model": "MFA1A00-C003",

‎tests/mock_tables/asic2/state_db.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"TRANSCEIVER_INFO|Ethernet20": {
33
"type": "QSFP28 or later",
4-
"hardware_rev": "AC",
4+
"vendor_rev": "AC",
55
"serial": "MT1706FT02064",
66
"manufacturer": "Mellanox",
77
"model": "MFA1A00-C003",

‎tests/mock_tables/state_db.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"TRANSCEIVER_INFO|Ethernet0": {
33
"type": "QSFP28 or later",
4-
"hardware_rev": "AC",
4+
"vendor_rev": "AC",
55
"serial": "MT1706FT02064",
66
"manufacturer": "Mellanox",
77
"model": "MFA1A00-C003",
@@ -19,7 +19,7 @@
1919
},
2020
"TRANSCEIVER_INFO|Ethernet12": {
2121
"type": "QSFP28 or later",
22-
"hardware_rev": "AC",
22+
"vendor_rev": "AC",
2323
"serial": "MT1706FT02064",
2424
"manufacturer": "Credo",
2525
"model": "CACL1X321P2PA1MS",
@@ -69,7 +69,7 @@
6969
},
7070
"TRANSCEIVER_INFO|Ethernet8": {
7171
"type": "QSFP-DD Double Density 8X Pluggable Transceiver",
72-
"hardware_rev": "2A",
72+
"vendor_rev": "2A",
7373
"serial": "INKAO2900002A",
7474
"manufacturer": "INNOLIGHT",
7575
"model": "C-DQ8FNM010-N00",

‎tests/mock_tables/t1/state_db.json

+32-32
Original file line numberDiff line numberDiff line change
@@ -6823,7 +6823,7 @@
68236823
"encoding": "Unspecified",
68246824
"ext_identifier": "Power Class 1(1.5W max)",
68256825
"ext_rateselect_compliance": "QSFP+ Rate Select Version 1",
6826-
"hardware_rev": "",
6826+
"vendor_rev": "",
68276827
"manufacturer": "Molex",
68286828
"model": "1002979026",
68296829
"nominal_bit_rate": "0",
@@ -6846,7 +6846,7 @@
68466846
"encoding": "Unspecified",
68476847
"ext_identifier": "Power Class 1(1.5W max)",
68486848
"ext_rateselect_compliance": "QSFP+ Rate Select Version 1",
6849-
"hardware_rev": "",
6849+
"vendor_rev": "",
68506850
"manufacturer": "Molex",
68516851
"model": "1002971101",
68526852
"nominal_bit_rate": "255",
@@ -6869,7 +6869,7 @@
68696869
"encoding": "Unspecified",
68706870
"ext_identifier": "Power Class 1(1.5W max)",
68716871
"ext_rateselect_compliance": "QSFP+ Rate Select Version 1",
6872-
"hardware_rev": "",
6872+
"vendor_rev": "",
68736873
"manufacturer": "Molex",
68746874
"model": "1002971101",
68756875
"nominal_bit_rate": "255",
@@ -6892,7 +6892,7 @@
68926892
"encoding": "Unspecified",
68936893
"ext_identifier": "Power Class 1(1.5W max)",
68946894
"ext_rateselect_compliance": "QSFP+ Rate Select Version 1",
6895-
"hardware_rev": "",
6895+
"vendor_rev": "",
68966896
"manufacturer": "Molex",
68976897
"model": "1002971101",
68986898
"nominal_bit_rate": "255",
@@ -6915,7 +6915,7 @@
69156915
"encoding": "64B66B",
69166916
"ext_identifier": "Power Class 1(1.5W max)",
69176917
"ext_rateselect_compliance": "QSFP+ Rate Select Version 1",
6918-
"hardware_rev": "P",
6918+
"vendor_rev": "P",
69196919
"manufacturer": "Amphenol",
69206920
"model": "NDAAFF-0006",
69216921
"nominal_bit_rate": "255",
@@ -6938,7 +6938,7 @@
69386938
"encoding": "Unspecified",
69396939
"ext_identifier": "Power Class 1(1.5W max)",
69406940
"ext_rateselect_compliance": "QSFP+ Rate Select Version 1",
6941-
"hardware_rev": "",
6941+
"vendor_rev": "",
69426942
"manufacturer": "Molex",
69436943
"model": "1002971101",
69446944
"nominal_bit_rate": "255",
@@ -6961,7 +6961,7 @@
69616961
"encoding": "Unspecified",
69626962
"ext_identifier": "Power Class 1(1.5W max)",
69636963
"ext_rateselect_compliance": "QSFP+ Rate Select Version 1",
6964-
"hardware_rev": "",
6964+
"vendor_rev": "",
69656965
"manufacturer": "Molex",
69666966
"model": "1002979026",
69676967
"nominal_bit_rate": "0",
@@ -6984,7 +6984,7 @@
69846984
"encoding": "Unspecified",
69856985
"ext_identifier": "Power Class 1(1.5W max)",
69866986
"ext_rateselect_compliance": "QSFP+ Rate Select Version 1",
6987-
"hardware_rev": "",
6987+
"vendor_rev": "",
69886988
"manufacturer": "Molex",
69896989
"model": "1002971101",
69906990
"nominal_bit_rate": "255",
@@ -7007,7 +7007,7 @@
70077007
"encoding": "Unspecified",
70087008
"ext_identifier": "Power Class 1(1.5W max)",
70097009
"ext_rateselect_compliance": "QSFP+ Rate Select Version 1",
7010-
"hardware_rev": "",
7010+
"vendor_rev": "",
70117011
"manufacturer": "Molex",
70127012
"model": "1002979026",
70137013
"nominal_bit_rate": "0",
@@ -7030,7 +7030,7 @@
70307030
"encoding": "Unspecified",
70317031
"ext_identifier": "Power Class 1(1.5W max)",
70327032
"ext_rateselect_compliance": "QSFP+ Rate Select Version 1",
7033-
"hardware_rev": "",
7033+
"vendor_rev": "",
70347034
"manufacturer": "Molex",
70357035
"model": "1002979026",
70367036
"nominal_bit_rate": "0",
@@ -7053,7 +7053,7 @@
70537053
"encoding": "Unspecified",
70547054
"ext_identifier": "Power Class 1(1.5W max)",
70557055
"ext_rateselect_compliance": "QSFP+ Rate Select Version 1",
7056-
"hardware_rev": "",
7056+
"vendor_rev": "",
70577057
"manufacturer": "Molex",
70587058
"model": "1002979026",
70597059
"nominal_bit_rate": "0",
@@ -7076,7 +7076,7 @@
70767076
"encoding": "Unspecified",
70777077
"ext_identifier": "Power Class 1(1.5W max)",
70787078
"ext_rateselect_compliance": "QSFP+ Rate Select Version 1",
7079-
"hardware_rev": "",
7079+
"vendor_rev": "",
70807080
"manufacturer": "Molex",
70817081
"model": "1002979026",
70827082
"nominal_bit_rate": "0",
@@ -7099,7 +7099,7 @@
70997099
"encoding": "Unspecified",
71007100
"ext_identifier": "Power Class 1(1.5W max)",
71017101
"ext_rateselect_compliance": "QSFP+ Rate Select Version 1",
7102-
"hardware_rev": "",
7102+
"vendor_rev": "",
71037103
"manufacturer": "Molex",
71047104
"model": "1002979026",
71057105
"nominal_bit_rate": "0",
@@ -7122,7 +7122,7 @@
71227122
"encoding": "64B66B",
71237123
"ext_identifier": "Power Class 1(1.5W max)",
71247124
"ext_rateselect_compliance": "QSFP+ Rate Select Version 1",
7125-
"hardware_rev": "C",
7125+
"vendor_rev": "C",
71267126
"manufacturer": "Amphenol",
71277127
"model": "NDAAFF-M202",
71287128
"nominal_bit_rate": "255",
@@ -7145,7 +7145,7 @@
71457145
"encoding": "Unspecified",
71467146
"ext_identifier": "Power Class 1(1.5W max)",
71477147
"ext_rateselect_compliance": "QSFP+ Rate Select Version 1",
7148-
"hardware_rev": "",
7148+
"vendor_rev": "",
71497149
"manufacturer": "Molex",
71507150
"model": "1002979026",
71517151
"nominal_bit_rate": "0",
@@ -7168,7 +7168,7 @@
71687168
"encoding": "Unspecified",
71697169
"ext_identifier": "Power Class 1(1.5W max)",
71707170
"ext_rateselect_compliance": "QSFP+ Rate Select Version 1",
7171-
"hardware_rev": "",
7171+
"vendor_rev": "",
71727172
"manufacturer": "Molex",
71737173
"model": "1002979026",
71747174
"nominal_bit_rate": "0",
@@ -7191,7 +7191,7 @@
71917191
"encoding": "Unspecified",
71927192
"ext_identifier": "Power Class 1(1.5W max)",
71937193
"ext_rateselect_compliance": "QSFP+ Rate Select Version 1",
7194-
"hardware_rev": "",
7194+
"vendor_rev": "",
71957195
"manufacturer": "Molex",
71967196
"model": "1002971101",
71977197
"nominal_bit_rate": "255",
@@ -7214,7 +7214,7 @@
72147214
"encoding": "Unspecified",
72157215
"ext_identifier": "Power Class 1(1.5W max)",
72167216
"ext_rateselect_compliance": "QSFP+ Rate Select Version 1",
7217-
"hardware_rev": "",
7217+
"vendor_rev": "",
72187218
"manufacturer": "Molex",
72197219
"model": "1002971101",
72207220
"nominal_bit_rate": "255",
@@ -7237,7 +7237,7 @@
72377237
"encoding": "Unspecified",
72387238
"ext_identifier": "Power Class 1(1.5W max)",
72397239
"ext_rateselect_compliance": "QSFP+ Rate Select Version 1",
7240-
"hardware_rev": "",
7240+
"vendor_rev": "",
72417241
"manufacturer": "Molex",
72427242
"model": "1002971101",
72437243
"nominal_bit_rate": "255",
@@ -7260,7 +7260,7 @@
72607260
"encoding": "Unspecified",
72617261
"ext_identifier": "Power Class 1(1.5W max)",
72627262
"ext_rateselect_compliance": "QSFP+ Rate Select Version 1",
7263-
"hardware_rev": "",
7263+
"vendor_rev": "",
72647264
"manufacturer": "Molex",
72657265
"model": "1002971101",
72667266
"nominal_bit_rate": "255",
@@ -7283,7 +7283,7 @@
72837283
"encoding": "Unspecified",
72847284
"ext_identifier": "Power Class 1(1.5W max)",
72857285
"ext_rateselect_compliance": "QSFP+ Rate Select Version 1",
7286-
"hardware_rev": "",
7286+
"vendor_rev": "",
72877287
"manufacturer": "Molex",
72887288
"model": "1002971101",
72897289
"nominal_bit_rate": "255",
@@ -7306,7 +7306,7 @@
73067306
"encoding": "Unspecified",
73077307
"ext_identifier": "Power Class 1(1.5W max)",
73087308
"ext_rateselect_compliance": "QSFP+ Rate Select Version 1",
7309-
"hardware_rev": "",
7309+
"vendor_rev": "",
73107310
"manufacturer": "Molex",
73117311
"model": "1002971101",
73127312
"nominal_bit_rate": "255",
@@ -7329,7 +7329,7 @@
73297329
"encoding": "Unspecified",
73307330
"ext_identifier": "Power Class 1(1.5W max)",
73317331
"ext_rateselect_compliance": "QSFP+ Rate Select Version 1",
7332-
"hardware_rev": "",
7332+
"vendor_rev": "",
73337333
"manufacturer": "Molex",
73347334
"model": "1002971101",
73357335
"nominal_bit_rate": "255",
@@ -7352,7 +7352,7 @@
73527352
"encoding": "Unspecified",
73537353
"ext_identifier": "Power Class 1(1.5W max)",
73547354
"ext_rateselect_compliance": "QSFP+ Rate Select Version 1",
7355-
"hardware_rev": "",
7355+
"vendor_rev": "",
73567356
"manufacturer": "Molex",
73577357
"model": "1002971101",
73587358
"nominal_bit_rate": "255",
@@ -7375,7 +7375,7 @@
73757375
"encoding": "Unspecified",
73767376
"ext_identifier": "Power Class 1(1.5W max)",
73777377
"ext_rateselect_compliance": "QSFP+ Rate Select Version 1",
7378-
"hardware_rev": "",
7378+
"vendor_rev": "",
73797379
"manufacturer": "Molex",
73807380
"model": "1002971101",
73817381
"nominal_bit_rate": "255",
@@ -7398,7 +7398,7 @@
73987398
"encoding": "Unspecified",
73997399
"ext_identifier": "Power Class 1(1.5W max)",
74007400
"ext_rateselect_compliance": "QSFP+ Rate Select Version 1",
7401-
"hardware_rev": "",
7401+
"vendor_rev": "",
74027402
"manufacturer": "Molex",
74037403
"model": "1002971101",
74047404
"nominal_bit_rate": "255",
@@ -7421,7 +7421,7 @@
74217421
"encoding": "Unspecified",
74227422
"ext_identifier": "Power Class 1(1.5W max)",
74237423
"ext_rateselect_compliance": "QSFP+ Rate Select Version 1",
7424-
"hardware_rev": "",
7424+
"vendor_rev": "",
74257425
"manufacturer": "Molex",
74267426
"model": "1002979026",
74277427
"nominal_bit_rate": "0",
@@ -7444,7 +7444,7 @@
74447444
"encoding": "Unspecified",
74457445
"ext_identifier": "Power Class 1(1.5W max)",
74467446
"ext_rateselect_compliance": "QSFP+ Rate Select Version 1",
7447-
"hardware_rev": "",
7447+
"vendor_rev": "",
74487448
"manufacturer": "Molex",
74497449
"model": "1002971101",
74507450
"nominal_bit_rate": "255",
@@ -7467,7 +7467,7 @@
74677467
"encoding": "Unspecified",
74687468
"ext_identifier": "Power Class 1(1.5W max)",
74697469
"ext_rateselect_compliance": "QSFP+ Rate Select Version 1",
7470-
"hardware_rev": "",
7470+
"vendor_rev": "",
74717471
"manufacturer": "Molex",
74727472
"model": "1002971101",
74737473
"nominal_bit_rate": "255",
@@ -7490,7 +7490,7 @@
74907490
"encoding": "Unspecified",
74917491
"ext_identifier": "Power Class 1(1.5W max)",
74927492
"ext_rateselect_compliance": "QSFP+ Rate Select Version 1",
7493-
"hardware_rev": "",
7493+
"vendor_rev": "",
74947494
"manufacturer": "Molex",
74957495
"model": "1002971101",
74967496
"nominal_bit_rate": "255",
@@ -7513,7 +7513,7 @@
75137513
"encoding": "Unspecified",
75147514
"ext_identifier": "Power Class 1(1.5W max)",
75157515
"ext_rateselect_compliance": "QSFP+ Rate Select Version 1",
7516-
"hardware_rev": "",
7516+
"vendor_rev": "",
75177517
"manufacturer": "Molex",
75187518
"model": "1002971101",
75197519
"nominal_bit_rate": "255",
@@ -7536,7 +7536,7 @@
75367536
"encoding": "Unspecified",
75377537
"ext_identifier": "Power Class 1(1.5W max)",
75387538
"ext_rateselect_compliance": "QSFP+ Rate Select Version 1",
7539-
"hardware_rev": "",
7539+
"vendor_rev": "",
75407540
"manufacturer": "Molex",
75417541
"model": "1002971101",
75427542
"nominal_bit_rate": "255",

‎tests/sfputil_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def test_convert_sfp_info_to_output_string(self):
8383
'type_abbrv_name': 'QSFP28',
8484
'manufacturer': 'Mellanox',
8585
'model': 'MCP1600-C003',
86-
'hardware_rev': 'A2',
86+
'vendor_rev': 'A2',
8787
'serial': 'MT1636VS10561',
8888
'vendor_oui': '00-02-c9',
8989
'vendor_date': '2016-07-18',

0 commit comments

Comments
 (0)