Merge pull request sonic-net#559 from mssonicbld/sonicbld/202405-merge

[code sync] Merge code from sonic-net/sonic-buildimage:202405 to 202405

Author: mssonicbld

device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/BALANCED/buffers_defaults_t0.j2

@@ -8,10 +8,17 @@
     {%- endfor %}
 {%- endmacro %}
 
+{%- set ingress_lossless_pool_size = '32689152' %}
+{%- set egress_lossless_pool_size = '32340992' %}
+{%- if (DEVICE_METADATA is defined) and ('localhost' in DEVICE_METADATA) and ('subtype' in DEVICE_METADATA['localhost']) and (DEVICE_METADATA['localhost']['subtype'] == 'DualToR') %}
+    {%- set ingress_lossless_pool_size = '32441856' %}
+    {%- set egress_lossless_pool_size = '32441856' %}
+{%- endif %}
+
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "32689152",
+            "size": "{{ingress_lossless_pool_size }}",
             "type": "ingress",
             "mode": "dynamic",
             "xoff": "2058240"
@@ -22,7 +29,7 @@
             "mode": "dynamic"
         },
         "egress_lossless_pool": {
-            "size": "32340992",
+            "size": "{{egress_lossless_pool_size }}",
             "type": "egress",
             "mode": "static"
         }
@@ -31,12 +38,12 @@
         "ingress_lossy_profile": {
             "pool":"ingress_lossless_pool",
             "size":"0",
-            "static_th":"32689152"
+            "static_th":"{{ingress_lossless_pool_size }}"
         },
         "egress_lossless_profile": {
             "pool":"egress_lossless_pool",
             "size":"0",
-            "static_th":"32340992"
+            "static_th":"{{egress_lossless_pool_size }}"
         },
         "egress_lossy_profile": {
             "pool":"egress_lossy_pool",

src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor-remap-disabled.json

@@ -62,7 +62,7 @@
 
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "32689152",
+            "size": "32441856",
             "type": "ingress",
             "mode": "dynamic",
             "xoff": "2058240"
@@ -73,7 +73,7 @@
             "mode": "dynamic"
         },
         "egress_lossless_pool": {
-            "size": "32340992",
+            "size": "32441856",
             "type": "egress",
             "mode": "static"
         }
@@ -82,12 +82,12 @@
         "ingress_lossy_profile": {
             "pool":"ingress_lossless_pool",
             "size":"0",
-            "static_th":"32689152"
+            "static_th":"32441856"
         },
         "egress_lossless_profile": {
             "pool":"egress_lossless_pool",
             "size":"0",
-            "static_th":"32340992"
+            "static_th":"32441856"
         },
         "egress_lossy_profile": {
             "pool":"egress_lossy_pool",

src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor.json

@@ -62,7 +62,7 @@
 
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "32689152",
+            "size": "32441856",
             "type": "ingress",
             "mode": "dynamic",
             "xoff": "2058240"
@@ -73,7 +73,7 @@
             "mode": "dynamic"
         },
         "egress_lossless_pool": {
-            "size": "32340992",
+            "size": "32441856",
             "type": "egress",
             "mode": "static"
         }
@@ -82,12 +82,12 @@
         "ingress_lossy_profile": {
             "pool":"ingress_lossless_pool",
             "size":"0",
-            "static_th":"32689152"
+            "static_th":"32441856"
         },
         "egress_lossless_profile": {
             "pool":"egress_lossless_pool",
             "size":"0",
-            "static_th":"32340992"
+            "static_th":"32441856"
         },
         "egress_lossy_profile": {
             "pool":"egress_lossy_pool",