Skip to content

[202512] Cherry-pick PR #4223: Add Nokia TH6 HWSKUs to GCU field operation validators #309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bingwang-ms merged 1 commit into from
Apr 13, 2026
Merged

[202512] Cherry-pick PR #4223: Add Nokia TH6 HWSKUs to GCU field operation validators #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion generic_config_updater/gcu_field_operation_validators.conf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"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",
"Arista-7060X6-64PE-B-P32O64", "Arista-7060X6-64PE-B-P64", "Arista-7060X6-64PE-B-P32V128",
"Arista-7060X6-64PE-O128", "Arista-7060X6-64PE-O128S2", "Arista-7060X6-64PE-P32O64", "Arista-7060X6-64PE-P64", "Arista-7060X6-64PE-P32V128" ],
"th6": [ "Nokia-IXR7220-H6-64", "Nokia-IXR7220-H6-P128", "Nokia-IXR7220-H6-O256" ],
"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" ],
Expand Down Expand Up @@ -70,6 +71,7 @@
"th3": "20240500",
"th4": "20240500",
"th5": "20240500",
"th6": "20251100",
"td3": "20201200",
"td4": "20241100",
"q2c+": "20241100",
Expand Down Expand Up @@ -120,6 +122,7 @@
"th3": "20240500",
"th4": "20240500",
"th5": "20240500",
"th6": "20251100",
"td3": "20201200",
"td4": "20241100",
"q2c+": "20241100",
Expand Down Expand Up @@ -147,6 +150,7 @@
"th3": "20240500",
"th4": "20240500",
"th5": "20240500",
"th6": "20251100",
"td3": "20221100",
"td4": "20241100",
"q2c+": "20241100",
Expand All @@ -165,7 +169,8 @@
"platforms": {
"spc4": "20241200",
"spc5": "20241200",
"th5": "20241200"
"th5": "20241200",
"th6": "20251100"
}
}
}
Expand Down
9 changes: 9 additions & 0 deletions tests/generic_config_updater/field_operation_validator_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,6 +784,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-64", 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):
Expand Down
Loading