From 582552a792f2463f687090f099bf13d8c8b43474 Mon Sep 17 00:00:00 2001 From: Rick Robbins Date: Fri, 23 Jan 2026 17:58:16 +0000 Subject: [PATCH] Fix test_dscp_to_queue_mapping_uniform_mode --- dockers/docker-orchagent/ipinip.json.j2 | 4 ++++ src/sonic-config-engine/tests/multi_npu_data/py3/ipinip.json | 2 ++ src/sonic-config-engine/tests/sample_output/py3/ipinip.json | 2 ++ .../tests/sample_output/py3/ipinip_subnet_decap_enable.json | 4 ++++ 4 files changed, 12 insertions(+) diff --git a/dockers/docker-orchagent/ipinip.json.j2 b/dockers/docker-orchagent/ipinip.json.j2 index ae0106fa68..0d07e1d314 100644 --- a/dockers/docker-orchagent/ipinip.json.j2 +++ b/dockers/docker-orchagent/ipinip.json.j2 @@ -66,6 +66,7 @@ "TUNNEL_DECAP_TABLE:IPINIP_SUBNET" : { "tunnel_type":"IPINIP", "dscp_mode":"uniform", + "decap_dscp_to_tc_map":"AZURE", {% if "mlnx" in DEVICE_METADATA.localhost.platform %} "ecn_mode":"standard", {% else %} @@ -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", @@ -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 %} @@ -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", diff --git a/src/sonic-config-engine/tests/multi_npu_data/py3/ipinip.json b/src/sonic-config-engine/tests/multi_npu_data/py3/ipinip.json index 94196a0a48..4513903c91 100644 --- a/src/sonic-config-engine/tests/multi_npu_data/py3/ipinip.json +++ b/src/sonic-config-engine/tests/multi_npu_data/py3/ipinip.json @@ -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" }, @@ -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" }, diff --git a/src/sonic-config-engine/tests/sample_output/py3/ipinip.json b/src/sonic-config-engine/tests/sample_output/py3/ipinip.json index 755e954cfb..ef404b929e 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/ipinip.json +++ b/src/sonic-config-engine/tests/sample_output/py3/ipinip.json @@ -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" }, @@ -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" }, diff --git a/src/sonic-config-engine/tests/sample_output/py3/ipinip_subnet_decap_enable.json b/src/sonic-config-engine/tests/sample_output/py3/ipinip_subnet_decap_enable.json index abcfa56eae..6b6d4a63db 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/ipinip_subnet_decap_enable.json +++ b/src/sonic-config-engine/tests/sample_output/py3/ipinip_subnet_decap_enable.json @@ -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" }, @@ -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" }, @@ -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" }, @@ -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" },