Skip to content

Commit 6c5f2a4

Browse files
committed
change the default ipinip tunnel DSCP mode to pipe
1 parent 7a69613 commit 6c5f2a4

File tree

7 files changed

+14
-14
lines changed

7 files changed

+14
-14
lines changed

dockers/docker-orchagent/ipinip.json.j2

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
{
8989
"TUNNEL_DECAP_TABLE:IPINIP_TUNNEL" : {
9090
"tunnel_type":"IPINIP",
91-
"dscp_mode":"uniform",
91+
"dscp_mode":"pipe",
9292
{% if "mlnx" in DEVICE_METADATA.localhost.platform %}
9393
"ecn_mode":"standard",
9494
{% else %}
@@ -141,7 +141,7 @@
141141
{
142142
"TUNNEL_DECAP_TABLE:IPINIP_V6_TUNNEL" : {
143143
"tunnel_type":"IPINIP",
144-
"dscp_mode":"uniform",
144+
"dscp_mode":"pipe",
145145
{% if "mlnx" in DEVICE_METADATA.localhost.platform %}
146146
"ecn_mode":"standard",
147147
{% else %}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
"TUNNEL_DECAP_TABLE:IPINIP_TUNNEL" : {
44
"tunnel_type":"IPINIP",
5-
"dscp_mode":"uniform",
5+
"dscp_mode":"pipe",
66
"ecn_mode":"copy_from_outer",
77
"ttl_mode":"pipe"
88
},
@@ -41,7 +41,7 @@
4141
{
4242
"TUNNEL_DECAP_TABLE:IPINIP_V6_TUNNEL" : {
4343
"tunnel_type":"IPINIP",
44-
"dscp_mode":"uniform",
44+
"dscp_mode":"pipe",
4545
"ecn_mode":"copy_from_outer",
4646
"ttl_mode":"pipe"
4747
},

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
"TUNNEL_DECAP_TABLE:IPINIP_TUNNEL" : {
44
"tunnel_type":"IPINIP",
5-
"dscp_mode":"uniform",
5+
"dscp_mode":"pipe",
66
"ecn_mode":"copy_from_outer",
77
"ttl_mode":"pipe"
88
},
@@ -41,7 +41,7 @@
4141
{
4242
"TUNNEL_DECAP_TABLE:IPINIP_V6_TUNNEL" : {
4343
"tunnel_type":"IPINIP",
44-
"dscp_mode":"uniform",
44+
"dscp_mode":"pipe",
4545
"ecn_mode":"copy_from_outer",
4646
"ttl_mode":"pipe"
4747
},

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
"TUNNEL_DECAP_TABLE:IPINIP_TUNNEL" : {
44
"tunnel_type":"IPINIP",
5-
"dscp_mode":"uniform",
5+
"dscp_mode":"pipe",
66
"ecn_mode":"copy_from_outer",
77
"ttl_mode":"pipe"
88
},
@@ -65,7 +65,7 @@
6565
{
6666
"TUNNEL_DECAP_TABLE:IPINIP_V6_TUNNEL" : {
6767
"tunnel_type":"IPINIP",
68-
"dscp_mode":"uniform",
68+
"dscp_mode":"pipe",
6969
"ecn_mode":"copy_from_outer",
7070
"ttl_mode":"pipe"
7171
},

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
{
2626
"TUNNEL_DECAP_TABLE:IPINIP_TUNNEL" : {
2727
"tunnel_type":"IPINIP",
28-
"dscp_mode":"uniform",
28+
"dscp_mode":"pipe",
2929
"ecn_mode":"copy_from_outer",
3030
"ttl_mode":"pipe"
3131
},
@@ -97,7 +97,7 @@
9797
{
9898
"TUNNEL_DECAP_TABLE:IPINIP_V6_TUNNEL" : {
9999
"tunnel_type":"IPINIP",
100-
"dscp_mode":"uniform",
100+
"dscp_mode":"pipe",
101101
"ecn_mode":"copy_from_outer",
102102
"ttl_mode":"pipe"
103103
},

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
"TUNNEL_DECAP_TABLE:IPINIP_TUNNEL" : {
44
"tunnel_type":"IPINIP",
5-
"dscp_mode":"uniform",
5+
"dscp_mode":"pipe",
66
"ecn_mode":"copy_from_outer",
77
"ttl_mode":"pipe"
88
},
@@ -65,7 +65,7 @@
6565
{
6666
"TUNNEL_DECAP_TABLE:IPINIP_V6_TUNNEL" : {
6767
"tunnel_type":"IPINIP",
68-
"dscp_mode":"uniform",
68+
"dscp_mode":"pipe",
6969
"ecn_mode":"copy_from_outer",
7070
"ttl_mode":"pipe"
7171
},

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
{
2626
"TUNNEL_DECAP_TABLE:IPINIP_TUNNEL" : {
2727
"tunnel_type":"IPINIP",
28-
"dscp_mode":"uniform",
28+
"dscp_mode":"pipe",
2929
"ecn_mode":"copy_from_outer",
3030
"ttl_mode":"pipe"
3131
},
@@ -97,7 +97,7 @@
9797
{
9898
"TUNNEL_DECAP_TABLE:IPINIP_V6_TUNNEL" : {
9999
"tunnel_type":"IPINIP",
100-
"dscp_mode":"uniform",
100+
"dscp_mode":"pipe",
101101
"ecn_mode":"copy_from_outer",
102102
"ttl_mode":"pipe"
103103
},

0 commit comments

Comments
 (0)