Buffer and qos j2 file modularization (sonic-net#21102)

Buffer and qos j2 file modularization

Author: zhixzhu

files/build_templates/buffers_config.j2

@@ -13,6 +13,8 @@ def
 {%-         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' %}
 {%-     else %}
 {%-         set filename_postfix = set_default_topology() %}
 {%-     endif %}
@@ -26,10 +28,12 @@ def
 {%-  set voq_chassis = true %}
 {%- endif -%}
 
-{# Import default values from device HWSKU folder #}
-{%- import 'buffers_defaults_%s.j2' % filename_postfix as defs with context %}
-
-{%- set default_cable = defs.default_cable -%}
+{# Allow includer to pre-package defs without needing an import #}
+{%- if defs is not defined -%}
+    {# Import default values from device HWSKU folder #}
+    {%- import 'buffers_defaults_%s.j2' % filename_postfix as defs with context %}
+    {%- set default_cable = defs.default_cable -%}
+{%- endif -%}
 
 {# Port configuration to cable length look-up table #}
 {# Each record describes mapping of DUT (DUT port) role and neighbor role to cable length #}
@@ -48,6 +52,7 @@ def
     -%}
 {%- endif %}
 
+{%- if cable_length is not defined %}
 {%- macro cable_length(port_name) %}
     {%- set cable_len = [] %}
     {%- for local_port in DEVICE_NEIGHBOR %}
@@ -84,7 +89,12 @@ def
     {%- elif cable_len -%}
         {{ cable_len.0 }}
     {%- else %}
-        {%- if 'torrouter' in switch_role.lower() and 'mgmt' not in switch_role.lower()%}
+        {%- if port_name.startswith('Ethernet-BP') %}
+            {%- if 'internal' not in ports2cable %}
+                {%- set _ = ports2cable.update({'internal': '5m'}) %}
+            {%- endif -%}
+            {%- set _ = cable_len.append(ports2cable['internal']) %}
+        {%- elif 'torrouter' in switch_role.lower() and 'mgmt' not in switch_role.lower()%}
             {%- for local_port in VLAN_MEMBER %}
                 {%- if local_port[1] == port_name %}
                     {%- set roles3 = switch_role + '_' + 'server' %}
@@ -95,23 +105,15 @@ def
                     {%- endif %}
                 {%- endif %}
             {%- endfor %}
-            {%- if cable_len -%}
-                {{ cable_len.0 }}
-            {%- else -%}
-                {{ default_cable }}
-            {%- endif %}
+        {%- endif %}
+        {%- if cable_len -%}
+            {{ cable_len.0 }}
         {%- else -%}
-            {%- if port_name.startswith('Ethernet-BP') %}
-                {%- if 'internal' not in ports2cable %}
-                    {%- set _ = ports2cable.update({'internal': '5m'}) %}
-                {%- endif -%}
-                {{ ports2cable['internal'] }}
-            {%- else -%}
-                {{ default_cable }}
-            {%- endif %}
+            {{ default_cable }}
         {%- endif %}
     {%- endif %}
 {%- endmacro %}
+{%- endif %}
 
 {%- set PORT_ALL  = [] %}
 {%- set PORT_BP  = [] %}
@@ -195,7 +197,16 @@ def
     {%- if port_names_list_inactive.append(port) %}{%- endif %}
 {%- endfor %}
 {%- set port_names_inactive  = port_names_list_inactive  | join(',') %}
+
 {
+{% if (defs.generate_cable_length_config is defined) %}
+    {%- set port_names_list_all  = [] %}
+    {%- for port in PORT_ALL %}
+        {%- if port_names_list_all.append(port) %}{%- endif %}
+    {%- endfor %}
+    {%- set port_names_all  = port_names_list_all  | join(',') %}
+    {{- defs.generate_cable_length_config(port_names_all) }}
+{% else %}
     "CABLE_LENGTH": {
         "AZURE": {
     {% for port in PORT_ALL %}
@@ -205,6 +216,7 @@ def
     {% endfor %}
     }
     },
+{% endif %}
 
 {% if defs.generate_buffer_pool_and_profiles is defined %}
 {{ defs.generate_buffer_pool_and_profiles() }}

files/build_templates/qos_config.j2

@@ -82,6 +82,13 @@
 {% endif %}
 {%- endfor %}
 
+{%- set LOSSLESS_TC = [] %}
+{%- if generate_lossless_tc_list is defined %}
+    {{- generate_lossless_tc_list(LOSSLESS_TC) }}
+{%- else %}
+    {%- set LOSSLESS_TC = ['3','4'] %}
+{%- endif %}
+
 {%- set pfc_to_pg_map_supported_asics = ['mellanox', 'barefoot'] -%}
 {%- set backend_device_types = ['BackEndToRRouter', 'BackEndLeafRouter'] -%}
 {%- set apollo_resource_types = ['DL-NPU-Apollo'] -%}
@@ -125,6 +132,9 @@
         }
     },
 {% endif %}
+{% if (generate_pfc_to_queue_map is defined) %}
+    {{- generate_pfc_to_queue_map() }}
+{% else %}
     "MAP_PFC_PRIORITY_TO_QUEUE": {
         "AZURE": {
             "0": "0",
@@ -137,6 +147,7 @@
             "7": "7"
         }
     },
+{% endif %}
 {% if (generate_tc_to_queue_map is defined) and tunnel_qos_remap_enable %}
     {{- generate_tc_to_queue_map() }}
 {% elif (generate_tc_to_queue_map_per_sku is defined) %}
@@ -252,6 +263,9 @@
 {% if (generate_tc_to_dscp_map is defined) and tunnel_qos_remap_enable %}
     {{- generate_tc_to_dscp_map() }}
 {% endif %}
+{% if (generate_scheduler_config is defined) %}
+    {{- generate_scheduler_config() }}
+{% else %}
 {% if 'resource_type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['resource_type'] in apollo_resource_types %}
     "SCHEDULER": {
         "scheduler.0": {
@@ -304,6 +318,7 @@
         }
     },
 {% endif %}
+{% endif %}
 {% if asic_type in pfc_to_pg_map_supported_asics  %}
     "PFC_PRIORITY_TO_PRIORITY_GROUP_MAP": {
 {% if port_names_list_extra_queues|length > 0 %}
@@ -320,6 +335,9 @@
         }
     },
 {% endif %}
+{% if (generate_port_qos_map is defined) %}
+    {{- generate_port_qos_map(port_names_active) }}
+{% else %}
     "PORT_QOS_MAP": {
 {% if generate_global_dscp_to_tc_map is defined %}
         {{- generate_global_dscp_to_tc_map() }}
@@ -364,9 +382,9 @@
 {% if port in port_names_list_extra_queues %}
             "pfc_enable"      : "2,3,4,6",
 {% else %}
-            "pfc_enable"      : "3,4",
+            "pfc_enable"      : "{{ LOSSLESS_TC|join(',') }}",
 {% endif %}
-            "pfcwd_sw_enable" : "3,4",
+            "pfcwd_sw_enable" : "{{ LOSSLESS_TC|join(',') }}",
 {% endif %}
 {% if port not in PORT_DPC %}
             "tc_to_pg_map"    : "AZURE",
@@ -378,6 +396,7 @@
 
 {% endfor %}
     },
+{% endif %}
 {% if generate_wred_profiles is defined %}
     {{- generate_wred_profiles() }}
 {% else %}
@@ -446,6 +465,8 @@
         {%- if not loop.last -%},{% endif %}
 {% endfor %}
     }
+{% elif generate_queue_config is defined %}
+    {{- generate_queue_config(port_names_active) }}
 {% else %}
    "QUEUE": {
 {% if 'type' in DEVICE_METADATA['localhost'] and