Add Arista 7800 platforms to GCU validator (sonic-net#4030)

xincunli-sonic · web-flow · commit bacff45ecb26 · 2025-08-12T10:34:26.000-07:00
diff --git a/generic_config_updater/field_operation_validators.py b/generic_config_updater/field_operation_validators.py
@@ -17,13 +17,13 @@
 
 def get_asic_name():
     asic = "unknown"
-    
+
     if os.path.exists(GCU_TABLE_MOD_CONF_FILE):
         with open(GCU_TABLE_MOD_CONF_FILE, "r") as s:
             gcu_field_operation_conf = json.load(s)
     else:
         raise GenericConfigUpdaterError("GCU table modification validators config file not found")
-    
+
     asic_mapping = gcu_field_operation_conf["helper_data"]["rdma_config_update_validator"]
     asic_type = device_info.get_sonic_version_info()['asic_type'] 
 
diff --git a/generic_config_updater/gcu_field_operation_validators.conf.json b/generic_config_updater/gcu_field_operation_validators.conf.json
@@ -36,7 +36,8 @@
                 "td3": [ "Arista-7050CX3-32C-C32", "Arista-7050CX3-32S-C32", "Arista-7050CX3-32S-D48C8", "Arista-7050CX3-32S-C28S4" ],
                 "td4": [ "Nokia-IXR7220-D4-36D" ],
                 "j2c+": [ "Nokia-IXR7250E-36x100G", "Nokia-IXR7250E-36x400G", "Nokia-IXR7250-X3B" ],
-                "q2c+": [ "Nokia-IXR7250-X1B" ]
+                "q2c+": [ "Nokia-IXR7250-X1B" ],
+                "jr2": [ "Arista-7800R3-48CQ2-C48", "Arista-7800R3-48CQM2-C48" ]
             }
 	}
     },
@@ -56,7 +57,7 @@
                         "operations": ["remove", "add", "replace"],
                         "platforms": {
                             "spc1": "20181100",
-			    "spc2": "20191100",
+                            "spc2": "20191100",
                             "spc3": "20220500",
                             "spc4": "20221100",
                             "spc5": "20241200",
@@ -90,7 +91,7 @@
                         "operations": ["replace"],
                         "platforms": {
                             "spc1": "20191100",
-			    "spc2": "20191100",
+                            "spc2": "20191100",
                             "spc3": "20220500",
                             "spc4": "20221100",
                             "spc5": "20241200",
@@ -121,7 +122,7 @@
                         "operations": ["replace"],
                         "platforms": {
                             "spc1": "20181100",
-			    "spc2": "20191100",
+                            "spc2": "20191100",
                             "spc3": "20220500",
                             "spc4": "20221100",
                             "spc5": "20241200",
@@ -146,7 +147,7 @@
                         "operations": ["replace"],
                         "platforms": {
                             "spc1": "20191100",
-			    "spc2": "20191100",
+                            "spc2": "20191100",
                             "spc3": "20220500",
                             "spc4": "20221100",
                             "spc5": "20241200",
diff --git a/tests/generic_config_updater/field_operation_validator_test.py b/tests/generic_config_updater/field_operation_validator_test.py
@@ -608,6 +608,15 @@ def test_get_asic_j2cplus(self, mock_popen, mock_get_sonic_version_info):
         for scope in ["localhost", "asic0"]:
             self.assertEqual(fov.get_asic_name(), "j2c+")
 
+    @patch('sonic_py_common.device_info.get_sonic_version_info')
+    @patch('subprocess.Popen')
+    def test_get_asic_jr2(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 = ["Arista-7800R3-48CQ2-C48", 0]
+        for scope in ["localhost", "asic0"]:
+            self.assertEqual(fov.get_asic_name(), "jr2")
+
     @patch('sonic_py_common.device_info.get_sonic_version_info')
     @patch('subprocess.Popen')
     def test_get_asic_q2cplus(self, mock_popen, mock_get_sonic_version_info):
