Add Nokia H6 to GCU

Author: dgodwin-nokia

generic_config_updater/gcu_field_operation_validators.conf.json

@@ -32,6 +32,7 @@
                 "th4": [ "Nokia-IXR7220-H4-64D", "Nokia-IXR7220-H4-32D" ],
                 "th5": [ "Nokia-IXR7220-H5-64D", "Arista-7060X6-64DE", "Arista-7060X6-64PE", "Arista-7060X6-64PE-C224O8", "Arista-7060X6-64PE-C256S2", "Nokia-IXR7220-H5-64O", "Nokia-IXR7220-H5-32D",
                          "Arista-7060X6-64PE-B-C512S2", "Arista-7060X6-64PE-B-C448O16", "Arista-7060X6-64PE-B-O128", "Arista-7060X6-64PE-B-O128S2", "Arista-7060X6-16PE-384C-B-O128S2"],
+                "th6": [ "Nokia-IXR7220-H6-64", "Nokia-IXR7220-H6-128"],
                 "td2": [ "Force10-S6000", "Force10-S6000-Q24S32", "Arista-7050-QX32", "Arista-7050-QX-32S", "Nexus-3164", "Arista-7050QX32S-Q32" ],
                 "td3": [ "Arista-7050CX3-32C-C32", "Arista-7050CX3-32S-C32", "Arista-7050CX3-32S-D48C8", "Arista-7050CX3-32S-C28S4" ],
                 "td4": [ "Nokia-IXR7220-D4-36D" ],
@@ -69,6 +70,7 @@
                             "th3": "20240500",
                             "th4": "20240500",
                             "th5": "20240500",
+                            "th6": "20250500",
                             "td3": "20201200",
                             "td4": "20241100",
                             "q2c+": "20241100",
@@ -104,6 +106,7 @@
                             "th3": "20240500",
                             "th4": "20240500",
                             "th5": "20240500",
+                            "th6": "20250500",
                             "td3": "20221100",
                             "td4": "20241100",
                             "q2c+": "20241100",
@@ -140,6 +143,7 @@
                             "th3": "20240500",
                             "th4": "20240500",
                             "th5": "20240500",
+                            "th6": "20250500",
                             "td3": "20201200",
                             "td4": "20241100",
                             "q2c+": "20241100",
@@ -168,6 +172,7 @@
                             "th3": "20240500",
                             "th4": "20240500",
                             "th5": "20240500",
+                            "th6": "20250500",
                             "td3": "20221100",
                             "td4": "20241100",
                             "q2c+": "20241100",
@@ -187,7 +192,8 @@
                         "platforms": {
                             "spc4": "20241200",
                             "spc5": "20241200",
-                            "th5": "20241200"
+                            "th5": "20241200",
+                            "th6": "20250500"
                         }
                     }
                 }
@@ -216,6 +222,7 @@
                             "th3": "20240500",
                             "th4": "20240500",
                             "th5": "20240500",
+                            "th6": "20250500",
                             "td3": "20201200",
                             "td4": "20241100",
                             "q2c+": "20241100",

tests/generic_config_updater/field_operation_validator_test.py

@@ -705,6 +705,15 @@ def test_get_asic_th5(self, mock_popen, mock_get_sonic_version_info):
         for scope in ["localhost", "asic0"]:
             self.assertEqual(fov.get_asic_name(), "th5")
 
+    @patch('sonic_py_common.device_info.get_sonic_version_info')
+    @patch('subprocess.Popen')
+    def test_get_asic_th6(self, mock_popen, mock_get_sonic_version_info):
+        mock_get_sonic_version_info.return_value = {'asic_type': 'broadcom'}
+        mock_popen.return_value = mock.Mock()
+        mock_popen.return_value.communicate.return_value = ["Nokia-IXR7220-H6-128", 0]
+        for scope in ["localhost", "asic0"]:
+            self.assertEqual(fov.get_asic_name(), "th6")
+
     @patch('sonic_py_common.device_info.get_sonic_version_info')
     @patch('subprocess.Popen')
     def test_get_asic_td2(self, mock_popen, mock_get_sonic_version_info):