Skip to content

Fix test_dscp_to_queue_mapping_uniform_mode #1954

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

Open
rick-arista wants to merge 1 commit into
base: 202412
Choose a base branch
from
Open

Fix test_dscp_to_queue_mapping_uniform_mode #1954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions dockers/docker-orchagent/ipinip.json.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
"TUNNEL_DECAP_TABLE:IPINIP_SUBNET" : {
"tunnel_type":"IPINIP",
"dscp_mode":"uniform",
"decap_dscp_to_tc_map":"AZURE",
Copy link

@r12f r12f Jan 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this change is not apply to a single platform and a single release. @sdszhang , is this the real fix?

Copy link

@sdszhang sdszhang Jan 29, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rick-arista is this needed for every platform? Can we limit it to TH5 only? As we don't see this on Nvidia platform, changing this may affect the result of their platform.

Copy link

@sdszhang sdszhang Feb 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rick-arista do you know why this failure only happens on 202412 branch? but not on 202505 anymore?

Copy link
Author

@rick-arista rick-arista Feb 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not entirely sure. There were other changes on 202505 to this section of the code that I think might apply a similar fix.

Copy link

@r12f r12f Feb 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hi @rick-arista , do you mind to follow the fix on master and port the azure_qos_exists check:

Image

Copy link

@r12f r12f Feb 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hi @rick-arista , gently ping on this.

Copy link

@r12f r12f Feb 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the code I am referring to:

https://github.com/sonic-net/sonic-buildimage/blob/master/dockers/docker-orchagent/ipinip.json.j2#L76

Image

And this is where the flag being used that affects the code:

Image

{% if "mlnx" in DEVICE_METADATA.localhost.platform %}
"ecn_mode":"standard",
{% else %}
Expand All @@ -92,6 +93,7 @@
"dscp_mode":"pipe",
{% else %}
"dscp_mode":"uniform",
"decap_dscp_to_tc_map":"AZURE",
{% endif %}
{% if "mlnx" in DEVICE_METADATA.localhost.platform %}
"ecn_mode":"standard",
Expand Down Expand Up @@ -123,6 +125,7 @@
"TUNNEL_DECAP_TABLE:IPINIP_SUBNET_V6" : {
"tunnel_type":"IPINIP",
"dscp_mode":"uniform",
"decap_dscp_to_tc_map":"AZURE",
{% if "mlnx" in DEVICE_METADATA.localhost.platform %}
"ecn_mode":"standard",
{% else %}
Expand All @@ -149,6 +152,7 @@
"dscp_mode":"pipe",
{% else %}
"dscp_mode":"uniform",
"decap_dscp_to_tc_map":"AZURE",
{% endif %}
{% if "mlnx" in DEVICE_METADATA.localhost.platform %}
"ecn_mode":"standard",
Expand Down
2 changes: 2 additions & 0 deletions src/sonic-config-engine/tests/multi_npu_data/py3/ipinip.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"TUNNEL_DECAP_TABLE:IPINIP_TUNNEL" : {
"tunnel_type":"IPINIP",
"dscp_mode":"uniform",
"decap_dscp_to_tc_map":"AZURE",
"ecn_mode":"copy_from_outer",
"ttl_mode":"pipe"
},
Expand Down Expand Up @@ -42,6 +43,7 @@
"TUNNEL_DECAP_TABLE:IPINIP_V6_TUNNEL" : {
"tunnel_type":"IPINIP",
"dscp_mode":"uniform",
"decap_dscp_to_tc_map":"AZURE",
"ecn_mode":"copy_from_outer",
"ttl_mode":"pipe"
},
Expand Down
2 changes: 2 additions & 0 deletions src/sonic-config-engine/tests/sample_output/py3/ipinip.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"TUNNEL_DECAP_TABLE:IPINIP_TUNNEL" : {
"tunnel_type":"IPINIP",
"dscp_mode":"uniform",
"decap_dscp_to_tc_map":"AZURE",
"ecn_mode":"copy_from_outer",
"ttl_mode":"pipe"
},
Expand Down Expand Up @@ -66,6 +67,7 @@
"TUNNEL_DECAP_TABLE:IPINIP_V6_TUNNEL" : {
"tunnel_type":"IPINIP",
"dscp_mode":"uniform",
"decap_dscp_to_tc_map":"AZURE",
"ecn_mode":"copy_from_outer",
"ttl_mode":"pipe"
},
Expand Down
4 changes: 4 additions & 0 deletions src/sonic-config-engine/tests/sample_output/py3/ipinip_subnet_decap_enable.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"TUNNEL_DECAP_TABLE:IPINIP_SUBNET" : {
"tunnel_type":"IPINIP",
"dscp_mode":"uniform",
"decap_dscp_to_tc_map":"AZURE",
"ecn_mode":"copy_from_outer",
"ttl_mode":"pipe"
},
Expand All @@ -26,6 +27,7 @@
"TUNNEL_DECAP_TABLE:IPINIP_TUNNEL" : {
"tunnel_type":"IPINIP",
"dscp_mode":"uniform",
"decap_dscp_to_tc_map":"AZURE",
"ecn_mode":"copy_from_outer",
"ttl_mode":"pipe"
},
Expand Down Expand Up @@ -89,6 +91,7 @@
"TUNNEL_DECAP_TABLE:IPINIP_SUBNET_V6" : {
"tunnel_type":"IPINIP",
"dscp_mode":"uniform",
"decap_dscp_to_tc_map":"AZURE",
"ecn_mode":"copy_from_outer",
"ttl_mode":"pipe"
},
Expand All @@ -98,6 +101,7 @@
"TUNNEL_DECAP_TABLE:IPINIP_V6_TUNNEL" : {
"tunnel_type":"IPINIP",
"dscp_mode":"uniform",
"decap_dscp_to_tc_map":"AZURE",
"ecn_mode":"copy_from_outer",
"ttl_mode":"pipe"
},
Expand Down