[Mellanox] Change mellanox buffer migrator for new SKU Mellanox-SN270…

…0-D40C8S8 (sonic-net#1470) **- What I did** Change mellanox buffer migrator for new SKU Mellanox-SN2700-D40C8S8 **- How I did it** New SKU Mellanox-SN2700-D40C8S8 will reuse buffer configuration of Mellanox-SN2700-D48C8 **- How to verify it** Run sonic-mgmt qos test and pass
raphaelt-nvidia · Mar 4, 2021 · 10a359a · 10a359a
1 parent 38c8e00
commit 10a359a
Show file tree

Hide file tree

Showing 10 changed files with 5,933 additions and 2 deletions.
diff --git a/scripts/mellanox_buffer_migrator.py b/scripts/mellanox_buffer_migrator.py
@@ -104,7 +104,7 @@ def __init__(self, configDB):
  self.spc2_platforms = ["x86_64-mlnx_msn3700-r0", "x86_64-mlnx_msn3700c-r0"]
  self.spc3_platforms = ["x86_64-mlnx_msn4600-r0", "x86_64-mlnx_msn4600c-r0", "x86_64-mlnx_msn4700-r0"]
 
- msftskus = ["Mellanox-SN2700", "Mellanox-SN2700-C28D8", "Mellanox-SN2700-D48C8",
+ msftskus = ["Mellanox-SN2700", "Mellanox-SN2700-C28D8", "Mellanox-SN2700-D48C8", "Mellanox-SN2700-D40C8S8",
  "Mellanox-SN3800-C64", "Mellanox-SN3800-D24C52", "Mellanox-SN3800-D112C8", "Mellanox-SN3800-D28C50"]
 
  self.is_msft_sku = self.sku in msftskus
@@ -328,9 +328,11 @@ def __init__(self, configDB):
  "pool_convert_map": {
  "spc1_t0_pool_sku_map": {"Mellanox-SN2700-C28D8": "spc1_2700-d48c8_t0_pool_shp",
  "Mellanox-SN2700-D48C8": "spc1_2700-d48c8_t0_pool_shp",
+ "Mellanox-SN2700-D40C8S8": "spc1_2700-d48c8_t0_pool_shp",
  "Mellanox-SN2700": "spc1_2700_t0_pool_shp"},
  "spc1_t1_pool_sku_map": {"Mellanox-SN2700-C28D8": "spc1_2700-d48c8_t1_pool_shp",
  "Mellanox-SN2700-D48C8": "spc1_2700-d48c8_t1_pool_shp",
+ "Mellanox-SN2700-D40C8S8": "spc1_2700-d48c8_t1_pool_shp",
  "Mellanox-SN2700": "spc1_2700_t1_pool_shp"}
  },
  "pool_mapped_from_old_version": {
@@ -379,7 +381,7 @@ def __init__(self, configDB):
 
  "headrooms": {
  "mapping": {
- "default": ("skumap", {"Mellanox-SN2700": "msft", "Mellanox-SN2700-C28D8": "msft", "Mellanox-SN2700-D48C8": "msft"})
+ "default": ("skumap", {"Mellanox-SN2700": "msft", "Mellanox-SN2700-C28D8": "msft", "Mellanox-SN2700-D48C8": "msft", "Mellanox-SN2700-D40C8S8": "msft"})
  },
  "spc1_headroom": {
  "default": ("version_1_0_4", "spc1_headroom"),

diff --git a/tests/db_migrator_input/appl_db/mellanox-sn2700-d40c8s8-t0-version_1_0_5.json b/tests/db_migrator_input/appl_db/mellanox-sn2700-d40c8s8-t0-version_1_0_5.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/tests/db_migrator_input/appl_db/mellanox-sn2700-d40c8s8-t0-version_2_0_0.json b/tests/db_migrator_input/appl_db/mellanox-sn2700-d40c8s8-t0-version_2_0_0.json
diff --git a/tests/db_migrator_input/appl_db/mellanox-sn2700-d40c8s8-t1-version_1_0_5.json b/tests/db_migrator_input/appl_db/mellanox-sn2700-d40c8s8-t1-version_1_0_5.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/tests/db_migrator_input/appl_db/mellanox-sn2700-d40c8s8-t1-version_2_0_0.json b/tests/db_migrator_input/appl_db/mellanox-sn2700-d40c8s8-t1-version_2_0_0.json
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t0-version_1_0_5.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t0-version_1_0_5.json
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t0-version_2_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t0-version_2_0_0.json