diff --git a/tests/common/mellanox_data.py b/tests/common/mellanox_data.py
index adad8e8ef7e..be66cedaaf2 100644
--- a/tests/common/mellanox_data.py
+++ b/tests/common/mellanox_data.py
@@ -1,7 +1,7 @@
 
 SPC1_HWSKUS = ["ACS-MSN2700", "Mellanox-SN2700", "Mellanox-SN2700-D48C8", "ACS-MSN2740", "ACS-MSN2100", "ACS-MSN2410", "ACS-MSN2010"]
-SPC2_HWSKUS = ["ACS-MSN3700", "ACS-MSN3700C", "ACS-MSN3800", "Mellanox-SN3800-D112C8"]
-SPC3_HWSKUS = ["ACS-MSN4700"]
+SPC2_HWSKUS = ["ACS-MSN3700", "ACS-MSN3700C", "ACS-MSN3800", "Mellanox-SN3800-D112C8", "ACS-MSN3420"]
+SPC3_HWSKUS = ["ACS-MSN4700", "ACS-MSN4600C"]
 SWITCH_HWSKUS = SPC1_HWSKUS + SPC2_HWSKUS + SPC3_HWSKUS
 
 SWITCH_MODELS = {
@@ -159,7 +159,7 @@
         "reboot": {
             "cold_reboot": True,
             "fast_reboot": True,
-            "warm_reboot": False
+            "warm_reboot": True
         },
         "fans": {
             "number": 4,
@@ -256,7 +256,7 @@
         "reboot": {
             "cold_reboot": True,
             "fast_reboot": True,
-            "warm_reboot": False
+            "warm_reboot": True
         },
         "fans": {
             "number": 4,
@@ -299,7 +299,7 @@
         "reboot": {
             "cold_reboot": True,
             "fast_reboot": True,
-            "warm_reboot": False
+            "warm_reboot": True
         },
         "fans": {
             "number": 4,
@@ -341,8 +341,8 @@
     "ACS-MSN3800": {
         "reboot": {
             "cold_reboot": True,
-            "fast_reboot": True,
-            "warm_reboot": False
+            "fast_reboot": False,
+            "warm_reboot": True
         },
         "fans": {
             "number": 3,
@@ -398,8 +398,8 @@
     "Mellanox-SN3800-D112C8": {
         "reboot": {
             "cold_reboot": True,
-            "fast_reboot": True,
-            "warm_reboot": False
+            "fast_reboot": False,
+            "warm_reboot": True
         },
         "fans": {
             "number": 3,
@@ -417,13 +417,46 @@
         },
         "ports": {
             "number": 64
+        },
+        "thermals": {
+            "cpu_core": {
+                "start": 0,
+                "number": 4
+            },
+            "module": {
+                "start": 1,
+                "number": 64
+            },
+            "psu": {
+                "start": 1,
+                "number": 2
+            },
+            "cpu_pack": {
+                "number": 1
+            },
+            "gearbox": {
+                "start": 1,
+                "number": 32
+            },
+            "asic_ambient": {
+                "number": 1
+            },
+            "port_ambient": {
+                "number": 1
+            },
+            "fan_ambient": {
+                "number": 1
+            },
+            "comex_ambient": {
+                "number": 1
+            }
         }
     },
     "ACS-MSN3700": {
         "reboot": {
             "cold_reboot": True,
-            "fast_reboot": True,
-            "warm_reboot": False
+            "fast_reboot": False,
+            "warm_reboot": True
         },
         "fans": {
             "number": 6,
@@ -475,8 +508,8 @@
     "ACS-MSN3700C": {
         "reboot": {
             "cold_reboot": True,
-            "fast_reboot": True,
-            "warm_reboot": False
+            "fast_reboot": False,
+            "warm_reboot": True
         },
         "fans": {
             "number": 4,
@@ -529,7 +562,7 @@
         "reboot": {
             "cold_reboot": True,
             "fast_reboot": False,
-            "warm_reboot": False
+            "warm_reboot": True
         },
         "fans": {
             "number": 6,
@@ -547,6 +580,141 @@
         },
         "ports": {
             "number": 32
+        },
+        "thermals": {
+            "cpu_core": {
+                "start": 0,
+                "number": 4
+            },
+            "module": {
+                "start": 1,
+                "number": 32
+            },
+            "psu": {
+                "start": 1,
+                "number": 2
+            },
+            "cpu_pack": {
+                "number": 1
+            },
+            "asic_ambient": {
+                "number": 1
+            },
+            "port_ambient": {
+                "number": 1
+            },
+            "fan_ambient": {
+                "number": 1
+            },
+            "comex_ambient": {
+                "number": 1
+            }
+        }
+    },
+    "ACS-MSN4600C": {
+        "reboot": {
+            "cold_reboot": True,
+            "fast_reboot": False,
+            "warm_reboot": True
+        },
+        "fans": {
+            "number": 1,
+            "hot_swappable": True
+        },
+        "psus": {
+            "number": 2,
+            "hot_swappable": True
+        },
+        "cpu_pack": {
+            "number": 1
+        },
+        "cpu_cores": {
+            "number": 4
+        },
+        "ports": {
+            "number": 64
+        },
+        "thermals": {
+            "cpu_core": {
+                "start": 0,
+                "number": 2
+            },
+            "module": {
+                "start": 1,
+                "number": 60
+            },
+            "psu": {
+                "start": 1,
+                "number": 2
+            },
+            "cpu_pack": {
+                "number": 1
+            },
+            "asic_ambient": {
+                "number": 1
+            },
+            "port_ambient": {
+                "number": 1
+            },
+            "fan_ambient": {
+                "number": 1
+            },
+            "comex_ambient": {
+                "number": 1
+            }
+        }
+    },
+    "ACS-MSN3420": {
+        "reboot": {
+            "cold_reboot": True,
+            "fast_reboot": False,
+            "warm_reboot": True
+        },
+        "fans": {
+            "number": 5,
+            "hot_swappable": True
+        },
+        "psus": {
+            "number": 2,
+            "hot_swappable": True
+        },
+        "cpu_pack": {
+            "number": 1
+        },
+        "cpu_cores": {
+            "number": 2
+        },
+        "ports": {
+            "number": 60
+        },
+        "thermals": {
+            "cpu_core": {
+                "start": 0,
+                "number": 2
+            },
+            "module": {
+                "start": 1,
+                "number": 60
+            },
+            "psu": {
+                "start": 1,
+                "number": 2
+            },
+            "cpu_pack": {
+                "number": 1
+            },
+            "asic_ambient": {
+                "number": 1
+            },
+            "port_ambient": {
+                "number": 1
+            },
+            "fan_ambient": {
+                "number": 1
+            },
+            "comex_ambient": {
+                "number": 1
+            }
         }
     }
 }