From f947172c0a0257162f0e2ca3746d1ab89c6dd54c Mon Sep 17 00:00:00 2001
From: "Wenda Ni, Ph.D" <wenni@microsoft.com>
Date: Fri, 13 Apr 2018 22:22:21 -0700
Subject: [PATCH] [devices]: Merge ingress service pools of lossless and lossy
 traffic for TD2 (#1578)

Signed-off-by: Wenda <wenni@microsoft.com>
---
 .../Arista-7050-QX32/buffers.json.j2          | 19 +++++++------------
 .../Arista-7050-QX-32S/buffers.json.j2        | 19 +++++++------------
 .../Force10-S6000/buffers.json.j2             | 19 +++++++------------
 3 files changed, 21 insertions(+), 36 deletions(-)

diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers.json.j2 b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers.json.j2
index 10f9da575a..551f73ca04 100644
--- a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers.json.j2
+++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers.json.j2
@@ -69,22 +69,17 @@
     },
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "7274496",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "ingress_lossy_pool": {
-            "size": "5491712",
+            "size": "12766208",
             "type": "ingress",
             "mode": "dynamic"
         },
         "egress_lossless_pool": {
-            "size": "7274496",
+            "size": "12766208",
             "type": "egress",
             "mode": "static"
         },
         "egress_lossy_pool": {
-            "size": "5491712",
+            "size": "8072396",
             "type": "egress",
             "mode": "dynamic"
         }
@@ -95,18 +90,18 @@
             "xon":"18432",
             "xoff":"40560",
             "size":"41808",
-            "dynamic_th":"-3",
+            "dynamic_th":"-4",
             "xon_offset":"2496"
         },
         "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossy_pool]",
-            "size":"1518",
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
             "dynamic_th":"3"
         },
         "egress_lossless_profile": {
             "pool":"[BUFFER_POOL|egress_lossless_pool]",
             "size":"0",
-            "static_th":"7274496"
+            "static_th":"12766208"
         },
         "egress_lossy_profile": {
             "pool":"[BUFFER_POOL|egress_lossy_pool]",
diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/buffers.json.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/buffers.json.j2
index 10f9da575a..551f73ca04 100644
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/buffers.json.j2
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/buffers.json.j2
@@ -69,22 +69,17 @@
     },
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "7274496",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "ingress_lossy_pool": {
-            "size": "5491712",
+            "size": "12766208",
             "type": "ingress",
             "mode": "dynamic"
         },
         "egress_lossless_pool": {
-            "size": "7274496",
+            "size": "12766208",
             "type": "egress",
             "mode": "static"
         },
         "egress_lossy_pool": {
-            "size": "5491712",
+            "size": "8072396",
             "type": "egress",
             "mode": "dynamic"
         }
@@ -95,18 +90,18 @@
             "xon":"18432",
             "xoff":"40560",
             "size":"41808",
-            "dynamic_th":"-3",
+            "dynamic_th":"-4",
             "xon_offset":"2496"
         },
         "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossy_pool]",
-            "size":"1518",
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
             "dynamic_th":"3"
         },
         "egress_lossless_profile": {
             "pool":"[BUFFER_POOL|egress_lossless_pool]",
             "size":"0",
-            "static_th":"7274496"
+            "static_th":"12766208"
         },
         "egress_lossy_profile": {
             "pool":"[BUFFER_POOL|egress_lossy_pool]",
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers.json.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers.json.j2
index 10f9da575a..551f73ca04 100644
--- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers.json.j2
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers.json.j2
@@ -69,22 +69,17 @@
     },
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "7274496",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "ingress_lossy_pool": {
-            "size": "5491712",
+            "size": "12766208",
             "type": "ingress",
             "mode": "dynamic"
         },
         "egress_lossless_pool": {
-            "size": "7274496",
+            "size": "12766208",
             "type": "egress",
             "mode": "static"
         },
         "egress_lossy_pool": {
-            "size": "5491712",
+            "size": "8072396",
             "type": "egress",
             "mode": "dynamic"
         }
@@ -95,18 +90,18 @@
             "xon":"18432",
             "xoff":"40560",
             "size":"41808",
-            "dynamic_th":"-3",
+            "dynamic_th":"-4",
             "xon_offset":"2496"
         },
         "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossy_pool]",
-            "size":"1518",
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
             "dynamic_th":"3"
         },
         "egress_lossless_profile": {
             "pool":"[BUFFER_POOL|egress_lossless_pool]",
             "size":"0",
-            "static_th":"7274496"
+            "static_th":"12766208"
         },
         "egress_lossy_profile": {
             "pool":"[BUFFER_POOL|egress_lossy_pool]",