Skip to content

Commit e1b86f3

Browse files
oplinksdnkmathewm
authored andcommitted
Support OTN
change to github path for submodules Modify config to disable some features not used on ot platform Fix EOL mirror issues for Buster and Bullseye by updating MIRROR_URLS The Bullseye release is now end-of-life, and the `bullseye-backports` entry is no longer available on the standard Debian mirrors, causing Docker image builds to fail. Due to the way `files/apt/sources.list.j2` is templated, the backports URL is generated using the shared `MIRROR_URLS` variable, which also affects the main and updates entries. Rather than restructuring the template to special- case `bullseye-backports`, this commit updates `DEFAULT_MIRROR_URLS` entirely for Bullseye to point to archive-capable mirrors that support all required repositories. In the case of Buster, `DEFAULT_MIRROR_SECURITY_URLS` was also updated to resolve similar build failures. - For Bullseye: uses `archive.debian.org` for main, updates, and backports, and `debian-archive.trafficmanager.net` specifically for security. - For Buster: uses `archive.debian.org` for main, updates backports and security. This approach keeps the templating logic simple and ensures stable builds for EOL releases using fully supported mirror endpoints. Fixes sonic-net#23430 and sonic-net#23336 Signed-off-by: Alberto Martin <alberto.martin@htecgroup.com> Support otn-kvm platform for OTN devices Signed-off-by: oplklum <lu.mao@molex.com> merge event and alarm management related to official sonic-net#22617 extend event function for platform event function changed libsai version to 1.1.0 use hal server version 1.1.0 supervisord does not spawn hal and HalApiServer anymore Fix submodule pointer for sonic-platform-daemons Update submodule sonic-swss-common to 202411_otn Update submodule sonic-sairedis to 202411_otn Update submodule sonic-swss 202411_otn Update submodule sonic-utilities 202411_otn
1 parent a55016c commit e1b86f3

File tree

116 files changed

