Skip to content

Commit 5d2e8bb

Browse files
kperumalbfnkperumalbfn
committed
Update Queue mappings and WRED profile updates
1 parent d1bc245 commit 5d2e8bb

File tree

2 files changed

+214
-108
lines changed
  • device/arista/x86_64-arista_7060x6_64pe

2 files changed

+214
-108
lines changed

‎device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-C224O8/qos.json.j2

+107-54
Original file line numberDiff line numberDiff line change
@@ -3,45 +3,45 @@
33
"AZURE": {
44
"0" : "0",
55
"1" : "1",
6-
"2" : "2",
7-
"3" : "3",
8-
"4" : "4",
9-
"5" : "4",
10-
"6" : "4",
6+
"2" : "1",
7+
"3" : "2",
8+
"4" : "2",
9+
"5" : "3",
10+
"6" : "3",
1111
"7" : "0",
1212
"8" : "0",
1313
"9" : "0",
14-
"10": "5",
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",
14+
"10": "0",
15+
"11": "4",
16+
"12": "4",
17+
"13": "4",
18+
"14": "4",
19+
"15": "4",
20+
"16": "4",
21+
"17": "4",
22+
"18": "4",
23+
"19": "4",
24+
"20": "4",
25+
"21": "4",
26+
"22": "4",
27+
"23": "4",
28+
"24": "4",
29+
"25": "4",
30+
"26": "4",
31+
"27": "4",
32+
"28": "4",
33+
"29": "4",
34+
"30": "4",
35+
"31": "5",
36+
"32": "5",
37+
"33": "5",
38+
"34": "5",
39+
"35": "5",
40+
"36": "5",
41+
"37": "5",
42+
"38": "5",
43+
"39": "5",
44+
"40": "5",
4545
"41": "0",
4646
"42": "0",
4747
"43": "0",
@@ -88,56 +88,109 @@
8888

8989
{%- macro generate_scheduler_per_sku() -%}
9090
"SCHEDULER": {
91-
"scheduler.0": {
91+
"scheduler.4": {
9292
"type" : "DWRR",
93-
"weight": "1"
93+
"weight": "4"
9494
},
95-
"scheduler.1": {
95+
"scheduler.8": {
9696
"type" : "DWRR",
97-
"weight": "10"
97+
"weight": "8"
9898
},
99-
"scheduler.2": {
99+
"scheduler.18": {
100100
"type" : "DWRR",
101-
"weight": "20"
101+
"weight": "18"
102102
},
103-
"scheduler.3": {
103+
"scheduler.22": {
104104
"type" : "DWRR",
105-
"weight": "30"
105+
"weight": "22"
106106
}
107107
},
108108
{%- endmacro -%}
109109

110+
{%- macro generate_wred_profiles() %}
111+
"WRED_PROFILE": {
112+
"AZURE_LOSSY_Q1" : {
113+
"wred_green_enable" : "true",
114+
"wred_yellow_enable" : "true",
115+
"wred_red_enable" : "true",
116+
"ecn" : "ecn_all",
117+
"green_max_threshold" : "282624",
118+
"green_min_threshold" : "166912",
119+
"yellow_max_threshold" : "282624",
120+
"yellow_min_threshold" : "166912",
121+
"red_max_threshold" : "282624",
122+
"red_min_threshold" : "166912",
123+
"green_drop_probability" : "5",
124+
"yellow_drop_probability": "5",
125+
"red_drop_probability" : "5"
126+
},
127+
"AZURE_LOSSY_Q2" : {
128+
"wred_green_enable" : "true",
129+
"wred_yellow_enable" : "true",
130+
"wred_red_enable" : "true",
131+
"ecn" : "ecn_all",
132+
"green_max_threshold" : "282624",
133+
"green_min_threshold" : "166912",
134+
"yellow_max_threshold" : "282624",
135+
"yellow_min_threshold" : "166912",
136+
"red_max_threshold" : "282624",
137+
"red_min_threshold" : "166912",
138+
"green_drop_probability" : "5",
139+
"yellow_drop_probability": "5",
140+
"red_drop_probability" : "5"
141+
},
142+
"AZURE_LOSSY_Q3" : {
143+
"wred_green_enable" : "true",
144+
"wred_yellow_enable" : "true",
145+
"wred_red_enable" : "true",
146+
"ecn" : "ecn_all",
147+
"green_max_threshold" : "282624",
148+
"green_min_threshold" : "166912",
149+
"yellow_max_threshold" : "282624",
150+
"yellow_min_threshold" : "166912",
151+
"red_max_threshold" : "282624",
152+
"red_min_threshold" : "166912",
153+
"green_drop_probability" : "5",
154+
"yellow_drop_probability": "5",
155+
"red_drop_probability" : "5"
156+
}
157+
},
158+
{%- endmacro %}
110159
{%- macro generate_single_queue_per_sku(port) -%}
111160
"{{ port }}|0": {
112-
"scheduler": "scheduler.0"
161+
"scheduler": "scheduler.4"
113162
},
114163
"{{ port }}|1": {
115-
"scheduler": "scheduler.1"
164+
"scheduler": "scheduler.8",
165+
"wred_profile": "AZURE_LOSSY_Q1"
116166
},
117167
"{{ port }}|2": {
118-
"scheduler": "scheduler.2"
168+
"scheduler": "scheduler.18",
169+
"wred_profile": "AZURE_LOSSY_Q2"
119170
},
120171
"{{ port }}|3": {
121-
"scheduler": "scheduler.3"
172+
"scheduler": "scheduler.22",
173+
"wred_profile": "AZURE_LOSSY_Q3"
122174
},
123175
"{{ port }}|4": {
124-
"scheduler": "scheduler.1"
176+
"scheduler": "scheduler.22"
125177
},
126178
"{{ port }}|5": {
127-
"scheduler": "scheduler.1"
179+
"scheduler": "scheduler.22"
128180
},
129181
"{{ port }}|6": {
130-
"scheduler": "scheduler.1"
182+
"scheduler": "scheduler.4"
131183
},
132184
"{{ port }}|7": {
133-
"scheduler": "scheduler.1"
185+
"scheduler": "scheduler.22"
134186
},
135187
"{{ port }}|8": {
136-
"scheduler": "scheduler.1"
188+
"scheduler": "scheduler.22"
137189
},
138190
"{{ port }}|9": {
139-
"scheduler": "scheduler.1"
191+
"scheduler": "scheduler.22"
140192
}
141193
{%- endmacro -%}
142194

195+
143196
{%- include 'qos_config.j2' %}

0 commit comments

Comments
 (0)