Skip to content

Commit d50ae1f

Browse files
authored
[arista]: Always set sai_tunnel_support on Arista-7260cx3 (#16097)
Why I did it To overwrite the default DSCP_TO_TC_MAP for tunnel traffic, the attribute sai_tunnel_support must be set to 1. Before this change, the attribute is set only on dual-tor platform when remap is enabled. This PR is to set the attribute on all Arista-7260cx3 devices. Work item tracking Microsoft ADO 24785776 How I did it Update the config.bcm template for Arista-7260cx3 devices. How to verify it The change is verified by manually rendering the j2 on a T1 testbed.
1 parent bb8ce50 commit d50ae1f

File tree

6 files changed

+11
-10
lines changed

6 files changed

+11
-10
lines changed

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
{%- set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
1515
{%- if 'dualtor' in switch_subtype.lower() %}
1616
{%- set IPinIP_sock =
17-
'sai_tunnel_support=1
18-
sai_tunnel_underlay_route_mode=1
17+
'sai_tunnel_underlay_route_mode=1
1918
host_as_route_disable=1
2019
l3_ecmp_levels=2' -%}
2120
{%- set map_prio = 'sai_remap_prio_on_tnl_egress=1' -%}
@@ -1049,5 +1048,6 @@ serdes_preemphasis_116=0x103706
10491048
serdes_preemphasis_117=0x133c06
10501049

10511050
{{ mmu_sock }}
1051+
sai_tunnel_support=1
10521052
{{ IPinIP_sock }}
10531053
phy_an_lt_msft=1

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/config.bcm.j2

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
{%- set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
77
{%- if 'dualtor' in switch_subtype.lower() %}
88
{%- set IPinIP_sock =
9-
'sai_tunnel_support=1
10-
sai_tunnel_underlay_route_mode=1
9+
'sai_tunnel_underlay_route_mode=1
1110
host_as_route_disable=1
1211
l3_ecmp_levels=2' -%}
1312
{%- set map_prio = 'sai_remap_prio_on_tnl_egress=1' -%}
@@ -956,5 +955,6 @@ serdes_preemphasis_130=0x580c
956955
serdes_preemphasis_131=0x580c
957956

958957
mmu_init_config="MSFT-TH2-Tier0"
958+
sai_tunnel_support=1
959959
{{ IPinIP_sock }}
960960
phy_an_lt_msft=1

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
{%- set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
77
{%- if 'dualtor' in switch_subtype.lower() %}
88
{%- set IPinIP_sock =
9-
'sai_tunnel_support=1
10-
sai_tunnel_underlay_route_mode=1
9+
'sai_tunnel_underlay_route_mode=1
1110
host_as_route_disable=1
1211
l3_ecmp_levels=2' -%}
1312
{%- set map_prio = 'sai_remap_prio_on_tnl_egress=1' -%}
@@ -960,5 +959,6 @@ serdes_preemphasis_130=0x580c
960959
serdes_preemphasis_131=0x580c
961960

962961
mmu_init_config="MSFT-TH2-Tier0"
962+
sai_tunnel_support=1
963963
{{ IPinIP_sock }}
964964
phy_an_lt_msft=1

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
{%- set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
1515
{%- if 'dualtor' in switch_subtype.lower() %}
1616
{%- set IPinIP_sock =
17-
'sai_tunnel_support=1
18-
sai_tunnel_underlay_route_mode=1
17+
'sai_tunnel_underlay_route_mode=1
1918
host_as_route_disable=1
2019
l3_ecmp_levels=2' -%}
2120
{%- set map_prio = 'sai_remap_prio_on_tnl_egress=1' -%}
@@ -1048,5 +1047,6 @@ serdes_preemphasis_116=0x105004
10481047
serdes_preemphasis_117=0x105004
10491048

10501049
{{ mmu_sock }}
1050+
sai_tunnel_support=1
10511051
{{ IPinIP_sock }}
10521052
phy_an_lt_msft=1

src/sonic-config-engine/tests/data/j2_template/config.bcm.j2

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
{%- set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
1515
{%- if 'dualtor' in switch_subtype.lower() %}
1616
{%- set IPinIP_sock =
17-
'sai_tunnel_support=1
18-
sai_tunnel_underlay_route_mode=1
17+
'sai_tunnel_underlay_route_mode=1
1918
host_as_route_disable=1
2019
l3_ecmp_levels=2' -%}
2120
{%- set map_prio = 'sai_remap_prio_on_tnl_egress=1' -%}
@@ -33,5 +32,6 @@ sai_pfc_dlr_init_capability=1' -%}
3332
l3_alpm_hit_skip=1
3433
{{ map_prio }}
3534
{{ mmu_sock }}
35+
sai_tunnel_support=1
3636
{{ IPinIP_sock }}
3737
{{ pfcwd_sock }}

src/sonic-config-engine/tests/sample_output/py3/arista7260-t1.config.bcm

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
l3_alpm_hit_skip=1
33

44
mmu_init_config="MSFT-TH2-Tier1"
5+
sai_tunnel_support=1
56

67
hybrid_pfc_deadlock_enable=1
78
pfc_deadlock_seq_control=1

0 commit comments

Comments
 (0)