From a6213e8dab58ad41124437f8ce9a632352985d2b Mon Sep 17 00:00:00 2001 From: Rick Robbins Date: Tue, 17 Jun 2025 16:57:26 +0000 Subject: [PATCH] Backport PR22464 https://github.com/sonic-net/sonic-buildimage/pull/22464 --- .../buffers_defaults_ft2 | 1 + .../buffers_defaults_lt2 | 1 + .../buffers_defaults_ut2 | 1 + .../buffers_defaults_ft2 | 1 + .../buffers_defaults_lt2 | 1 + .../buffers_defaults_ut2 | 1 + .../Arista-7060X6-64PE/buffers_defaults_ft2 | 1 + .../Arista-7060X6-64PE/buffers_defaults_lt2 | 1 + .../Arista-7060X6-64PE/buffers_defaults_ut2 | 1 + .../th5/gen/BALANCED/buffers_defaults_ft2.j2 | 19 ++++++++++++++++++ .../th5/gen/BALANCED/buffers_defaults_lt2.j2 | 19 ++++++++++++++++++ .../th5/gen/BALANCED/buffers_defaults_ut2.j2 | 19 ++++++++++++++++++ files/build_templates/buffers_config.j2 | 20 +++++++++++++++---- 13 files changed, 82 insertions(+), 4 deletions(-) create mode 120000 device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-O128S2/buffers_defaults_ft2 create mode 120000 device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-O128S2/buffers_defaults_lt2 create mode 120000 device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-O128S2/buffers_defaults_ut2 create mode 120000 device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-P32O64/buffers_defaults_ft2 create mode 120000 device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-P32O64/buffers_defaults_lt2 create mode 120000 device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-P32O64/buffers_defaults_ut2 create mode 120000 device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE/buffers_defaults_ft2 create mode 120000 device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE/buffers_defaults_lt2 create mode 120000 device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE/buffers_defaults_ut2 create mode 100644 device/common/profiles/th5/gen/BALANCED/buffers_defaults_ft2.j2 create mode 100644 device/common/profiles/th5/gen/BALANCED/buffers_defaults_lt2.j2 create mode 100644 device/common/profiles/th5/gen/BALANCED/buffers_defaults_ut2.j2 diff --git a/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-O128S2/buffers_defaults_ft2 b/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-O128S2/buffers_defaults_ft2 new file mode 120000 index 0000000000..b58b25d85e --- /dev/null +++ b/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-O128S2/buffers_defaults_ft2 @@ -0,0 +1 @@ +BALANCED/buffers_defaults_ft2.j2 \ No newline at end of file diff --git a/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-O128S2/buffers_defaults_lt2 b/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-O128S2/buffers_defaults_lt2 new file mode 120000 index 0000000000..056eb8c138 --- /dev/null +++ b/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-O128S2/buffers_defaults_lt2 @@ -0,0 +1 @@ +BALANCED/buffers_defaults_lt2.j2 \ No newline at end of file diff --git a/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-O128S2/buffers_defaults_ut2 b/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-O128S2/buffers_defaults_ut2 new file mode 120000 index 0000000000..6c51632184 --- /dev/null +++ b/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-O128S2/buffers_defaults_ut2 @@ -0,0 +1 @@ +BALANCED/buffers_defaults_ut2.j2 \ No newline at end of file diff --git a/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-P32O64/buffers_defaults_ft2 b/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-P32O64/buffers_defaults_ft2 new file mode 120000 index 0000000000..b58b25d85e --- /dev/null +++ b/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-P32O64/buffers_defaults_ft2 @@ -0,0 +1 @@ +BALANCED/buffers_defaults_ft2.j2 \ No newline at end of file diff --git a/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-P32O64/buffers_defaults_lt2 b/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-P32O64/buffers_defaults_lt2 new file mode 120000 index 0000000000..056eb8c138 --- /dev/null +++ b/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-P32O64/buffers_defaults_lt2 @@ -0,0 +1 @@ +BALANCED/buffers_defaults_lt2.j2 \ No newline at end of file diff --git a/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-P32O64/buffers_defaults_ut2 b/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-P32O64/buffers_defaults_ut2 new file mode 120000 index 0000000000..6c51632184 --- /dev/null +++ b/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-P32O64/buffers_defaults_ut2 @@ -0,0 +1 @@ +BALANCED/buffers_defaults_ut2.j2 \ No newline at end of file diff --git a/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE/buffers_defaults_ft2 b/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE/buffers_defaults_ft2 new file mode 120000 index 0000000000..b58b25d85e --- /dev/null +++ b/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE/buffers_defaults_ft2 @@ -0,0 +1 @@ +BALANCED/buffers_defaults_ft2.j2 \ No newline at end of file diff --git a/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE/buffers_defaults_lt2 b/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE/buffers_defaults_lt2 new file mode 120000 index 0000000000..056eb8c138 --- /dev/null +++ b/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE/buffers_defaults_lt2 @@ -0,0 +1 @@ +BALANCED/buffers_defaults_lt2.j2 \ No newline at end of file diff --git a/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE/buffers_defaults_ut2 b/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE/buffers_defaults_ut2 new file mode 120000 index 0000000000..6c51632184 --- /dev/null +++ b/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE/buffers_defaults_ut2 @@ -0,0 +1 @@ +BALANCED/buffers_defaults_ut2.j2 \ No newline at end of file diff --git a/device/common/profiles/th5/gen/BALANCED/buffers_defaults_ft2.j2 b/device/common/profiles/th5/gen/BALANCED/buffers_defaults_ft2.j2 new file mode 100644 index 0000000000..daaba05393 --- /dev/null +++ b/device/common/profiles/th5/gen/BALANCED/buffers_defaults_ft2.j2 @@ -0,0 +1,19 @@ +{%- set default_cable = '5m' %} + +{%- include 'buffer_ports.j2' %} + +{# Skip BUFFER_POOL, BUFFER_PROFILE #} +{%- macro generate_buffer_pool_and_profiles() %} +{%- endmacro %} + +{# Skip BUFFER_QUEUE #} +{%- macro generate_queue_buffers(ports) %} + "BUFFER_QUEUE": { + } +{%- endmacro %} + +{# Skip BUFFER_PG #} +{%- macro generate_pg_profils(ports) %} + "BUFFER_PG": { + }, +{%- endmacro %} diff --git a/device/common/profiles/th5/gen/BALANCED/buffers_defaults_lt2.j2 b/device/common/profiles/th5/gen/BALANCED/buffers_defaults_lt2.j2 new file mode 100644 index 0000000000..daaba05393 --- /dev/null +++ b/device/common/profiles/th5/gen/BALANCED/buffers_defaults_lt2.j2 @@ -0,0 +1,19 @@ +{%- set default_cable = '5m' %} + +{%- include 'buffer_ports.j2' %} + +{# Skip BUFFER_POOL, BUFFER_PROFILE #} +{%- macro generate_buffer_pool_and_profiles() %} +{%- endmacro %} + +{# Skip BUFFER_QUEUE #} +{%- macro generate_queue_buffers(ports) %} + "BUFFER_QUEUE": { + } +{%- endmacro %} + +{# Skip BUFFER_PG #} +{%- macro generate_pg_profils(ports) %} + "BUFFER_PG": { + }, +{%- endmacro %} diff --git a/device/common/profiles/th5/gen/BALANCED/buffers_defaults_ut2.j2 b/device/common/profiles/th5/gen/BALANCED/buffers_defaults_ut2.j2 new file mode 100644 index 0000000000..daaba05393 --- /dev/null +++ b/device/common/profiles/th5/gen/BALANCED/buffers_defaults_ut2.j2 @@ -0,0 +1,19 @@ +{%- set default_cable = '5m' %} + +{%- include 'buffer_ports.j2' %} + +{# Skip BUFFER_POOL, BUFFER_PROFILE #} +{%- macro generate_buffer_pool_and_profiles() %} +{%- endmacro %} + +{# Skip BUFFER_QUEUE #} +{%- macro generate_queue_buffers(ports) %} + "BUFFER_QUEUE": { + } +{%- endmacro %} + +{# Skip BUFFER_PG #} +{%- macro generate_pg_profils(ports) %} + "BUFFER_PG": { + }, +{%- endmacro %} diff --git a/files/build_templates/buffers_config.j2 b/files/build_templates/buffers_config.j2 index e60022d44e..22480df9bc 100644 --- a/files/build_templates/buffers_config.j2 +++ b/files/build_templates/buffers_config.j2 @@ -9,18 +9,30 @@ def {# Determine device topology and filename postfix #} {%- if DEVICE_METADATA is defined and DEVICE_METADATA['localhost']['type'] is defined %} {%- set switch_role = DEVICE_METADATA['localhost']['type'] %} +{% if DEVICE_METADATA['localhost']['subtype'] is defined %} +{%- set switch_subrole = DEVICE_METADATA['localhost']['subtype'] %} +{%- else %} +{%- set switch_subrole = '' %} +{%- endif %} {%- if 'torrouter' in switch_role.lower() and 'mgmt' not in switch_role.lower()%} {%- set filename_postfix = 't0' %} {%- elif 'leafrouter' in switch_role.lower() and 'mgmt' not in switch_role.lower()%} {%- set filename_postfix = 't1' %} {%- elif 'spinerouter' in switch_role.lower() and 'mgmt' not in switch_role.lower()%} -{%- set filename_postfix = 't2' %} + {%- if 'lowerspinerouter' == switch_subrole.lower() %} + {%- set filename_postfix = 'lt2' %} + {%- elif 'fabricspinerouter' == switch_role.lower() %} + {%- set filename_postfix = 'ft2' %} + {%- else %} + {%- set filename_postfix = 't2' %} + {%- endif -%} {%- else %} {%- set filename_postfix = set_default_topology() %} -{%- endif %} +{%- endif -%} {%- else %} -{%- set filename_postfix = set_default_topology() %} -{%- set switch_role = '' %} +{%- set filename_postfix = set_default_topology() %} +{%- set switch_role = '' %} +{%- set switch_subrole = '' %} {%- endif -%} {% set voq_chassis = false %}