-
Notifications
You must be signed in to change notification settings - Fork 1k
Added consistency checker #14402
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
Added consistency checker #14402
Changes from all commits
8e91f0c
378d163
7322b07
a6b8db2
8d95723
53f4be6
ce433ae
f0aeb36
76f154d
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,346 @@ | ||
| import pytest | ||
| import logging | ||
| import json | ||
| import os | ||
| import datetime | ||
| from collections import defaultdict | ||
| from tests.common.fixtures.consistency_checker.constants import SUPPORTED_PLATFORMS_AND_VERSIONS | ||
|
|
||
| logger = logging.getLogger(__name__) | ||
|
|
||
| SYNCD_CONTAINER = "syncd" | ||
| QUERY_ASIC_SCRIPT = "query-asic.py" | ||
| QUERY_ASIC_PARSER = "parser.py" | ||
| LIBSAIREDIS_DEB = "libsairedis.deb" | ||
| PYTHON3_PYSAIREDIS_DEB = "python3-pysairedis.deb" | ||
| DUT_DST_PATH_HOST = "/tmp/consistency-checker" | ||
| DUT_DST_PATH_CONTAINER = "/consistency-checker" | ||
|
|
||
| QUERY_ASIC_PATH_SRC = os.path.dirname(__file__) + "/query-asic" | ||
| QUERY_ASIC_SCRIPT_PATH_SRC = QUERY_ASIC_PATH_SRC + "/" + QUERY_ASIC_SCRIPT | ||
| QUERY_ASIC_PARSER_PATH_SRC = QUERY_ASIC_PATH_SRC + "/" + QUERY_ASIC_PARSER | ||
| QUERY_ASIC_SCRIPT_PATH_DST_HOST = DUT_DST_PATH_HOST + "/" + QUERY_ASIC_SCRIPT | ||
| QUERY_ASIC_PARSER_PATH_DST_HOST = DUT_DST_PATH_HOST + "/" + QUERY_ASIC_PARSER | ||
| QUERY_ASIC_SCRIPT_PATH_DST_CONTAINER = DUT_DST_PATH_CONTAINER + "/" + QUERY_ASIC_SCRIPT | ||
|
|
||
| LIBSAIREDIS_TEMP = "libsairedis-temp" | ||
|
|
||
|
|
||
| class ConsistencyChecker: | ||
|
|
||
| def __init__(self, duthost, libsairedis_download_url=None, python3_pysairedis_download_url=None): | ||
| """ | ||
| If the libsairedis_download_url and python3_pysairedis_download_url are provided, then these artifacts | ||
| are downloaded and installed on the DUT, otherwise it's assumed that the environment is already setup | ||
| for the consistency checker. | ||
| """ | ||
| self._duthost = duthost | ||
| self._libsairedis_download_url = libsairedis_download_url | ||
| self._python3_pysairedis_download_url = python3_pysairedis_download_url | ||
|
|
||
| def __enter__(self): | ||
| logger.info("Initializing consistency checker on dut...") | ||
|
|
||
| self._duthost.file(path=DUT_DST_PATH_HOST, state="directory") | ||
| self._duthost.copy(src=QUERY_ASIC_SCRIPT_PATH_SRC, dest=QUERY_ASIC_SCRIPT_PATH_DST_HOST) | ||
| self._duthost.copy(src=QUERY_ASIC_PARSER_PATH_SRC, dest=QUERY_ASIC_PARSER_PATH_DST_HOST) | ||
|
|
||
| if self._libsairedis_download_url is not None: | ||
| self._duthost.command(f"curl -o {DUT_DST_PATH_HOST}/{LIBSAIREDIS_DEB} {self._libsairedis_download_url}") | ||
| if self._python3_pysairedis_download_url is not None: | ||
| self._duthost.command( | ||
| f"curl -o {DUT_DST_PATH_HOST}/{PYTHON3_PYSAIREDIS_DEB} {self._python3_pysairedis_download_url}") | ||
|
|
||
| # Move everything into syncd container | ||
| self._duthost.shell(( | ||
| f"docker cp {DUT_DST_PATH_HOST} {SYNCD_CONTAINER}:/ && " | ||
| f"rm -rf {DUT_DST_PATH_HOST}" | ||
| )) | ||
|
|
||
| if self._python3_pysairedis_download_url is not None: | ||
| # Install python3-sairedis in syncd container | ||
| self._duthost.shell((f"docker exec {SYNCD_CONTAINER} bash -c " | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. DEB installation failures are not caught and not logged.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The kwarg module_ignore_errors kwarg is implicitly False here. So if the deb installation fails an error will be raised with the failing command. I don't think we should catch and log and continue. |
||
| f"'cd {DUT_DST_PATH_CONTAINER} && " | ||
| f"dpkg --install {DUT_DST_PATH_CONTAINER}/{PYTHON3_PYSAIREDIS_DEB}'")) | ||
|
|
||
| if self._libsairedis_download_url is not None: | ||
| # Extract the libsairedis deb to be used by the query script | ||
| self._duthost.shell((f"docker exec {SYNCD_CONTAINER} bash -c " | ||
| f"'cd {DUT_DST_PATH_CONTAINER} && " | ||
| f"dpkg --extract {DUT_DST_PATH_CONTAINER}/{LIBSAIREDIS_DEB} {LIBSAIREDIS_TEMP}'")) | ||
|
|
||
| logger.info("Consistency checker setup complete.") | ||
|
|
||
| return self | ||
|
|
||
| def __exit__(self, exc_type, exc_val, exc_tb): | ||
| logger.info("Cleaning up consistency checker on dut...") | ||
|
|
||
| if self._python3_pysairedis_download_url is not None: | ||
| # Uninstall python3-sairedis in syncd container | ||
| self._duthost.command(f"docker exec {SYNCD_CONTAINER} dpkg --remove python3-pysairedis") | ||
|
|
||
| # Remove all the files from the syncd container | ||
| self._duthost.command(f"docker exec {SYNCD_CONTAINER} rm -rf {DUT_DST_PATH_CONTAINER}") | ||
|
|
||
| # NOTE: If consistency checker is used to do write operations (currently it's read-only), then syncd should be | ||
| # restarted or minigraph reloaded re-align the ASIC_DB and ASIC state. | ||
|
|
||
| logger.info("Consistency checker cleanup complete.") | ||
Ryangwaite marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| def get_db_and_asic_peers(self, keys=["*"]) -> dict: | ||
| """ | ||
| Bulk query ASIC data that exists in the ASIC_DB. | ||
|
|
||
| :param keys: Optional list of glob search strings that correspond to the --key arg of sonic-db-dump. | ||
| sonic-db-dump doesn't take multiple keys, so a list is passed in to support multiple | ||
| keys at the API level. | ||
| :return: Dictionary containing the queried ASIC data. | ||
|
|
||
| Example return value: | ||
| { | ||
| "ASIC_STATE:SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x1900000000154f": { | ||
| "SAI_BUFFER_PROFILE_ATTR_POOL_ID": { | ||
| "dbValue": "oid:0x1800000000154a", | ||
| "asicValue": "oid:0x1800000000154a", | ||
| "asicQuerySuccess": True | ||
| }, | ||
| "SAI_BUFFER_PROFILE_ATTR_SHARED_DYNAMIC_TH": { | ||
| "dbValue": "0", | ||
| "asicValue": -1, | ||
| "asicQuerySuccess": False, | ||
| "asicQueryErrorMsg": "Failed to query attribute value" | ||
| }, | ||
| "SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE": { | ||
| "dbValue": "SAI_BUFFER_PROFILE_THRESHOLD_MODE_DYNAMIC", | ||
| "asicValue": "SAI_BUFFER_PROFILE_THRESHOLD_MODE_DYNAMIC", | ||
| "asicQuerySuccess": True | ||
| }, | ||
| ... | ||
| }, | ||
| ... | ||
| } | ||
| """ | ||
|
|
||
| db_attributes = self._get_db_attributes(keys) | ||
| asic_attributes = self._get_asic_attributes_from_db_results(db_attributes) | ||
|
|
||
| results = defaultdict(dict) | ||
|
|
||
| for object in db_attributes: | ||
| db_object = db_attributes[object] | ||
| asic_object = asic_attributes[object] | ||
|
|
||
| for attr in db_object["value"].keys(): | ||
| db_value = db_object["value"][attr] | ||
| asic_value = asic_object[attr]["asicValue"] | ||
|
|
||
| if db_value.startswith("oid:0x"): | ||
| # Convert the asic one to the same format | ||
| try: | ||
| asic_value = f"oid:{hex(int(asic_value))}" | ||
| except Exception: | ||
| # keep the value as is | ||
| pass | ||
|
|
||
| results[object][attr] = { | ||
| "dbValue": db_value, | ||
| "asicValue": asic_value, | ||
| "asicQuerySuccess": asic_object[attr]["success"] | ||
| } | ||
|
|
||
| if not asic_object[attr]["success"]: | ||
| results[object][attr]["asicQueryErrorMsg"] = asic_object[attr]["error"] | ||
|
|
||
| return dict(results) | ||
|
|
||
| def check_consistency(self, keys=["*"]) -> dict: | ||
| """ | ||
| Get the out-of-sync ASIC_DB and ASIC attributes. Differences are indicative of an error state. | ||
| Same arg style as the get_objects function but returns a list of objects that don't match or couldn't | ||
| be queried from the ASIC. If it was successfully queried and has a matching value, then it won't be | ||
| included in the response. | ||
|
|
||
| :param keys: Optional list of glob search strings that correspond to the --key arg of sonic-db-dump. | ||
| sonic-db-dump doesn't take multiple keys, so a list is passed in to support multiple | ||
| keys at the API level. | ||
| :return: Dictionary containing the out-of-sync ASIC_DB and ASIC attributes. | ||
|
|
||
| Example return val (matching): | ||
| {} | ||
|
|
||
| Example return val (mismatch): | ||
| { | ||
| "ASIC_STATE:SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x1900000000154f": { | ||
| "attributes": { | ||
| "SAI_BUFFER_PROFILE_ATTR_SHARED_DYNAMIC_TH": { | ||
| "dbValue": "0", | ||
| "asicValue": -1, | ||
| }, | ||
| "SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE": { | ||
| "dbValue": "SAI_BUFFER_PROFILE_THRESHOLD_MODE_DYNAMIC", | ||
| "asicValue": "SAI_BUFFER_PROFILE_THRESHOLD_MODE_STATIC" | ||
| }, | ||
| ... | ||
| }, | ||
| "failedToQueryAsic": [ | ||
| {"SAI_BUFFER_PROFILE_ATTR_SHARED_DYNAMIC_TH": "Failed to query attribute value"} | ||
| ], | ||
| "mismatchedAttributes": ["SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE"] | ||
| }, | ||
| ... | ||
| } | ||
| """ | ||
|
|
||
| db_attributes = self._get_db_attributes(keys) | ||
| asic_attributes = self._get_asic_attributes_from_db_results(db_attributes) | ||
|
|
||
| inconsistencies = defaultdict(lambda: { | ||
| "attributes": {}, | ||
| "failedToQueryAsic": [], | ||
| "mismatchedAttributes": [] | ||
| }) | ||
|
|
||
| for object in db_attributes: | ||
| db_object = db_attributes[object] | ||
| asic_object = asic_attributes[object] | ||
|
|
||
| for attr in db_object["value"].keys(): | ||
| db_value = db_object["value"][attr] | ||
| asic_value = asic_object[attr]["asicValue"] | ||
| asic_query_success = asic_object[attr]["success"] | ||
|
|
||
| if asic_query_success and db_value == asic_value: | ||
| continue | ||
|
|
||
| if db_value.startswith("oid:0x"): | ||
| # Convert the asic one to the same format | ||
| try: | ||
| asic_value = f"oid:{hex(int(asic_value))}" | ||
| if db_value == asic_value: | ||
| continue | ||
| except Exception: | ||
| # true error - let below code handle it | ||
| pass | ||
|
|
||
| inconsistencies[object]["attributes"][attr] = { | ||
| "dbValue": db_value, | ||
| "asicValue": asic_value | ||
| } | ||
|
|
||
| if asic_query_success: | ||
| inconsistencies[object]["mismatchedAttributes"].append(attr) | ||
| else: | ||
| inconsistencies[object]["failedToQueryAsic"].append({attr: asic_object[attr]["error"]}) | ||
|
|
||
| return dict(inconsistencies) | ||
|
|
||
| def _get_db_attributes(self, keys: list) -> dict: | ||
| """ | ||
| Fetchs and merges the attributes of the objects returned by the search key from the DB. | ||
| """ | ||
| db_attributes = {} | ||
| for key in keys: | ||
| result = self._duthost.command(f"sonic-db-dump -k '{key}' -n ASIC_DB") | ||
| if result['rc'] != 0: | ||
| raise Exception((f"Failed to fetch attributes for key '{key}' from ASIC_DB. " | ||
| f"Return code: {result['rc']}, stdout: {result['stdout']}, " | ||
| f"stderr: {result['stderr']}")) | ||
|
|
||
| query_result = json.loads(result['stdout']) | ||
| db_attributes.update(query_result) | ||
|
|
||
| return db_attributes | ||
|
|
||
| def _get_asic_attributes_from_db_results(self, db_attributes: dict) -> dict: | ||
| """ | ||
| Queries the ASIC for the attributes of the objects in db_attributes which are the results | ||
| from the ASIC DB query. | ||
|
|
||
| Example return value: | ||
| { | ||
| "ASIC_STATE:SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000628": { | ||
| "SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE": { | ||
| "asicValue": "SAI_BUFFER_POOL_THRESHOLD_MODE_STATIC", | ||
| "success": true | ||
| }, | ||
| "SAI_BUFFER_POOL_ATTR_SIZE": { | ||
| "success" false, | ||
| "error": "Failed to query attribute value" | ||
| }, | ||
| "SAI_BUFFER_POOL_ATTR_TYPE": { | ||
| "asicValue": "SAI_BUFFER_POOL_TYPE_EGRESS", | ||
| "success": true | ||
| } | ||
| }, | ||
| ... | ||
| } | ||
| """ | ||
| # Map to format expected by the query-asic.py | ||
| asic_query = {k: list(v["value"].keys()) for k, v in db_attributes.items()} | ||
| asic_query_input_filename = f"query-input-{datetime.datetime.now().strftime('%Y%m%d%H%M%S')}.json" | ||
| with open(f"/tmp/{asic_query_input_filename}", 'w') as f: | ||
| json.dump(asic_query, f) | ||
|
|
||
| # Copy the input file to the syncd container | ||
| self._duthost.copy(src=f"/tmp/{asic_query_input_filename}", dest=f"/tmp/{asic_query_input_filename}") | ||
| self._duthost.shell((f"docker cp /tmp/{asic_query_input_filename} " | ||
| f"{SYNCD_CONTAINER}:{DUT_DST_PATH_CONTAINER} && " | ||
| f"rm /tmp/{asic_query_input_filename}")) | ||
|
|
||
| ld_lib_path_arg = f"LD_LIBRARY_PATH={LIBSAIREDIS_TEMP}/usr/lib/x86_64-linux-gnu"\ | ||
| if self._libsairedis_download_url is not None else "" | ||
|
|
||
| res = self._duthost.shell((f"docker exec {SYNCD_CONTAINER} bash -c " | ||
| f"'cd {DUT_DST_PATH_CONTAINER} && " | ||
| f"{ld_lib_path_arg} python3 {QUERY_ASIC_SCRIPT_PATH_DST_CONTAINER} " | ||
| f"--input {asic_query_input_filename}'")) | ||
| if res['rc'] != 0: | ||
| raise Exception((f"Failed to query ASIC attributes. Return code: {res['rc']}, stdout: {res['stdout']}, " | ||
| f"stderr: {res['stderr']}")) | ||
| asic_results = json.loads(res['stdout']) | ||
|
|
||
| return asic_results | ||
|
|
||
|
|
||
| class ConsistencyCheckerProvider: | ||
| def is_consistency_check_supported(self, dut) -> bool: | ||
| """ | ||
| Checks if the provided DUT is supported for consistency checking. | ||
|
|
||
| :param dut: SonicHost object | ||
| :return bool: True if the DUT is supported, False otherwise | ||
| """ | ||
|
|
||
| platform = dut.facts['platform'] | ||
| if platform not in SUPPORTED_PLATFORMS_AND_VERSIONS: | ||
| return False | ||
|
|
||
| current_version = dut.image_facts()['ansible_facts']['ansible_image_facts']['current'] | ||
| supported_versions = SUPPORTED_PLATFORMS_AND_VERSIONS[platform] | ||
| if any(v in current_version for v in supported_versions): | ||
| return True | ||
|
|
||
| return False | ||
|
|
||
| def get_consistency_checker(self, dut, libsairedis_download_url=None, | ||
| python3_pysairedis_download_url=None) -> ConsistencyChecker: | ||
| """ | ||
| Get a new instance of the ConsistencyChecker class. | ||
|
|
||
| :param dut: SonicHost object | ||
| :param libsairedis_download_url: Optional URL that the consistency checker should use to download the | ||
| libsairedis deb | ||
| :param python3_pysairedis_download_url: Optional URL that the consistency checker should use to | ||
| download the python3-pysairedis deb | ||
| :return ConsistencyChecker: New instance of the ConsistencyChecker class | ||
| """ | ||
| return ConsistencyChecker(dut, libsairedis_download_url, python3_pysairedis_download_url) | ||
|
|
||
|
|
||
| @pytest.fixture | ||
| def consistency_checker_provider(): | ||
| """ | ||
| Fixture that provides the ConsistencyCheckerProvider class. | ||
| """ | ||
| return ConsistencyCheckerProvider() | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
|
|
||
| # The list of platforms and versions that have been tested to work with the consistency checker | ||
| SUPPORTED_PLATFORMS_AND_VERSIONS = { | ||
| "x86_64-arista_7060_cx32s": ["202305", "202311"], | ||
| "x86_64-arista_7260cx3_64": ["202305", "202311"], | ||
| } |
Uh oh!
There was an error while loading. Please reload this page.