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

Jump to bottom

[202012] [cherry-pick] Add extra lossy PG profile for ports between T1 and T2 #11160

Closed
wants to merge 2 commits into from
Closed

[202012] [cherry-pick] Add extra lossy PG profile for ports between T1 and T2 #11160

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f78b3ca
Add extra lossy PG profile for ports between T1 and T2
bingwang-ms Jun 16, 2022
230df09
Fix conflict
bingwang-ms Jun 23, 2022
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
2 changes: 1 addition & 1 deletion device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
"4": "4",
"5": "0",
"6": "6",
"7": "7",
"7": "0",
"8": "0"
},
"AZURE_TUNNEL": {
Expand Down
8 changes: 6 additions & 2 deletions device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,12 @@
},
{%- endmacro %}

{% import 'buffers_extra_queues.j2' as defs with context %}
{% import 'buffers_extra_queues.j2' as defs1 with context %}
{% import 'buffers_extra_pgs.j2' as defs2 with context %}

{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %}
{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }}
{{ defs1.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }}
{%- endmacro %}
{%- macro generate_pg_buffers_with_extra_lossy_pgs(port_names, port_names_require_no_extra_pgs) %}
{{ defs2.generate_pg_buffers_with_extra_lossy_pgs(port_names, port_names_require_no_extra_pgs) }}
{%- endmacro %}
20 changes: 20 additions & 0 deletions device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_extra_pgs.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{% if DEVICE_METADATA is defined and 'type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'LeafRouter' %}
{%- macro generate_pg_buffers_with_extra_lossy_pgs(port_names, port_names_require_no_extra_pg) %}
"BUFFER_PG": {
{% for port in port_names.split(',') %}
{% if port not in port_names_require_no_extra_pg.split(',') %}
"{{ port }}|2": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"{{ port }}|6": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
{% endif %}
"{{ port }}|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
}{% if not loop.last %},{% endif %}

{% endfor %}
},
{% endmacro %}
{% endif %}
4 changes: 2 additions & 2 deletions device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/qos.json.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"4": "4",
"5": "0",
"6": "6",
"7": "7"
"7": "0"
}
},
{%- endmacro %}
Expand Down Expand Up @@ -230,7 +230,7 @@
"4": "4",
"5": "0",
"6": "6",
"7": "7",
"7": "0",
"8": "0"
},
"AZURE_TUNNEL": {
Expand Down
9 changes: 6 additions & 3 deletions device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,12 @@
},
{%- endmacro %}


{% import 'buffers_extra_queues.j2' as defs with context %}
{% import 'buffers_extra_queues.j2' as defs1 with context %}
{% import 'buffers_extra_pgs.j2' as defs2 with context %}

{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %}
{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }}
{{ defs1.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }}
{%- endmacro %}
{%- macro generate_pg_buffers_with_extra_lossy_pgs(port_names, port_names_require_no_extra_pgs) %}
{{ defs2.generate_pg_buffers_with_extra_lossy_pgs(port_names, port_names_require_no_extra_pgs) }}
{%- endmacro %}
1 change: 1 addition & 0 deletions device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_extra_pgs.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../Arista-7260CX3-C64/buffers_extra_pgs.j2
4 changes: 4 additions & 0 deletions files/build_templates/buffers_config.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,10 @@ def
{{ defs.generate_pg_profils(port_names_active) }}
{% elif defs.generate_pg_profiles_with_inactive_ports is defined %}
{{ defs.generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) }},
{% elif (defs.generate_pg_buffers_with_extra_lossy_pgs is defined) and (port_names_extra_queues != '') %}
{{ defs.generate_pg_buffers_with_extra_lossy_pgs(port_names_active, port_names_extra_queues) }}
{% elif (defs.generate_pg_buffers_with_extra_lossy_pgs_with_inactive_ports is defined) and (port_names_extra_queues != '') %}
{{ defs.generate_pg_buffers_with_extra_lossy_pgs_with_inactive_ports(port_names_active, port_names_extra_queues, port_names_inactive) }}
{% else %}
"BUFFER_PG": {
{% for port in PORT_ACTIVE %}
Expand Down
48 changes: 48 additions & 0 deletions src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,21 @@
"Ethernet0|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet0|2": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet0|6": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet4|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet4|2": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet4|6": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet144|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
Expand All @@ -124,9 +136,21 @@
"Ethernet16|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet16|2": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet16|6": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet20|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet20|2": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet20|6": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet152|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
Expand All @@ -136,9 +160,21 @@
"Ethernet64|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet64|2": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet64|6": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet68|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet68|2": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet68|6": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet168|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
Expand All @@ -148,9 +184,21 @@
"Ethernet80|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet80|2": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet80|6": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet84|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet84|2": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet84|6": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet180|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
Expand Down
2 changes: 1 addition & 1 deletion src/sonic-config-engine/tests/sample_output/py3/qos-arista7050cx3-dualtor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"4": "4",
"5": "0",
"6": "6",
"7": "7",
"7": "0",
"8": "0"
},
"AZURE_TUNNEL": {
Expand Down
2 changes: 1 addition & 1 deletion src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"4": "4",
"5": "0",
"6": "6",
"7": "7",
"7": "0",
"8": "0"
},
"AZURE_TUNNEL": {
Expand Down
2 changes: 1 addition & 1 deletion src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
"4": "4",
"5": "0",
"6": "6",
"7": "7"
"7": "0"
}
},
"SCHEDULER": {
Expand Down