Skip to content

Commit 7ecf9d7

Browse files
r12fr12f
authored
Merge pull request sonic-net#795 from r12f/code-sync-202412
[202412] Code sync sonic-net/sonic-buildimage:202411 => 202412
2 parents 39a996e + f95caf2 commit 7ecf9d7

98 files changed

Lines changed: 15166 additions & 480 deletions

File tree

Some content is hidden

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

‎azure-pipelines.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,3 +270,16 @@ stages:
270270
MAX_WORKER: $(T0_SONIC_INSTANCE_NUM)
271271
MGMT_BRANCH: $(BUILD_BRANCH)
272272
MGMT_URL: "https://raw.githubusercontent.com/Azure/sonic-mgmt.msft"
273+
274+
# - job: wan_elastictest
275+
# displayName: "kvmtest-wan by Elastictest"
276+
# pool: sonic-ubuntu-1c
277+
# timeoutInMinutes: 240
278+
# continueOnError: false
279+
# steps:
280+
# - template: .azure-pipelines/run-test-scheduler-template.yml
281+
# parameters:
282+
# TOPOLOGY: wan-pub
283+
# MIN_WORKER: $(WAN_INSTANCE_NUM)
284+
# MAX_WORKER: $(WAN_INSTANCE_NUM)
285+
# COMMON_EXTRA_PARAMS: "--skip_sanity "

‎device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C28S4/config.bcm.j2‎

Lines changed: 543 additions & 0 deletions
Large diffs are not rendered by default.

‎device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C28S4/port_config.ini‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# name lanes alias index speed
2+
Ethernet0 1,2,3,4 Ethernet1/1 1 100000
3+
Ethernet4 5,6,7,8 Ethernet2/1 2 100000
4+
Ethernet8 9,10,11,12 Ethernet3/1 3 100000
5+
Ethernet12 13,14,15,16 Ethernet4/1 4 100000
6+
Ethernet16 21 Ethernet5/1 5 10000
7+
Ethernet20 17,18,19,20 Ethernet6/1 6 100000
8+
Ethernet24 25,26,27,28 Ethernet7/1 7 100000
9+
Ethernet28 29,30,31,32 Ethernet8/1 8 100000
10+
Ethernet32 37,38,39,40 Ethernet9/1 9 100000
11+
Ethernet36 33,34,35,36 Ethernet10/1 10 100000
12+
Ethernet40 41 Ethernet11/1 11 10000
13+
Ethernet44 45,46,47,48 Ethernet12/1 12 100000
14+
Ethernet48 53,54,55,56 Ethernet13/1 13 100000
15+
Ethernet52 49,50,51,52 Ethernet14/1 14 100000
16+
Ethernet56 57,58,59,60 Ethernet15/1 15 100000
17+
Ethernet60 61,62,63,64 Ethernet16/1 16 100000
18+
Ethernet64 69,70,71,72 Ethernet17/1 17 100000
19+
Ethernet68 65,66,67,68 Ethernet18/1 18 100000
20+
Ethernet72 73,74,75,76 Ethernet19/1 19 100000
21+
Ethernet76 77,78,79,80 Ethernet20/1 20 100000
22+
Ethernet80 85 Ethernet21/1 21 10000
23+
Ethernet84 81,82,83,84 Ethernet22/1 22 100000
24+
Ethernet88 89,90,91,92 Ethernet23/1 23 100000
25+
Ethernet92 93,94,95,96 Ethernet24/1 24 100000
26+
Ethernet96 101,102,103,104 Ethernet25/1 25 100000
27+
Ethernet100 97,98,99,100 Ethernet26/1 26 100000
28+
Ethernet104 105 Ethernet27/1 27 10000
29+
Ethernet108 109,110,111,112 Ethernet28/1 28 100000
30+
Ethernet112 117,118,119,120 Ethernet29/1 29 100000
31+
Ethernet116 113,114,115,116 Ethernet30/1 30 100000
32+
Ethernet120 121,122,123,124 Ethernet31/1 31 100000
33+
Ethernet124 125,126,127,128 Ethernet32/1 32 100000
34+
Ethernet128 129 Ethernet33 33 10000
35+
Ethernet132 128 Ethernet34 34 10000

‎device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C28S4/sai.profile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
SAI_INIT_CONFIG_FILE=/etc/sai.d/config.bcm
2+
SAI_NUM_ECMP_MEMBERS=64

