Skip to content

Commit c86d874

Browse files
committed
[generic_config_updater] Add Nokia TH6 HWSKUs to GCU field operation validators
* Add th6 broadcom ASIC entry with all Nokia IXR7220-H6 HWSKUs: Nokia-IXR7220-H6-64, Nokia-IXR7220-H6-P128, Nokia-IXR7220-H6-O256 * Add unit test for th6 ASIC name resolution Signed-off-by: dygodwin <dylan.godwin@nokia.com>
1 parent 054e25c commit c86d874

2 files changed

Lines changed: 15 additions & 1 deletion

File tree

generic_config_updater/gcu_field_operation_validators.conf.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
"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",
3636
"Arista-7060X6-64PE-B-P32O64", "Arista-7060X6-64PE-B-P64", "Arista-7060X6-64PE-B-P32V128",
3737
"Arista-7060X6-64PE-O128", "Arista-7060X6-64PE-O128S2", "Arista-7060X6-64PE-P32O64", "Arista-7060X6-64PE-P64", "Arista-7060X6-64PE-P32V128" ],
38+
"th6": [ "Nokia-IXR7220-H6-64", "Nokia-IXR7220-H6-P128", "Nokia-IXR7220-H6-O256" ],
3839
"td2": [ "Force10-S6000", "Force10-S6000-Q24S32", "Arista-7050-QX32", "Arista-7050-QX-32S", "Nexus-3164", "Arista-7050QX32S-Q32" ],
3940
"td3": [ "Arista-7050CX3-32C-C32", "Arista-7050CX3-32S-C32", "Arista-7050CX3-32S-D48C8", "Arista-7050CX3-32S-C28S4", "Arista-7050CX3-32C-C28S4" ],
4041
"td4": [ "Nokia-IXR7220-D4-36D" ],
@@ -72,6 +73,7 @@
7273
"th3": "20240500",
7374
"th4": "20240500",
7475
"th5": "20240500",
76+
"th6": "20251100",
7577
"td3": "20201200",
7678
"td4": "20241100",
7779
"q2c+": "20241100",
@@ -123,6 +125,7 @@
123125
"th3": "20240500",
124126
"th4": "20240500",
125127
"th5": "20240500",
128+
"th6": "20251100",
126129
"td3": "20201200",
127130
"td4": "20241100",
128131
"q2c+": "20241100",
@@ -151,6 +154,7 @@
151154
"th3": "20240500",
152155
"th4": "20240500",
153156
"th5": "20240500",
157+
"th6": "20251100",
154158
"td3": "20221100",
155159
"td4": "20241100",
156160
"q2c+": "20241100",
@@ -170,7 +174,8 @@
170174
"platforms": {
171175
"spc4": "20241200",
172176
"spc5": "20241200",
173-
"th5": "20241200"
177+
"th5": "20241200",
178+
"th6": "20251100"
174179
}
175180
}
176181
}

tests/generic_config_updater/field_operation_validator_test.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -828,6 +828,15 @@ def test_get_asic_th5(self, mock_popen, mock_get_sonic_version_info):
828828
for scope in ["localhost", "asic0"]:
829829
self.assertEqual(fov.get_asic_name(), "th5")
830830

831+
@patch('sonic_py_common.device_info.get_sonic_version_info')
832+
@patch('subprocess.Popen')
833+
def test_get_asic_th6(self, mock_popen, mock_get_sonic_version_info):
834+
mock_get_sonic_version_info.return_value = {'asic_type': 'broadcom'}
835+
mock_popen.return_value = mock.Mock()
836+
mock_popen.return_value.communicate.return_value = ["Nokia-IXR7220-H6-64", 0]
837+
for scope in ["localhost", "asic0"]:
838+
self.assertEqual(fov.get_asic_name(), "th6")
839+
831840
@patch('sonic_py_common.device_info.get_sonic_version_info')
832841
@patch('subprocess.Popen')
833842
def test_get_asic_td2(self, mock_popen, mock_get_sonic_version_info):

0 commit comments

Comments
 (0)