Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EEPROM "application advertisement" cannot display customized informat… #394

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+61 −9
Open

EEPROM "application advertisement" cannot display customized informat… #394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5df2f44
EEPROM "application advertisement" cannot display customized informat…
chiourung Aug 8, 2023
7e70e97
Merge branch 'master' into application
chiourung Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sonic_platform_base/sonic_xcvr/api/public/cmis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2031,7 +2031,7 @@ def get_application_advertisement(self):

key = "{}_{}".format(consts.HOST_ELECTRICAL_INTERFACE, app)
val = dic.get(key)
if val in [None, 'Unknown', 'Undefined']:
if val in [None, 'End', 'Undefined']:
break
buf['host_electrical_interface_id'] = val

Expand All @@ -2040,7 +2040,7 @@ def get_application_advertisement(self):
break
key = "{}_{}".format(prefix, app)
val = dic.get(key)
if val in [None, 'Unknown']:
if val in [None]:
break
buf['module_media_interface_id'] = val

Expand Down
64 changes: 58 additions & 6 deletions sonic_platform_base/sonic_xcvr/codes/public/sff8024.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,14 +250,28 @@ class Sff8024(XcvrCodes):
64: 'FOIC4.8 (ITU-T G.709.1 G.Sup58)',
65: 'CAUI-4 C2M (Annex 83E) without FEC',
66: 'CAUI-4 C2M (Annex 83E) with RS(528,514) FEC',
67: '50GBASE-CR2 (Ethernet Technology Consortium) with RS(528,514) (Clause 91) FEC',
68: '50GBASE-CR2 (Ethernet Technology Consortium) with BASE-R (Clause 74), Fire code FEC',
69: '50GBASE-CR2 (Ethernet Technology Consortium) with no FEC',
70: '100GBASE-CR1 (Clause 162)',
71: '200GBASE-CR2 (Clause 162)',
72: '400GBASE-CR4 (Clause 162)',
73: '800GBASE-CR8 (placeholder)',
74: '128GFC (FC-PI-8)',
75: '100GAUI-1-S C2M (Annex 120G)',
76: '100GAUI-1-L C2M (Annex 120G)',
77: '200GAUI-2-S C2M (Annex 120G)',
78: '200GAUI-2-L C2M (Annex 120G)',
79: '400GAUI-4-S C2M (Annex 120G)',
80: '400GAUI-4-L C2M (Annex 120G)',
81: '800G S C2M (placeholder)',
82: '800G L C2M (placeholder)'
82: '800G L C2M (placeholder)',
255: 'End'
}

for i in range(192,255):
HOST_ELECTRICAL_INTERFACE[i] = 'Vendor specific: {}'.format(i)

NM_850_MEDIA_INTERFACE = {
0: 'Undefined',
1: '10GBASE-SW (Clause 52)',
Expand All @@ -278,16 +292,24 @@ class Sff8024(XcvrCodes):
16: '400GBASE-SR8 (Clause 138)',
17: '400G-SR4 (Placeholder)',
18: '800G-SR8 (Placeholder)',
26: '400GBASE-SR4.2 (Clause 150) (400GE BiDi)',
19: '8GFC-MM (FC-PI-4)',
20: '10GFC-MM (10GFC)',
21: '16GFC-MM (FC-PI-5)',
22: '32GFC-MM (FC-PI-6)',
23: '64GFC-MM (FC-PI 7)',
24: '128GFC-MM4 (FC-PI-6P)',
25: '256GFC-MM4 (FC-PI-7P)'
25: '256GFC-MM4 (FC-PI-7P)',
26: '400GBASE-SR4.2 (Clause 150) (400GE BiDi)',
27: '200GBASE-SR2 (Clause 167)',
28: '128GFC-MM (FC-PI-8)',
29: '100GBASE-VR (Clause 167)',
30: '200GBASE-VR2 (Clause 167)',
31: '400GBASE-VR4 (Clause 167)'
}

for i in range(192,256):
NM_850_MEDIA_INTERFACE[i] = 'Vendor specific: {}'.format(i)

SM_MEDIA_INTERFACE = {
0: 'Undefined',
1: '10GBASE-LW (Cl 52)',
Expand Down Expand Up @@ -337,6 +359,7 @@ class Sff8024(XcvrCodes):
49: '4I1-4D1F (G.959.1)',
50: '8R1-4D1F (G.959.1)',
51: '8I1-4D1F (G.959.1)',
52: '100G CWDM4-OCP',
56: '10G-SR',
57: '10G-LR',
58: '25G-SR',
Expand All @@ -345,18 +368,38 @@ class Sff8024(XcvrCodes):
61: '25G-LR-BiDi',
62: '400ZR, DWDM, amplified',
63: '400ZR, Single Wavelength, Unamplified',
64: '50GBASE-ER (Clause 139)',
65: '200GBASE-ER4 (Clause 122)',
66: '400GBASE-ER8 (Clause 122)',
67: '400GBASE-LR4-6 (Clause 151)',
68: '100GBASE-ZR (Clause 154)',
69: '128GFC-SM (FC-PI-8)',
70: 'ZR400-OFEC-16QAM',
71: 'ZR300-OFEC-8QAM',
72: 'ZR200-OFEC-QPSK',
73: 'ZR100-OFEC-QPSK'
73: 'ZR100-OFEC-QPSK',
74: '100G-LR1-20 MSA Spec',
75: '100G-ER1-30 MSA Spec',
76: '100G-ER1-40 MSA Spec',
77: '400GBASE-ZR (Clause 156)',
78: '10GBASE-BR (Clause 158)',
79: '25GBASE-BR (Clause 159)',
80: '50GBASE-BR (Clause 160)'
}

for i in range(192,256):
SM_MEDIA_INTERFACE[i] = 'Vendor specific: {}'.format(i)

PASSIVE_COPPER_MEDIA_INTERFACE = {
0: 'Undefined',
1: 'Copper cable',
2: 'Passive Loopback module'
2: 'Passive Loopback module',
191: 'Passive Loopback module'
}

for i in range(192,256):
PASSIVE_COPPER_MEDIA_INTERFACE[i] = 'Vendor specific: {}'.format(i)

ACTIVE_CABLE_MEDIA_INTERFACE = {
0: 'Undefined',
1: 'Active Cable assembly with BER < 10^-12',
Expand All @@ -366,12 +409,21 @@ class Sff8024(XcvrCodes):
191: 'Active Loopback module'
}

for i in range(192,256):
ACTIVE_CABLE_MEDIA_INTERFACE[i] = 'Vendor specific: {}'.format(i)

BASE_T_MEDIA_INTERFACE = {
0: 'Undefined',
1: '1000BASE-T (Clause 40)',
2: '2.5GBASE-T (Clause 126)',
3: '5GBASE-T (Clause 126)',
4: '10GBASE-T (Clause 55)'
4: '10GBASE-T (Clause 55)',
5: '25GBASE-T (Clause 113)',
6: '40GBASE-T (Clause 113)',
7: '50GBASE-T (Placeholder)'
}

for i in range(192,256):
BASE_T_MEDIA_INTERFACE[i] = 'Vendor specific: {}'.format(i)

# TODO: Add other codes
2 changes: 1 addition & 1 deletion sonic_platform_base/sonic_xcvr/fields/xcvr_field.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ def decode(self, raw_data, **decoded_deps):
if mask is not None:
code &= mask
code >>= self.start_bitpos
return self.code_dict.get(code, "Unknown")
return self.code_dict.get(code, "Unknown: {}".format(code))

class HexRegField(RegField):
"""
Expand Down
Loading