Skip to content

[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205 #239

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
mssonicbld merged 2 commits into from
Jan 30, 2024
Merged

[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205 #239

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be87afd
[qos] change the template keyword from Compute-AI to ComputeAI (#17902)
kevinskwang Jan 29, 2024
82a1044
Merge branch '202205' of https://github.com/sonic-net/sonic-buildimag…
mssonicbld Jan 30, 2024
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: 4 additions & 4 deletions files/build_templates/qos_config.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
('type' in DEVICE_METADATA['localhost'] and
DEVICE_METADATA['localhost']['type'] in backend_device_types) and
('resource_type' in DEVICE_METADATA['localhost'] and
DEVICE_METADATA['localhost']['resource_type'] == 'Compute-AI') %}
DEVICE_METADATA['localhost']['resource_type'] == 'ComputeAI') %}
{{- generate_tc_to_pg_map() }}
{% else %}
"TC_TO_PRIORITY_GROUP_MAP": {
Expand Down Expand Up @@ -147,7 +147,7 @@
('type' in DEVICE_METADATA['localhost'] and
DEVICE_METADATA['localhost']['type'] in backend_device_types) and
('resource_type' in DEVICE_METADATA['localhost'] and
DEVICE_METADATA['localhost']['resource_type'] == 'Compute-AI') %}
DEVICE_METADATA['localhost']['resource_type'] == 'ComputeAI') %}
{{- generate_dscp_to_tc_map() }}
{% else %}
"DSCP_TO_TC_MAP": {
Expand Down Expand Up @@ -241,7 +241,7 @@
('type' in DEVICE_METADATA['localhost'] and
DEVICE_METADATA['localhost']['type'] in backend_device_types) and
('resource_type' in DEVICE_METADATA['localhost'] and
DEVICE_METADATA['localhost']['resource_type'] == 'Compute-AI') %}
DEVICE_METADATA['localhost']['resource_type'] == 'ComputeAI') %}
"SCHEDULER": {
"scheduler.0": {
"type" : "DWRR",
Expand Down Expand Up @@ -406,7 +406,7 @@
{% if 'type' in DEVICE_METADATA['localhost'] and
DEVICE_METADATA['localhost']['type'] in backend_device_types and
'resource_type' in DEVICE_METADATA['localhost'] and
DEVICE_METADATA['localhost']['resource_type'] == 'Compute-AI' %}
DEVICE_METADATA['localhost']['resource_type'] == 'ComputeAI' %}
{% for port in PORT_ACTIVE %}
"{{ port }}|0": {
"scheduler": "scheduler.0"
Expand Down