+5867
-28
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+5867
-28
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"interfaces": {
3+
}
4+
}
Lines changed: 317 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,317 @@
1+
{
2+
"OTN_ATTENUATOR": {
3+
"VOA0-0": {
4+
"attenuation": "4.2",
5+
"attenuation-mode": "CONSTANT_ATTENUATION",
6+
"enabled": "true"
7+
},
8+
"VOA0-1": {
9+
"attenuation": "3.2",
10+
"attenuation-mode": "CONSTANT_ATTENUATION",
11+
"enabled": "true"
12+
}
13+
},
14+
"OTN_OA": {
15+
"OA0-0": {
16+
"target-gain": "4.2",
17+
"target-gain-tilt": "0.4",
18+
"gain-range": "FIXED_GAIN_RANGE",
19+
"amp-mode": "CONSTANT_GAIN",
20+
"enabled": "true",
21+
"type": "EDFA"
22+
},
23+
"OA0-1": {
24+
"target-gain": "5.2",
25+
"target-gain-tilt": "0.5",
26+
"gain-range": "FIXED_GAIN_RANGE",
27+
"amp-mode": "CONSTANT_GAIN",
28+
"enabled": "true",
29+
"type": "EDFA"
30+
}
31+
},
32+
"OTN_OSC": {
33+
"OSC0-0": {
34+
},
35+
"OSC0-1": {
36+
}
37+
},
38+
"OTN_OCM": {
39+
"OCM0-0|0": {
40+
"monitor-port": "LineIn"
41+
},
42+
"OCM0-0|1": {
43+
"monitor-port": "LineOut"
44+
},
45+
"OCM0-0|2": {
46+
"monitor-port": "ClientIn"
47+
},
48+
"OCM0-0|3": {
49+
"monitor-port": "ClientOut"
50+
},
51+
"OCM0-0|4": {
52+
"monitor-port": "OcmIn"
53+
}
54+
},
55+
"OTN_OCM_CHANNEL": {
56+
"OCM0-0|0|191262500": {
57+
"lower_frequency": 191262500,
58+
"upper_frequency": 191337500
59+
},
60+
"OCM0-0|0|191337500": {
61+
"lower_frequency": 191337500,
62+
"upper_frequency": 191412500
63+
},
64+
"OCM0-0|0|191412500": {
65+
"lower_frequency": 191412500,
66+
"upper_frequency": 191487500
67+
},
68+
"OCM0-0|0|191487500": {
69+
"lower_frequency": 191487500,
70+
"upper_frequency": 191562500
71+
},
72+
"OCM0-0|0|191562500": {
73+
"lower_frequency": 191562500,
74+
"upper_frequency": 191637500
75+
},
76+
"OCM0-0|0|191637500": {
77+
"lower_frequency": 191637500,
78+
"upper_frequency": 191712500
79+
},
80+
"OCM0-0|0|191712500": {
81+
"lower_frequency": 191712500,
82+
"upper_frequency": 191787500
83+
},
84+
"OCM0-0|0|191787500": {
85+
"lower_frequency": 191787500,
86+
"upper_frequency": 191862500
87+
},
88+
"OCM0-0|0|191862500": {
89+
"lower_frequency": 191862500,
90+
"upper_frequency": 191937500
91+
},
92+
"OCM0-0|0|191937500": {
93+
"lower_frequency": 191937500,
94+
"upper_frequency": 192012500
95+
},
96+
"OCM0-0|0|192012500": {
97+
"lower_frequency": 192012500,
98+
"upper_frequency": 192087500
99+
},
100+
"OCM0-0|0|192087500": {
101+
"lower_frequency": 192087500,
102+
"upper_frequency": 192162500
103+
},
104+
"OCM0-0|0|192162500": {
105+
"lower_frequency": 192162500,
106+
"upper_frequency": 192237500
107+
},
108+
"OCM0-0|0|192237500": {
109+
"lower_frequency": 192237500,
110+
"upper_frequency": 192312500
111+
},
112+
"OCM0-0|0|192312500": {
113+
"lower_frequency": 192312500,
114+
"upper_frequency": 192387500
115+
},
116+
"OCM0-0|0|192387500": {
117+
"lower_frequency": 192387500,
118+
"upper_frequency": 192462500
119+
},
120+
"OCM0-0|0|192462500": {
121+
"lower_frequency": 192462500,
122+
"upper_frequency": 192537500
123+
},
124+
"OCM0-0|0|192537500": {
125+
"lower_frequency": 192537500,
126+
"upper_frequency": 192612500
127+
},
128+
"OCM0-0|0|192612500": {
129+
"lower_frequency": 192612500,
130+
"upper_frequency": 192687500
131+
},
132+
"OCM0-0|0|192687500": {
133+
"lower_frequency": 192687500,
134+
"upper_frequency": 192762500
135+
},
136+
"OCM0-0|0|192762500": {
137+
"lower_frequency": 192762500,
138+
"upper_frequency": 192837500
139+
},
140+
"OCM0-0|0|192837500": {
141+
"lower_frequency": 192837500,
142+
"upper_frequency": 192912500
143+
},
144+
"OCM0-0|0|192912500": {
145+
"lower_frequency": 192912500,
146+
"upper_frequency": 192987500
147+
},
148+
"OCM0-0|0|192987500": {
149+
"lower_frequency": 192987500,
150+
"upper_frequency": 193062500
151+
},
152+
"OCM0-0|0|193062500": {
153+
"lower_frequency": 193062500,
154+
"upper_frequency": 193137500
155+
},
156+
"OCM0-0|0|193137500": {
157+
"lower_frequency": 193137500,
158+
"upper_frequency": 193212500
159+
},
160+
"OCM0-0|0|193212500": {
161+
"lower_frequency": 193212500,
162+
"upper_frequency": 193287500
163+
},
164+
"OCM0-0|0|193287500": {
165+
"lower_frequency": 193287500,
166+
"upper_frequency": 193362500
167+
},
168+
"OCM0-0|0|193362500": {
169+
"lower_frequency": 193362500,
170+
"upper_frequency": 193437500
171+
},
172+
"OCM0-0|0|193437500": {
173+
"lower_frequency": 193437500,
174+
"upper_frequency": 193512500
175+
},
176+
"OCM0-0|0|193512500": {
177+
"lower_frequency": 193512500,
178+
"upper_frequency": 193587500
179+
},
180+
"OCM0-0|0|193587500": {
181+
"lower_frequency": 193587500,
182+
"upper_frequency": 193662500
183+
},
184+
"OCM0-0|0|193662500": {
185+
"lower_frequency": 193662500,
186+
"upper_frequency": 193737500
187+
},
188+
"OCM0-0|0|193737500": {
189+
"lower_frequency": 193737500,
190+
"upper_frequency": 193812500
191+
},
192+
"OCM0-0|0|193812500": {
193+
"lower_frequency": 193812500,
194+
"upper_frequency": 193887500
195+
},
196+
"OCM0-0|0|193887500": {
197+
"lower_frequency": 193887500,
198+
"upper_frequency": 193962500
199+
},
200+
"OCM0-0|0|193962500": {
201+
"lower_frequency": 193962500,
202+
"upper_frequency": 194037500
203+
},
204+
"OCM0-0|0|194037500": {
205+
"lower_frequency": 194037500,
206+
"upper_frequency": 194112500
207+
},
208+
"OCM0-0|0|194112500": {
209+
"lower_frequency": 194112500,
210+
"upper_frequency": 194187500
211+
},
212+
"OCM0-0|0|194187500": {
213+
"lower_frequency": 194187500,
214+
"upper_frequency": 194262500
215+
},
216+
"OCM0-0|0|194262500": {
217+
"lower_frequency": 194262500,
218+
"upper_frequency": 194337500
219+
},
220+
"OCM0-0|0|194337500": {
221+
"lower_frequency": 194337500,
222+
"upper_frequency": 194412500
223+
},
224+
"OCM0-0|0|194412500": {
225+
"lower_frequency": 194412500,
226+
"upper_frequency": 194487500
227+
},
228+
"OCM0-0|0|194487500": {
229+
"lower_frequency": 194487500,
230+
"upper_frequency": 194562500
231+
},
232+
"OCM0-0|0|194562500": {
233+
"lower_frequency": 194562500,
234+
"upper_frequency": 194637500
235+
},
236+
"OCM0-0|0|194637500": {
237+
"lower_frequency": 194637500,
238+
"upper_frequency": 194712500
239+
},
240+
"OCM0-0|0|194712500": {
241+
"lower_frequency": 194712500,
242+
"upper_frequency": 194787500
243+
},
244+
"OCM0-0|0|194787500": {
245+
"lower_frequency": 194787500,
246+
"upper_frequency": 194862500
247+
},
248+
"OCM0-0|0|194862500": {
249+
"lower_frequency": 194862500,
250+
"upper_frequency": 194937500
251+
},
252+
"OCM0-0|0|194937500": {
253+
"lower_frequency": 194937500,
254+
"upper_frequency": 195012500
255+
},
256+
"OCM0-0|0|195012500": {
257+
"lower_frequency": 195012500,
258+
"upper_frequency": 195087500
259+
},
260+
"OCM0-0|0|195087500": {
261+
"lower_frequency": 195087500,
262+
"upper_frequency": 195162500
263+
},
264+
"OCM0-0|0|195162500": {
265+
"lower_frequency": 195162500,
266+
"upper_frequency": 195237500
267+
},
268+
"OCM0-0|0|195237500": {
269+
"lower_frequency": 195237500,
270+
"upper_frequency": 195312500
271+
},
272+
"OCM0-0|0|195312500": {
273+
"lower_frequency": 195312500,
274+
"upper_frequency": 195387500
275+
},
276+
"OCM0-0|0|195387500": {
277+
"lower_frequency": 195387500,
278+
"upper_frequency": 195462500
279+
},
280+
"OCM0-0|0|195462500": {
281+
"lower_frequency": 195462500,
282+
"upper_frequency": 195537500
283+
},
284+
"OCM0-0|0|195537500": {
285+
"lower_frequency": 195537500,
286+
"upper_frequency": 195612500
287+
},
288+
"OCM0-0|0|195612500": {
289+
"lower_frequency": 195612500,
290+
"upper_frequency": 195687500
291+
},
292+
"OCM0-0|0|195687500": {
293+
"lower_frequency": 195687500,
294+
"upper_frequency": 195762500
295+
},
296+
"OCM0-0|0|195762500": {
297+
"lower_frequency": 195762500,
298+
"upper_frequency": 195837500
299+
},
300+
"OCM0-0|0|195837500": {
301+
"lower_frequency": 195837500,
302+
"upper_frequency": 195912500
303+
},
304+
"OCM0-0|0|195912500": {
305+
"lower_frequency": 195912500,
306+
"upper_frequency": 195987500
307+
},
308+
"OCM0-0|0|195987500": {
309+
"lower_frequency": 195987500,
310+
"upper_frequency": 196062500
311+
},
312+
"OCM0-0|0|196062500": {
313+
"lower_frequency": 196062500,
314+
"upper_frequency": 196137500
315+
}
316+
}
317+
}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# name lanes alias index speed
2+
# TODO, add OCS/DCN/... ports for framework management
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
SAI_INIT_CONFIG_FILE=/etc/RegisterFile
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
OLS-V t1
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="swiotlb=65536"
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"OA0-0" : ["VOA0-0", "OSC0-0"],
3+
"OA0-1" : ["VOA0-1", "OSC0-1"]
4+
}

0 commit comments

Comments
 (0)