Skip to content

Commit ac96b00

Browse files
developfastlotus-nexthop
developfast
authored and
lotus-nexthop
committed
[QoS] Add tunnel pipe mode support for IPIP Decap mode to use SAI_TUNNEL_ATTR_DECAP_QOS_DSCP_TO_TC_MAP (sonic-net#21868)
[QoS] Add tunnel pipe mode support for IPIP Decap mode to use SAI_TUNNEL_ATTR_DECAP_QOS_DSCP_TO_TC_MAP
1 parent e48e65b commit ac96b00

File tree

7 files changed

+52
-16
lines changed

7 files changed

+52
-16
lines changed

‎dockers/docker-orchagent/ipinip.json.j2‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,12 @@
6565
{
6666
"TUNNEL_DECAP_TABLE:IPINIP_SUBNET" : {
6767
"tunnel_type":"IPINIP",
68+
{% if "broadcom" in asic_type %}
6869
"dscp_mode":"uniform",
70+
{% else %}
71+
"dscp_mode":"pipe",
72+
"decap_dscp_to_tc_map":"AZURE",
73+
{% endif %}
6974
{% if "mlnx" in DEVICE_METADATA.localhost.platform %}
7075
"ecn_mode":"standard",
7176
{% else %}
@@ -88,7 +93,12 @@
8893
{
8994
"TUNNEL_DECAP_TABLE:IPINIP_TUNNEL" : {
9095
"tunnel_type":"IPINIP",
96+
{% if "broadcom" in asic_type %}
9197
"dscp_mode":"uniform",
98+
{% else %}
99+
"dscp_mode":"pipe",
100+
"decap_dscp_to_tc_map":"AZURE",
101+
{% endif %}
92102
{% if "mlnx" in DEVICE_METADATA.localhost.platform %}
93103
"ecn_mode":"standard",
94104
{% else %}
@@ -118,7 +128,12 @@
118128
{
119129
"TUNNEL_DECAP_TABLE:IPINIP_SUBNET_V6" : {
120130
"tunnel_type":"IPINIP",
131+
{% if "broadcom" in asic_type %}
121132
"dscp_mode":"uniform",
133+
{% else %}
134+
"dscp_mode":"pipe",
135+
"decap_dscp_to_tc_map":"AZURE",
136+
{% endif %}
122137
{% if "mlnx" in DEVICE_METADATA.localhost.platform %}
123138
"ecn_mode":"standard",
124139
{% else %}
@@ -141,7 +156,12 @@
141156
{
142157
"TUNNEL_DECAP_TABLE:IPINIP_V6_TUNNEL" : {
143158
"tunnel_type":"IPINIP",
159+
{% if "broadcom" in asic_type %}
144160
"dscp_mode":"uniform",
161+
{% else %}
162+
"dscp_mode":"pipe",
163+
"decap_dscp_to_tc_map":"AZURE",
164+
{% endif %}
145165
{% if "mlnx" in DEVICE_METADATA.localhost.platform %}
146166
"ecn_mode":"standard",
147167
{% else %}

‎src/sonic-config-engine/tests/multi_npu_data/py2/ipinip.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
{
33
"TUNNEL_DECAP_TABLE:IPINIP_TUNNEL" : {
44
"tunnel_type":"IPINIP",
5-
"dscp_mode":"uniform",
5+
"dscp_mode":"pipe",
6+
"decap_dscp_to_tc_map":"AZURE",
67
"ecn_mode":"copy_from_outer",
78
"ttl_mode":"pipe"
89
},
@@ -41,7 +42,8 @@
4142
{
4243
"TUNNEL_DECAP_TABLE:IPINIP_V6_TUNNEL" : {
4344
"tunnel_type":"IPINIP",
44-
"dscp_mode":"uniform",
45+
"dscp_mode":"pipe",
46+
"decap_dscp_to_tc_map":"AZURE",
4547
"ecn_mode":"copy_from_outer",
4648
"ttl_mode":"pipe"
4749
},

‎src/sonic-config-engine/tests/multi_npu_data/py3/ipinip.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
{
33
"TUNNEL_DECAP_TABLE:IPINIP_TUNNEL" : {
44
"tunnel_type":"IPINIP",
5-
"dscp_mode":"uniform",
5+
"dscp_mode":"pipe",
6+
"decap_dscp_to_tc_map":"AZURE",
67
"ecn_mode":"copy_from_outer",
78
"ttl_mode":"pipe"
89
},
@@ -41,7 +42,8 @@
4142
{
4243
"TUNNEL_DECAP_TABLE:IPINIP_V6_TUNNEL" : {
4344
"tunnel_type":"IPINIP",
44-
"dscp_mode":"uniform",
45+
"dscp_mode":"pipe",
46+
"decap_dscp_to_tc_map":"AZURE",
4547
"ecn_mode":"copy_from_outer",
4648
"ttl_mode":"pipe"
4749
},

‎src/sonic-config-engine/tests/sample_output/py2/ipinip.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
{
33
"TUNNEL_DECAP_TABLE:IPINIP_TUNNEL" : {
44
"tunnel_type":"IPINIP",
5-
"dscp_mode":"uniform",
5+
"dscp_mode":"pipe",
6+
"decap_dscp_to_tc_map":"AZURE",
67
"ecn_mode":"copy_from_outer",
78
"ttl_mode":"pipe"
89
},
@@ -65,7 +66,8 @@
6566
{
6667
"TUNNEL_DECAP_TABLE:IPINIP_V6_TUNNEL" : {
6768
"tunnel_type":"IPINIP",
68-
"dscp_mode":"uniform",
69+
"dscp_mode":"pipe",
70+
"decap_dscp_to_tc_map":"AZURE",
6971
"ecn_mode":"copy_from_outer",
7072
"ttl_mode":"pipe"
7173
},

‎src/sonic-config-engine/tests/sample_output/py2/ipinip_subnet_decap_enable.json‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
{
33
"TUNNEL_DECAP_TABLE:IPINIP_SUBNET" : {
44
"tunnel_type":"IPINIP",
5-
"dscp_mode":"uniform",
5+
"dscp_mode":"pipe",
6+
"decap_dscp_to_tc_map":"AZURE",
67
"ecn_mode":"copy_from_outer",
78
"ttl_mode":"pipe"
89
},
@@ -25,7 +26,8 @@
2526
{
2627
"TUNNEL_DECAP_TABLE:IPINIP_TUNNEL" : {
2728
"tunnel_type":"IPINIP",
28-
"dscp_mode":"uniform",
29+
"dscp_mode":"pipe",
30+
"decap_dscp_to_tc_map":"AZURE",
2931
"ecn_mode":"copy_from_outer",
3032
"ttl_mode":"pipe"
3133
},
@@ -88,7 +90,8 @@
8890
{
8991
"TUNNEL_DECAP_TABLE:IPINIP_SUBNET_V6" : {
9092
"tunnel_type":"IPINIP",
91-
"dscp_mode":"uniform",
93+
"dscp_mode":"pipe",
94+
"decap_dscp_to_tc_map":"AZURE",
9295
"ecn_mode":"copy_from_outer",
9396
"ttl_mode":"pipe"
9497
},
@@ -97,7 +100,8 @@
97100
{
98101
"TUNNEL_DECAP_TABLE:IPINIP_V6_TUNNEL" : {
99102
"tunnel_type":"IPINIP",
100-
"dscp_mode":"uniform",
103+
"dscp_mode":"pipe",
104+
"decap_dscp_to_tc_map":"AZURE",
101105
"ecn_mode":"copy_from_outer",
102106
"ttl_mode":"pipe"
103107
},

‎src/sonic-config-engine/tests/sample_output/py3/ipinip.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
{
33
"TUNNEL_DECAP_TABLE:IPINIP_TUNNEL" : {
44
"tunnel_type":"IPINIP",
5-
"dscp_mode":"uniform",
5+
"dscp_mode":"pipe",
6+
"decap_dscp_to_tc_map":"AZURE",
67
"ecn_mode":"copy_from_outer",
78
"ttl_mode":"pipe"
89
},
@@ -65,7 +66,8 @@
6566
{
6667
"TUNNEL_DECAP_TABLE:IPINIP_V6_TUNNEL" : {
6768
"tunnel_type":"IPINIP",
68-
"dscp_mode":"uniform",
69+
"dscp_mode":"pipe",
70+
"decap_dscp_to_tc_map":"AZURE",
6971
"ecn_mode":"copy_from_outer",
7072
"ttl_mode":"pipe"
7173
},

‎src/sonic-config-engine/tests/sample_output/py3/ipinip_subnet_decap_enable.json‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
{
33
"TUNNEL_DECAP_TABLE:IPINIP_SUBNET" : {
44
"tunnel_type":"IPINIP",
5-
"dscp_mode":"uniform",
5+
"dscp_mode":"pipe",
6+
"decap_dscp_to_tc_map":"AZURE",
67
"ecn_mode":"copy_from_outer",
78
"ttl_mode":"pipe"
89
},
@@ -25,7 +26,8 @@
2526
{
2627
"TUNNEL_DECAP_TABLE:IPINIP_TUNNEL" : {
2728
"tunnel_type":"IPINIP",
28-
"dscp_mode":"uniform",
29+
"dscp_mode":"pipe",
30+
"decap_dscp_to_tc_map":"AZURE",
2931
"ecn_mode":"copy_from_outer",
3032
"ttl_mode":"pipe"
3133
},
@@ -88,7 +90,8 @@
8890
{
8991
"TUNNEL_DECAP_TABLE:IPINIP_SUBNET_V6" : {
9092
"tunnel_type":"IPINIP",
91-
"dscp_mode":"uniform",
93+
"dscp_mode":"pipe",
94+
"decap_dscp_to_tc_map":"AZURE",
9295
"ecn_mode":"copy_from_outer",
9396
"ttl_mode":"pipe"
9497
},
@@ -97,7 +100,8 @@
97100
{
98101
"TUNNEL_DECAP_TABLE:IPINIP_V6_TUNNEL" : {
99102
"tunnel_type":"IPINIP",
100-
"dscp_mode":"uniform",
103+
"dscp_mode":"pipe",
104+
"decap_dscp_to_tc_map":"AZURE",
101105
"ecn_mode":"copy_from_outer",
102106
"ttl_mode":"pipe"
103107
},

0 commit comments

Comments
 (0)