‎device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O28/buffers_defaults_objects.j2‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,7 @@
9292
"BUFFER_PG": {
9393
"Dpc": {
9494
"active": {
95-
"dynamic": "ingress_lossy_profile",
96-
"static": "ingress_lossy_profile"
95+
"dynamic": "NULL"
9796
},
9897
"inactive": {
9998
"dynamic": "ingress_lossy_profile",
@@ -361,12 +360,6 @@
361360
"{{ port }}|3-4": {
362361
"profile" : {{find_profile_to_attach('BUFFER_PG', port, 'active', 'dynamic')}}
363362
},
364-
{% else %}
365-
{% if port in PORT_DPC %}
366-
"{{ port }}|3-4": {
367-
"profile" : {{find_profile_to_attach('BUFFER_PG', port, 'active', 'static')}}
368-
},
369-
{% endif %}
370363
{% endif %}
371364
"{{ port }}|0": {
372365
"profile" : "ingress_lossy_profile"

‎device/nokia/x86_64-nokia_ixr7220_h4-r0/Nokia-IXR7220-H4-64D/buffers_defaults_t0.j2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{%- macro generate_port_lists(PORT_ALL) %}
44
{# Generate list of ports #}
5-
{%- for port_idx in range(0,256,4) %}
5+
{%- for port_idx in range(0,512,8) %}
66
{%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
77
{%- endfor %}
88
{%- endmacro %}

‎device/nokia/x86_64-nokia_ixr7220_h4-r0/Nokia-IXR7220-H4-64D/buffers_defaults_t1.j2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{%- macro generate_port_lists(PORT_ALL) %}
44
{# Generate list of ports #}
5-
{%- for port_idx in range(0,256,4) %}
5+
{%- for port_idx in range(0,512,8) %}
66
{%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
77
{%- endfor %}
88
{%- endmacro %}

‎device/nokia/x86_64-nokia_ixr7220_h4-r0/Nokia-IXR7220-H4-64D/hwsku.json‎

Lines changed: 203 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,203 @@
1+
{
2+
"interfaces": {
3+
"Ethernet0": {
4+
"default_brkout_mode": "1x400G"
5+
},
6+
"Ethernet8": {
7+
"default_brkout_mode": "1x400G"
8+
},
9+
"Ethernet16": {
10+
"default_brkout_mode": "1x400G"
11+
},
12+
"Ethernet24": {
13+
"default_brkout_mode": "1x400G"
14+
},
15+
"Ethernet32": {
16+
"default_brkout_mode": "1x400G"
17+
},
18+
"Ethernet40": {
19+
"default_brkout_mode": "1x400G"
20+
},
21+
"Ethernet48": {
22+
"default_brkout_mode": "1x400G"
23+
},
24+
"Ethernet56": {
25+
"default_brkout_mode": "1x400G"
26+
},
27+
"Ethernet64": {
28+
"default_brkout_mode": "1x400G"
29+
},
30+
"Ethernet72": {
31+
"default_brkout_mode": "1x400G"
32+
},
33+
"Ethernet80": {
34+
"default_brkout_mode": "1x400G"
35+
},
36+
"Ethernet88": {
37+
"default_brkout_mode": "1x400G"
38+
},
39+
"Ethernet96": {
40+
"default_brkout_mode": "1x400G"
41+
},
42+
"Ethernet104": {
43+
"default_brkout_mode": "1x400G"
44+
},
45+
"Ethernet112": {
46+
"default_brkout_mode": "1x400G"
47+
},
48+
"Ethernet120": {
49+
"default_brkout_mode": "1x400G"
50+
},
51+
"Ethernet128": {
52+
"default_brkout_mode": "1x400G"
53+
},
54+
"Ethernet136": {
55+
"default_brkout_mode": "1x400G"
56+
},
57+
"Ethernet144": {
58+
"default_brkout_mode": "1x400G"
59+
},
60+
"Ethernet152": {
61+
"default_brkout_mode": "1x400G"
62+
},
63+
"Ethernet160": {
64+
"default_brkout_mode": "1x400G"
65+
},
66+
"Ethernet168": {
67+
"default_brkout_mode": "1x400G"
68+
},
69+
"Ethernet176": {
70+
"default_brkout_mode": "1x400G"
71+
},
72+
"Ethernet184": {
73+
"default_brkout_mode": "1x400G"
74+
},
75+
"Ethernet192": {
76+
"default_brkout_mode": "1x400G"
77+
},
78+
"Ethernet200": {
79+
"default_brkout_mode": "1x400G"
80+
},
81+
"Ethernet208": {
82+
"default_brkout_mode": "1x400G"
83+
},
84+
"Ethernet216": {
85+
"default_brkout_mode": "1x400G"
86+
},
87+
"Ethernet224": {
88+
"default_brkout_mode": "1x400G"
89+
},
90+
"Ethernet232": {
91+
"default_brkout_mode": "1x400G"
92+
},
93+
"Ethernet240": {
94+
"default_brkout_mode": "1x400G"
95+
},
96+
"Ethernet248": {
97+
"default_brkout_mode": "1x400G"
98+
},
99+
"Ethernet256": {
100+
"default_brkout_mode": "1x400G"
101+
},
102+
"Ethernet264": {
103+
"default_brkout_mode": "1x400G"
104+
},
105+
"Ethernet272": {
106+
"default_brkout_mode": "1x400G"
107+
},
108+
"Ethernet280": {
109+
"default_brkout_mode": "1x400G"
110+
},
111+
"Ethernet288": {
112+
"default_brkout_mode": "1x400G"
113+
},
114+
"Ethernet296": {
115+
"default_brkout_mode": "1x400G"
116+
},
117+
"Ethernet304": {
118+
"default_brkout_mode": "1x400G"
119+
},
120+
"Ethernet312": {
121+
"default_brkout_mode": "1x400G"
122+
},
123+
"Ethernet320": {
124+
"default_brkout_mode": "1x400G"
125+
},
126+
"Ethernet328": {
127+
"default_brkout_mode": "1x400G"
128+
},
129+
"Ethernet336": {
130+
"default_brkout_mode": "1x400G"
131+
},
132+
"Ethernet344": {
133+
"default_brkout_mode": "1x400G"
134+
},
135+
"Ethernet352": {
136+
"default_brkout_mode": "1x400G"
137+
},
138+
"Ethernet360": {
139+
"default_brkout_mode": "1x400G"
140+
},
141+
"Ethernet368": {
142+
"default_brkout_mode": "1x400G"
143+
},
144+
"Ethernet376": {
145+
"default_brkout_mode": "1x400G"
146+
},
147+
"Ethernet384": {
148+
"default_brkout_mode": "1x400G"
149+
},
150+
"Ethernet392": {
151+
"default_brkout_mode": "1x400G"
152+
},
153+
"Ethernet400": {
154+
"default_brkout_mode": "1x400G"
155+
},
156+
"Ethernet408": {
157+
"default_brkout_mode": "1x400G"
158+
},
159+
"Ethernet416": {
160+
"default_brkout_mode": "1x400G"
161+
},
162+
"Ethernet424": {
163+
"default_brkout_mode": "1x400G"
164+
},
165+
"Ethernet432": {
166+
"default_brkout_mode": "1x400G"
167+
},
168+
"Ethernet440": {
169+
"default_brkout_mode": "1x400G"
170+
},
171+
"Ethernet448": {
172+
"default_brkout_mode": "1x400G"
173+
},
174+
"Ethernet456": {
175+
"default_brkout_mode": "1x400G"
176+
},
177+
"Ethernet464": {
178+
"default_brkout_mode": "1x400G"
179+
},
180+
"Ethernet472": {
181+
"default_brkout_mode": "1x400G"
182+
},
183+
"Ethernet480": {
184+
"default_brkout_mode": "1x400G"
185+
},
186+
"Ethernet488": {
187+
"default_brkout_mode": "1x400G"
188+
},
189+
"Ethernet496": {
190+
"default_brkout_mode": "1x400G"
191+
},
192+
"Ethernet504": {
193+
"default_brkout_mode": "1x400G"
194+
},
195+
"Ethernet512": {
196+
"default_brkout_mode": "1x10G"
197+
},
198+
"Ethernet513": {
199+
"default_brkout_mode": "1x10G"
200+
}
201+
}
202+
}
203+

‎device/nokia/x86_64-nokia_ixr7220_h4-r0/Nokia-IXR7220-H4-64D/media_settings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4141,4 +4141,4 @@
41414141
}
41424142
}
41434143
}
4144-
}
4144+
}

0 commit comments

Comments
 (0)