Add two extra lossless queues for bounced back traffic

device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers.json.j2

@@ -0,0 +1 @@
+../Arista-7050CX3-32S-D48C8/buffers.json.j2

device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers.json.j2

@@ -1,2 +1,41 @@
 {%- set default_topo = 't0' %}
+
+{% if DEVICE_METADATA is defined and 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %}
+{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %}
+    "BUFFER_QUEUE": {
+{% for port in port_names.split(',') %}
+{% if port in port_names_require_extra_buffer.split(',') %}
+        "{{ port }}|0-1": {
+            "profile" : "egress_lossy_profile"
+        },
+        "{{ port }}|2-4": {
+            "profile" : "egress_lossless_profile"
+        },
+        "{{ port }}|5": {
+            "profile" : "egress_lossy_profile"
+        },
+        "{{ port }}|6": {
+            "profile" : "egress_lossless_profile"
+        },
+        "{{ port }}|7": {
+            "profile" : "egress_lossy_profile"
+        }{% if not loop.last %},{% endif %}
+
+{% else %}
+        "{{ port }}|0-2": {
+            "profile" : "egress_lossy_profile"
+        },
+        "{{ port }}|3-4": {
+            "profile" : "egress_lossless_profile"
+        },
+        "{{ port }}|5-7": {
+            "profile" : "egress_lossy_profile"
+        }{% if not loop.last %},{% endif %}
+
+{% endif %}
+{% endfor %}
+    }
+{% endmacro %}
+{% endif %}
+
 {%- include 'buffers_config.j2' %}

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers.json.j2

@@ -1,3 +1,43 @@
 {%- set default_topo = 't1' %}
+
+{% if DEVICE_METADATA is defined and 'type' in DEVICE_METADATA['localhost'] and 
+(DEVICE_METADATA['localhost']['type'] == 'LeafRouter' or DEVICE_METADATA['localhost']['subtype'] == 'DualToR') %}
+{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %}
+    "BUFFER_QUEUE": {
+{% for port in port_names.split(',') %}
+{% if port in port_names_require_extra_buffer.split(',') %}
+        "{{ port }}|0-1": {
+            "profile" : "egress_lossy_profile"
+        },
+        "{{ port }}|2-4": {
+            "profile" : "egress_lossless_profile"
+        },
+        "{{ port }}|5": {
+            "profile" : "egress_lossy_profile"
+        },
+        "{{ port }}|6": {
+            "profile" : "egress_lossless_profile"
+        },
+        "{{ port }}|7": {
+            "profile" : "egress_lossy_profile"
+        }{% if not loop.last %},{% endif %}
+
+{% else %}
+        "{{ port }}|0-2": {
+            "profile" : "egress_lossy_profile"
+        },
+        "{{ port }}|3-4": {
+            "profile" : "egress_lossless_profile"
+        },
+        "{{ port }}|5-7": {
+            "profile" : "egress_lossy_profile"
+        }{% if not loop.last %},{% endif %}
+
+{% endif %}
+{% endfor %}
+    }
+{% endmacro %}
+{% endif %}
+
 {%- include 'buffers_config.j2' %}
 

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers.json.j2

@@ -0,0 +1 @@
+../Arista-7260CX3-C64/buffers.json.j2

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers.json.j2

@@ -0,0 +1 @@
+../Arista-7260CX3-C64/buffers.json.j2

files/build_templates/buffers_config.j2

@@ -128,6 +128,16 @@ def
 {%- endfor %}
 {%- set port_names_active  = port_names_list_active  | join(',') %}
 
+{%- set port_names_list_extra_queues = [] %}
+{%- for port in PORT_ACTIVE %}
+    {% if (generate_queue_buffers_with_extra_lossless_queues is defined or generate_queue_buffers_with_extra_lossless_queues_with_inactive_ports is defined) and 
+            ('type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'LeafRouter' and DEVICE_NEIGHBOR_METADATA is defined and DEVICE_NEIGHBOR[port].name in DEVICE_NEIGHBOR_METADATA and DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[port].name].type == 'ToRRouter') or
+            ('subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' and DEVICE_NEIGHBOR_METADATA is defined and DEVICE_NEIGHBOR[port].name in DEVICE_NEIGHBOR_METADATA and DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[port].name].type == 'LeafRouter') %}
+        {%- if port_names_list_extra_queues.append(port) %}{%- endif %}
+    {% endif %}
+{%- endfor %}
+{%- set port_names_extra_queues = port_names_list_extra_queues | join(',') %}
+
 {%- set port_names_list_inactive  = [] %}
 {%- for port in PORT_INACTIVE %}
     {%- if port_names_list_inactive.append(port) %}{%- endif %}
@@ -182,6 +192,10 @@ def
 {{ defs.generate_queue_buffers(port_names_active) }}
 {% elif defs.generate_queue_buffers_with_inactive_ports is defined %}
 {{ defs.generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) }}
+{% elif generate_queue_buffers_with_extra_lossless_queues_with_inactive_ports is defined %}
+{{ generate_queue_buffers_with_extra_lossless_queues_with_inactive_ports(port_names_active, port_names_extra_queues, port_names_inactive) }}
+{% elif generate_queue_buffers_with_extra_lossless_queues is defined %}
+{{ generate_queue_buffers_with_extra_lossless_queues(port_names_active, port_names_extra_queues) }}
 {% else %}
     "BUFFER_QUEUE": {
 {% for port in PORT_ACTIVE %}