-
Notifications
You must be signed in to change notification settings - Fork 659
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "[GCU] Complete RDMA Platform Validation Checks (#2791)"
This reverts commit f258e2a.
- Loading branch information
1 parent
4fead89
commit 1be0c30
Showing
6 changed files
with
66 additions
and
379 deletions.
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,117 +1,10 @@ | ||
| 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" | ||
|
|
||
| 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"] | ||
|
|
||
| if device_info.get_sonic_version_info()['asic_type'] == 'cisco-8000': | ||
| asic = "cisco-8000" | ||
| elif device_info.get_sonic_version_info()['asic_type'] == 'mellanox': | ||
| GET_HWSKU_CMD = "sonic-cfggen -d -v DEVICE_METADATA.localhost.hwsku" | ||
| spc1_hwskus = asic_mapping["mellanox_asics"]["spc1"] | ||
| proc = subprocess.Popen(GET_HWSKU_CMD, shell=True, universal_newlines=True, stdout=subprocess.PIPE) | ||
| output, err = proc.communicate() | ||
| hwsku = output.rstrip('\n') | ||
| if hwsku.lower() in [spc1_hwsku.lower() for spc1_hwsku in spc1_hwskus]: | ||
| asic = "spc1" | ||
| elif device_info.get_sonic_version_info()['asic_type'] == 'broadcom': | ||
| command = ["sudo", "lspci"] | ||
| proc = subprocess.Popen(command, universal_newlines=True, stdout=subprocess.PIPE) | ||
| output, err = proc.communicate() | ||
| broadcom_asics = asic_mapping["broadcom_asics"] | ||
| for asic_shorthand, asic_descriptions in broadcom_asics.items(): | ||
| if asic != "unknown": | ||
| break | ||
| for asic_description in asic_descriptions: | ||
| if asic_description in output: | ||
| asic = asic_shorthand | ||
| break | ||
|
|
||
| return asic | ||
|
|
||
| import re | ||
|
|
||
| def rdma_config_update_validator(patch_element): | ||
| asic = get_asic_name() | ||
| if asic == "unknown": | ||
| return False | ||
| def rdma_config_update_validator(): | ||
| 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 | ||
| asic_type = version_info.get('asic_type') | ||
|
|
||
| if (asic_type != 'mellanox' and asic_type != 'broadcom' and asic_type != 'cisco-8000'): | ||
| 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.