Skip to content

[code sync] Merge code from sonic-net/sonic-buildimage:202505 to 202506 #1692

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

Merged
merged 2 commits into from
Oct 3, 2025
Merged

[code sync] Merge code from sonic-net/sonic-buildimage:202505 to 202506 #1692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c612cbb
disable pfc_to_queue_map for service port (#24189)
mssonicbld Oct 2, 2025
3817b0e
Merge branch '202505' of https://github.com/sonic-net/sonic-buildimag…
mssonicbld Oct 3, 2025
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
8 changes: 3 additions & 5 deletions files/build_templates/qos_config.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,13 +455,11 @@
{% endif %}
{% endif %}
{% if port not in PORT_DPC %}
"tc_to_pg_map" : "AZURE",
"tc_to_pg_map" : "AZURE"{% if port not in PORT_SERVICE %},{% endif %}
{% else %}
"tc_to_pg_map" : "AZURE_DPC",
"tc_to_pg_map" : "AZURE_DPC"{% if port not in PORT_SERVICE %},{% endif %}
{% endif %}
{% if port in PORT_SERVICE %}
"pfc_to_queue_map": ""
{% else %}
{% if port not in PORT_SERVICE %}
"pfc_to_queue_map": "AZURE"
{% endif %}
}{% if not loop.last %},{% endif %}
Expand Down
6 changes: 2 additions & 4 deletions src/sonic-config-engine/tests/sample_output/py3/qos-arista7060x6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1156,14 +1156,12 @@
"Ethernet512": {
"dscp_to_tc_map" : "AZURE",
"tc_to_queue_map" : "AZURE",
"tc_to_pg_map" : "AZURE",
"pfc_to_queue_map": ""
"tc_to_pg_map" : "AZURE"
},
"Ethernet513": {
"dscp_to_tc_map" : "AZURE",
"tc_to_queue_map" : "AZURE",
"tc_to_pg_map" : "AZURE",
"pfc_to_queue_map": ""
"tc_to_pg_map" : "AZURE"
}
},
"WRED_PROFILE": {
Expand Down