-
Notifications
You must be signed in to change notification settings - Fork 663
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.
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
Complete Platform Validator PR #2857
Merged
isabelmsft
merged 5 commits into
sonic-net:master
from
isabelmsft:complete_platform_redo
Jun 8, 2023
Merged
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,116 @@ | ||
| from sonic_py_common import device_info | ||
| import os | ||
| import re | ||
| import json | ||
| import jsonpointer | ||
| import subprocess | ||
| from sonic_py_common import device_info | ||
| from .gu_common import GenericConfigUpdaterError | ||
|
|
||
|
|
||
| SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__)) | ||
| GCU_TABLE_MOD_CONF_FILE = f"{SCRIPT_DIR}/gcu_field_operation_validators.conf.json" | ||
| GET_HWSKU_CMD = "sonic-cfggen -d -v DEVICE_METADATA.localhost.hwsku" | ||
|
|
||
| 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'] | ||
|
|
||
| if asic_type == 'cisco-8000': | ||
| asic = "cisco-8000" | ||
| elif asic_type == 'mellanox' or asic_type == 'vs' or asic_type == 'broadcom': | ||
| proc = subprocess.Popen(GET_HWSKU_CMD, shell=True, universal_newlines=True, stdout=subprocess.PIPE) | ||
| output, err = proc.communicate() | ||
| hwsku = output.rstrip('\n') | ||
| if asic_type == 'mellanox' or asic_type == 'vs': | ||
| spc1_hwskus = asic_mapping["mellanox_asics"]["spc1"] | ||
| if hwsku.lower() in [spc1_hwsku.lower() for spc1_hwsku in spc1_hwskus]: | ||
| asic = "spc1" | ||
| if asic_type == 'broadcom' or asic_type == 'vs': | ||
| broadcom_asics = asic_mapping["broadcom_asics"] | ||
| for asic_shorthand, hwskus in broadcom_asics.items(): | ||
| if asic != "unknown": | ||
| break | ||
| for hwsku_cur in hwskus: | ||
| if hwsku_cur.lower() in hwsku.lower(): | ||
| asic = asic_shorthand | ||
| break | ||
|
|
||
| return asic | ||
|
|
||
| def rdma_config_update_validator(): | ||
| version_info = device_info.get_sonic_version_info() | ||
| asic_type = version_info.get('asic_type') | ||
|
|
||
| if (asic_type != 'mellanox' and asic_type != 'broadcom' and asic_type != 'cisco-8000'): | ||
| def rdma_config_update_validator(patch_element): | ||
| asic = get_asic_name() | ||
| if asic == "unknown": | ||
| return False | ||
| version_info = device_info.get_sonic_version_info() | ||
| build_version = version_info.get('build_version') | ||
| version_substrings = build_version.split('.') | ||
| branch_version = None | ||
|
|
||
| for substring in version_substrings: | ||
| if substring.isdigit() and re.match(r'^\d{8}$', substring): | ||
| branch_version = substring | ||
|
|
||
| path = patch_element["path"] | ||
| table = jsonpointer.JsonPointer(path).parts[0] | ||
|
|
||
| # Helper function to return relevant cleaned paths, consdiers case where the jsonpatch value is a dict | ||
| # For paths like /PFC_WD/Ethernet112/action, remove Ethernet112 from the path so that we can clearly determine the relevant field (i.e. action, not Ethernet112) | ||
| def _get_fields_in_patch(): | ||
| cleaned_fields = [] | ||
|
|
||
| field_elements = jsonpointer.JsonPointer(path).parts[1:] | ||
| cleaned_field_elements = [elem for elem in field_elements if not any(char.isdigit() for char in elem)] | ||
| cleaned_field = '/'.join(cleaned_field_elements).lower() | ||
|
|
||
|
|
||
| if 'value' in patch_element.keys() and isinstance(patch_element['value'], dict): | ||
| for key in patch_element['value']: | ||
| cleaned_fields.append(cleaned_field+ '/' + key) | ||
| else: | ||
| cleaned_fields.append(cleaned_field) | ||
|
|
||
| return cleaned_fields | ||
|
|
||
| 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") | ||
|
|
||
| tables = gcu_field_operation_conf["tables"] | ||
| scenarios = tables[table]["validator_data"]["rdma_config_update_validator"] | ||
|
|
||
| cleaned_fields = _get_fields_in_patch() | ||
| for cleaned_field in cleaned_fields: | ||
| scenario = None | ||
| for key in scenarios.keys(): | ||
| if cleaned_field in scenarios[key]["fields"]: | ||
| scenario = scenarios[key] | ||
| break | ||
|
|
||
| if scenario is None: | ||
| return False | ||
|
|
||
| if scenario["platforms"][asic] == "": | ||
| return False | ||
|
|
||
| if patch_element['op'] not in scenario["operations"]: | ||
| return False | ||
|
|
||
| if branch_version is not None: | ||
| if asic in scenario["platforms"]: | ||
| if branch_version < scenario["platforms"][asic]: | ||
| return False | ||
| else: | ||
| return False | ||
|
|
||
| return True | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should you check unknown much earlier? #Closed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
asic is set to "unknown" at the start of the function. It remains unknown until one of the specified asic types in the table is identified. The purpose of this particular check is to stop iterating over all possible broadcom asics once the asic is already identified.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If it is already identified as spc1, you can return immediately.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changed to return spc1 immediately