Revert "[qos]: Adjust 7260 buffer sizes to accomodate extra lossless …

…queues (#11018)" This reverts commit 21f14dc. unit test needs to be cherry-picked.
sonic-net · Jun 6, 2022 · 693bc5f · 693bc5f
1 parent 21f14dc
commit 693bc5f
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 48 deletions.
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2
@@ -7,20 +7,16 @@
     {%- endfor %}
 {%- endmacro %}
 
-{%- import 'buffers_pool_sizes_t0.j2' as defs with context %}
-{%- set ingress_lossless_pool_size = defs.ingress_lossless_pool_size %}
-{%- set egress_lossy_pool_size = defs.egress_lossy_pool_size %}
-
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "{{ ingress_lossless_pool_size }}",
+            "size": "33329088",
             "type": "ingress",
             "mode": "dynamic",
             "xoff": "7827456"
         },
         "egress_lossy_pool": {
-            "size": "{{ egress_lossy_pool_size }}",
+            "size": "26663272",
             "type": "egress",
             "mode": "dynamic"
         },

diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2
@@ -7,23 +7,19 @@
     {%- endfor %}
 {%- endmacro %}
 
-{%- import 'buffers_pool_sizes_t1.j2' as defs with context %}
-{%- set ingress_lossless_pool_size = defs.ingress_lossless_pool_size %}
-{%- set egress_lossy_pool_size = defs.egress_lossy_pool_size %}
-
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
             {# SS Tab2 Row 71 #}
-            "size": "{{ ingress_lossless_pool_size }}",
+            "size": "33582016",
             "type": "ingress",
             "mode": "dynamic",
             {# SS Tab2 Row 68 #}
             "xoff": "8965632"
         },
         "egress_lossy_pool": {
             {# SS Tab2 Row 60 #}
-            "size": "{{ egress_lossy_pool_size }}",
+            "size": "26866112",
             "type": "egress",
             "mode": "dynamic"
         },

diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_pool_sizes_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_pool_sizes_t0.j2
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_pool_sizes_t1.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_pool_sizes_t1.j2
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2
@@ -15,20 +15,16 @@
     {%- endfor %}
 {%- endmacro %}
 
-{%- import 'buffers_pool_sizes_t0.j2' as defs with context %}
-{%- set ingress_lossless_pool_size = defs.ingress_lossless_pool_size %}
-{%- set egress_lossy_pool_size = defs.egress_lossy_pool_size %}
-
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "{{ ingress_lossless_pool_size }}",
+            "size": "33329088",
             "type": "ingress",
             "mode": "dynamic",
             "xoff": "7827456"
         },
         "egress_lossy_pool": {
-            "size": "{{ egress_lossy_pool_size }}",
+            "size": "26663272",
             "type": "egress",
             "mode": "dynamic"
         },

diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_pool_sizes_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_pool_sizes_t0.j2
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2
@@ -7,20 +7,16 @@
     {%- endfor %}
 {%- endmacro %}
 
-{%- import 'buffers_pool_sizes_t0.j2' as defs with context %}
-{%- set ingress_lossless_pool_size = defs.ingress_lossless_pool_size %}
-{%- set egress_lossy_pool_size = defs.egress_lossy_pool_size %}
-
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "{{ ingress_lossless_pool_size }}",
+            "size": "33329088",
             "type": "ingress",
             "mode": "dynamic",
             "xoff": "7827456"
         },
         "egress_lossy_pool": {
-            "size": "{{ egress_lossy_pool_size }}",
+            "size": "26663272",
             "type": "egress",
             "mode": "dynamic"
         },

diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2
@@ -7,20 +7,16 @@
     {%- endfor %}
 {%- endmacro %}
 
-{%- import 'buffers_pool_sizes_t0.j2' as defs with context %}
-{%- set ingress_lossless_pool_size = defs.ingress_lossless_pool_size %}
-{%- set egress_lossy_pool_size = defs.egress_lossy_pool_size %}
-
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "{{ ingress_lossless_pool_size }}",
+            "size": "33329088",
             "type": "ingress",
             "mode": "dynamic",
             "xoff": "7827456"
         },
         "egress_lossy_pool": {
-            "size": "{{ egress_lossy_pool_size }}",
+            "size": "26663272",
             "type": "egress",
             "mode": "dynamic"
         },

diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_pool_sizes_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_pool_sizes_t0.j2