Skip to content

Commit 83753ff

Browse files
richardyu-mspull[bot]
authored andcommitted
[Tunnel PFC] Add property for tunnel PFC (sonic-net#10962)
* [Tunnel PFC] Add property for tunnel PFC Replace the config.bcm file with j2 template file - Add 'sai_remap_prio_on_tnl_egress=1' property when device metadata local - Host subtype is 'dualtor' - Change sai.profile foe the new config.bcm.j2
1 parent 50cd65e commit 83753ff

File tree

7 files changed

+30
-3
lines changed

7 files changed

+30
-3
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
1+
{# Construct config.bcm to include additional soc properties per specific device metadata requirement #}
2+
{%- set map_prio = '' -%}
3+
{%- if DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined and DEVICE_METADATA['localhost']['subtype'] is defined -%}
4+
{%- set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
5+
{%- if 'dualtor' in switch_subtype.lower() %}
6+
{%- set map_prio = 'sai_remap_prio_on_tnl_egress=1' -%}
7+
{%- endif %}
8+
{%- endif %}
19
sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_premium_issu/b870.6.4.1/
210
l3_alpm_hit_skip=1
311
sai_adjust_acl_drop_in_rx_drop=1
12+
{{ map_prio }}
413
host_as_route_disable=1
514
use_all_splithorizon_groups=1
615
riot_enable=1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td3-a7050cx3-32s-32x100G.config.bcm
1+
SAI_INIT_CONFIG_FILE=/etc/sai.d/config.bcm
22
SAI_NUM_ECMP_MEMBERS=64
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
1+
{# Construct config.bcm to include additional soc properties per specific device metadata requirement #}
2+
{%- set map_prio = '' -%}
3+
{%- if DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined and DEVICE_METADATA['localhost']['subtype'] is defined -%}
4+
{%- set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
5+
{%- if 'dualtor' in switch_subtype.lower() %}
6+
{%- set map_prio = 'sai_remap_prio_on_tnl_egress=1' -%}
7+
{%- endif %}
8+
{%- endif %}
19
sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_premium_issu/b870.6.4.1/
210
l3_alpm_hit_skip=1
311
sai_adjust_acl_drop_in_rx_drop=1
12+
{{ map_prio }}
413
host_as_route_disable=1
514
use_all_splithorizon_groups=1
615
riot_enable=1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
1+
SAI_INIT_CONFIG_FILE=/etc/sai.d/config.bcm
22
SAI_NUM_ECMP_MEMBERS=64

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

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{# Construct config.bcm to include additional soc properties per specific device metadata requirement #}
22
{%- set mmu_sock = 'mmu_init_config="MSFT-TH2-Tier1"' -%}
33
{%- set IPinIP_sock = '' -%}
4+
{%- set map_prio = '' -%}
45
{%- if DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined -%}
56
{%- if DEVICE_METADATA['localhost']['type'] is defined -%}
67
{%- set switch_role = DEVICE_METADATA['localhost']['type'] -%}
@@ -15,13 +16,15 @@
1516
sai_tunnel_underlay_route_mode=1
1617
host_as_route_disable=1
1718
l3_ecmp_levels=2' -%}
19+
{%- set map_prio = 'sai_remap_prio_on_tnl_egress=1' -%}
1820
{%- endif %}
1921
{%- endif %}
2022
{%- endif %}
2123
{# The following is the common soc properties that used to be named "th2-a7260cx3-64-64x100G-t1.config.bcm" #}
2224

2325
l3_alpm_hit_skip=1
2426
sai_adjust_acl_drop_in_rx_drop=1
27+
{{ map_prio }}
2528
PHY_AN_ALLOW_PLL_CHANGE=1
2629
arl_clean_timeout_usec=15000000
2730
asf_mem_profile=2

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
{# Construct config.bcm to include additional soc properties per specific device metadata requirement #}
22
{%- set IPinIP_sock = '' -%}
3+
{%- set map_prio = '' -%}
34
{%- if DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined and DEVICE_METADATA['localhost']['subtype'] is defined -%}
45
{%- set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
56
{%- if 'dualtor' in switch_subtype.lower() %}
67
{%- set IPinIP_sock = 'sai_tunnel_support=1
78
sai_tunnel_underlay_route_mode=1
89
host_as_route_disable=1
9-
l3_ecmp_levels=2' -%}
10+
l3_ecmp_levels=2' -%} -%}
11+
{%- set map_prio = 'sai_remap_prio_on_tnl_egress=1' -%}
1012
{%- endif %}
1113
{%- endif %}
1214
{# The following is the common soc properties that used to be named "th2-a7260cx3-64-112x50G+8x100G.config.bcm" #}
1315
l3_alpm_hit_skip=1
1416
sai_adjust_acl_drop_in_rx_drop=1
17+
{{ map_prio }}
1518
PHY_AN_ALLOW_PLL_CHANGE=1
1619
arl_clean_timeout_usec=15000000
1720
asf_mem_profile=2

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

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{# Construct config.bcm to include additional soc properties per specific device metadata requirement #}
22
{%- set mmu_sock = 'mmu_init_config="MSFT-TH2-Tier1"' -%}
33
{%- set IPinIP_sock = '' -%}
4+
{%- set map_prio = '' -%}
45
{%- if DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined -%}
56
{%- if DEVICE_METADATA['localhost']['type'] is defined -%}
67
{%- set switch_role = DEVICE_METADATA['localhost']['type'] -%}
@@ -15,12 +16,14 @@
1516
sai_tunnel_underlay_route_mode=1
1617
host_as_route_disable=1
1718
l3_ecmp_levels=2' -%}
19+
{%- set map_prio = 'sai_remap_prio_on_tnl_egress=1' -%}
1820
{%- endif %}
1921
{%- endif %}
2022
{%- endif %}
2123
{# The following is the common soc properties that used to be named "th2-a7260cx3-64-64x40G.config.bcm" #}
2224
l3_alpm_hit_skip=1
2325
sai_adjust_acl_drop_in_rx_drop=1
26+
{{ map_prio }}
2427
PHY_AN_ALLOW_PLL_CHANGE=1
2528
arl_clean_timeout_usec=15000000
2629
asf_mem_profile=2

0 commit comments

Comments
 (0)