Skip to content

Commit b546389

Browse files
authored
[action] [PR:23247] Add ECN settings for Arista-7060X6-16PE-384C-B-O128S2, Arista-7060X6-64PE-B-O128 (sonic-net#1327)
<!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md ** Make sure all your commits include a signature generated with `git commit -s` ** If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx" or "resolves #xxxx" Please provide the following information: --> #### Why I did it Add ECN settings for: - x86_64-arista_7060x6_16pe_384c_b/Arista-7060X6-16PE-384C-B-O128S2 - x86_64-arista_7060x6_64pe_b/Arista-7060X6-64PE-B-O128 ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it #### How to verify it <!-- If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012. --> #### Which release branch to backport (provide reason below if selected) <!-- - Note we only backport fixes to a release branch, *not* features! - Please also provide a reason for the backporting below. - e.g. - [x] 202006 --> - [ ] 202205 - [ ] 202211 - [ ] 202305 - [ ] 202311 - [ ] 202405 - [ ] 202411 - [ ] 202505 #### Tested branch (Please provide the tested image version) <!-- - Please provide tested image version - e.g. - [x] 20201231.100 --> - [ ] <!-- image version 1 --> - [ ] <!-- image version 2 --> #### Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: --> <!-- Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU. --> #### Link to config_db schema for YANG module changes <!-- Provide a link to config_db schema for the table for which YANG model is defined Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md --> #### A picture of a cute animal (not mandatory but encouraged)
1 parent 356f323 commit b546389

2 files changed

Lines changed: 320 additions & 0 deletions

File tree

  • device/arista
    • x86_64-arista_7060x6_16pe_384c_b/Arista-7060X6-16PE-384C-B-O128S2
    • x86_64-arista_7060x6_64pe_b/Arista-7060X6-64PE-B-O128
Lines changed: 160 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,161 @@
1+
{%- macro generate_dscp_to_tc_map_per_sku() -%}
2+
"DSCP_TO_TC_MAP": {
3+
"AZURE": {
4+
"0" : "0",
5+
"1" : "0",
6+
"2" : "0",
7+
"3" : "3",
8+
"4" : "4",
9+
"5" : "0",
10+
"6" : "0",
11+
"7" : "0",
12+
"8" : "0",
13+
"9" : "0",
14+
"10": "0",
15+
"11": "0",
16+
"12": "0",
17+
"13": "0",
18+
"14": "0",
19+
"15": "0",
20+
"16": "0",
21+
"17": "0",
22+
"18": "0",
23+
"19": "0",
24+
"20": "0",
25+
"21": "0",
26+
"22": "0",
27+
"23": "0",
28+
"24": "0",
29+
"25": "0",
30+
"26": "0",
31+
"27": "0",
32+
"28": "0",
33+
"29": "0",
34+
"30": "0",
35+
"31": "0",
36+
"32": "0",
37+
"33": "0",
38+
"34": "0",
39+
"35": "0",
40+
"36": "0",
41+
"37": "0",
42+
"38": "0",
43+
"39": "0",
44+
"40": "0",
45+
"41": "0",
46+
"42": "0",
47+
"43": "0",
48+
"44": "6",
49+
"45": "0",
50+
"46": "5",
51+
"47": "1",
52+
"48": "0",
53+
"49": "0",
54+
"50": "0",
55+
"51": "0",
56+
"52": "0",
57+
"53": "0",
58+
"54": "0",
59+
"55": "0",
60+
"56": "0",
61+
"57": "0",
62+
"58": "0",
63+
"59": "0",
64+
"60": "0",
65+
"61": "0",
66+
"62": "0",
67+
"63": "0"
68+
}
69+
},
70+
{%- endmacro -%}
71+
72+
{%- macro generate_scheduler_per_sku() -%}
73+
"SCHEDULER": {
74+
"SCHEDULER_Q1": {
75+
"type" : "DWRR",
76+
"weight": "10"
77+
},
78+
"SCHEDULER_Q3": {
79+
"type" : "DWRR",
80+
"weight": "20"
81+
},
82+
"SCHEDULER_Q4": {
83+
"type" : "DWRR",
84+
"weight": "10"
85+
},
86+
"SCHEDULER_Q6": {
87+
"type" : "DWRR",
88+
"weight": "70"
89+
},
90+
"SCHEDULER_DEFAULT": {
91+
"type" : "DWRR",
92+
"weight": "10"
93+
}
94+
},
95+
{%- endmacro -%}
96+
97+
{%- macro generate_single_queue_per_sku(port) -%}
98+
"{{ port }}|0": {
99+
"scheduler": "SCHEDULER_DEFAULT"
100+
},
101+
"{{ port }}|1": {
102+
"scheduler": "SCHEDULER_Q1"
103+
},
104+
"{{ port }}|2": {
105+
"scheduler": "SCHEDULER_DEFAULT"
106+
},
107+
"{{ port }}|3": {
108+
"scheduler": "SCHEDULER_Q3",
109+
"wred_profile": "WRED_LOSSLESS_Q3"
110+
},
111+
"{{ port }}|4": {
112+
"scheduler": "SCHEDULER_Q4",
113+
"wred_profile": "WRED_LOSSLESS_Q4"
114+
},
115+
"{{ port }}|5": {
116+
"scheduler": "SCHEDULER_DEFAULT"
117+
},
118+
"{{ port }}|6": {
119+
"scheduler": "SCHEDULER_Q6"
120+
},
121+
"{{ port }}|7": {
122+
"scheduler": "SCHEDULER_DEFAULT"
123+
}
124+
{%- endmacro -%}
125+
126+
{%- macro generate_wred_profiles() -%}
127+
"WRED_PROFILE": {
128+
"WRED_LOSSLESS_Q3": {
129+
"ecn": "ecn_all",
130+
"green_drop_probability": "5",
131+
"green_max_threshold": "262144",
132+
"green_min_threshold": "131072",
133+
"red_drop_probability": "5",
134+
"red_max_threshold": "262144",
135+
"red_min_threshold": "131072",
136+
"wred_green_enable": "true",
137+
"wred_red_enable": "true",
138+
"wred_yellow_enable": "true",
139+
"yellow_drop_probability": "5",
140+
"yellow_max_threshold": "262144",
141+
"yellow_min_threshold": "131072"
142+
},
143+
"WRED_LOSSLESS_Q4": {
144+
"ecn": "ecn_all",
145+
"green_drop_probability": "5",
146+
"green_max_threshold": "262144",
147+
"green_min_threshold": "131072",
148+
"red_drop_probability": "5",
149+
"red_max_threshold": "262144",
150+
"red_min_threshold": "131072",
151+
"wred_green_enable": "true",
152+
"wred_red_enable": "true",
153+
"wred_yellow_enable": "true",
154+
"yellow_drop_probability": "5",
155+
"yellow_max_threshold": "262144",
156+
"yellow_min_threshold": "131072"
157+
}
158+
},
159+
{%- endmacro -%}
160+
1161
{%- include 'qos_config.j2' %}
Lines changed: 160 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,161 @@
1+
{%- macro generate_dscp_to_tc_map_per_sku() -%}
2+
"DSCP_TO_TC_MAP": {
3+
"AZURE": {
4+
"0" : "0",
5+
"1" : "0",
6+
"2" : "0",
7+
"3" : "3",
8+
"4" : "4",
9+
"5" : "0",
10+
"6" : "0",
11+
"7" : "0",
12+
"8" : "0",
13+
"9" : "0",
14+
"10": "0",
15+
"11": "0",
16+
"12": "0",
17+
"13": "0",
18+
"14": "0",
19+
"15": "0",
20+
"16": "0",
21+
"17": "0",
22+
"18": "0",
23+
"19": "0",
24+
"20": "0",
25+
"21": "0",
26+
"22": "0",
27+
"23": "0",
28+
"24": "0",
29+
"25": "0",
30+
"26": "0",
31+
"27": "0",
32+
"28": "0",
33+
"29": "0",
34+
"30": "0",
35+
"31": "0",
36+
"32": "0",
37+
"33": "0",
38+
"34": "0",
39+
"35": "0",
40+
"36": "0",
41+
"37": "0",
42+
"38": "0",
43+
"39": "0",
44+
"40": "0",
45+
"41": "0",
46+
"42": "0",
47+
"43": "0",
48+
"44": "6",
49+
"45": "0",
50+
"46": "5",
51+
"47": "1",
52+
"48": "0",
53+
"49": "0",
54+
"50": "0",
55+
"51": "0",
56+
"52": "0",
57+
"53": "0",
58+
"54": "0",
59+
"55": "0",
60+
"56": "0",
61+
"57": "0",
62+
"58": "0",
63+
"59": "0",
64+
"60": "0",
65+
"61": "0",
66+
"62": "0",
67+
"63": "0"
68+
}
69+
},
70+
{%- endmacro -%}
71+
72+
{%- macro generate_scheduler_per_sku() -%}
73+
"SCHEDULER": {
74+
"SCHEDULER_Q1": {
75+
"type" : "DWRR",
76+
"weight": "10"
77+
},
78+
"SCHEDULER_Q3": {
79+
"type" : "DWRR",
80+
"weight": "20"
81+
},
82+
"SCHEDULER_Q4": {
83+
"type" : "DWRR",
84+
"weight": "10"
85+
},
86+
"SCHEDULER_Q6": {
87+
"type" : "DWRR",
88+
"weight": "70"
89+
},
90+
"SCHEDULER_DEFAULT": {
91+
"type" : "DWRR",
92+
"weight": "10"
93+
}
94+
},
95+
{%- endmacro -%}
96+
97+
{%- macro generate_single_queue_per_sku(port) -%}
98+
"{{ port }}|0": {
99+
"scheduler": "SCHEDULER_DEFAULT"
100+
},
101+
"{{ port }}|1": {
102+
"scheduler": "SCHEDULER_Q1"
103+
},
104+
"{{ port }}|2": {
105+
"scheduler": "SCHEDULER_DEFAULT"
106+
},
107+
"{{ port }}|3": {
108+
"scheduler": "SCHEDULER_Q3",
109+
"wred_profile": "WRED_LOSSLESS_Q3"
110+
},
111+
"{{ port }}|4": {
112+
"scheduler": "SCHEDULER_Q4",
113+
"wred_profile": "WRED_LOSSLESS_Q4"
114+
},
115+
"{{ port }}|5": {
116+
"scheduler": "SCHEDULER_DEFAULT"
117+
},
118+
"{{ port }}|6": {
119+
"scheduler": "SCHEDULER_Q6"
120+
},
121+
"{{ port }}|7": {
122+
"scheduler": "SCHEDULER_DEFAULT"
123+
}
124+
{%- endmacro -%}
125+
126+
{%- macro generate_wred_profiles() -%}
127+
"WRED_PROFILE": {
128+
"WRED_LOSSLESS_Q3": {
129+
"ecn": "ecn_all",
130+
"green_drop_probability": "5",
131+
"green_max_threshold": "262144",
132+
"green_min_threshold": "131072",
133+
"red_drop_probability": "5",
134+
"red_max_threshold": "262144",
135+
"red_min_threshold": "131072",
136+
"wred_green_enable": "true",
137+
"wred_red_enable": "true",
138+
"wred_yellow_enable": "true",
139+
"yellow_drop_probability": "5",
140+
"yellow_max_threshold": "262144",
141+
"yellow_min_threshold": "131072"
142+
},
143+
"WRED_LOSSLESS_Q4": {
144+
"ecn": "ecn_all",
145+
"green_drop_probability": "5",
146+
"green_max_threshold": "262144",
147+
"green_min_threshold": "131072",
148+
"red_drop_probability": "5",
149+
"red_max_threshold": "262144",
150+
"red_min_threshold": "131072",
151+
"wred_green_enable": "true",
152+
"wred_red_enable": "true",
153+
"wred_yellow_enable": "true",
154+
"yellow_drop_probability": "5",
155+
"yellow_max_threshold": "262144",
156+
"yellow_min_threshold": "131072"
157+
}
158+
},
159+
{%- endmacro -%}
160+
1161
{%- include 'qos_config.j2' %}

0 commit comments

Comments
 (0)