diff --git a/misc/config_tools/configurator/pyodide/validateScenario.py b/misc/config_tools/configurator/pyodide/validateScenario.py index 06bdd6773..2ccab26c2 100644 --- a/misc/config_tools/configurator/pyodide/validateScenario.py +++ b/misc/config_tools/configurator/pyodide/validateScenario.py @@ -8,7 +8,7 @@ from scenario_config.default_populator import DefaultValuePopulatingStage from scenario_config.pipeline import PipelineObject, PipelineEngine from scenario_config.validator import ValidatorConstructionByFileStage, SemanticValidationStage, \ SyntacticValidationStage -from scenario_config.xml_loader import XMLLoadStage +from scenario_config.xml_loader import LXMLLoadStage from .pyodide import ( convert_result, write_temp_file, @@ -22,12 +22,12 @@ def main(board, scenario): pipeline = PipelineEngine(["board_path", "scenario_path", "schema_path", "datachecks_path"]) stages = [ ValidatorConstructionByFileStage(), - XMLLoadStage("schema"), + LXMLLoadStage("schema"), - XMLLoadStage("board"), - XMLLoadStage("scenario"), + LXMLLoadStage("board"), + LXMLLoadStage("scenario"), DefaultValuePopulatingStage(), - SyntacticValidationStage(), + SyntacticValidationStage(), SemanticValidationStage(), ] diff --git a/misc/config_tools/library/__init__.py b/misc/config_tools/library/__init__.py new file mode 100644 index 000000000..7384f0562 --- /dev/null +++ b/misc/config_tools/library/__init__.py @@ -0,0 +1,6 @@ +# Copyright (C) 2022 Intel Corporation. +# +# SPDX-License-Identifier: BSD-3-Clause + +# Do Not Delete +# This file be used in configurator's wasm python env diff --git a/misc/config_tools/scenario_config/elementpath_overlay.py b/misc/config_tools/scenario_config/elementpath_overlay.py index c95015ee9..3e7081896 100644 --- a/misc/config_tools/scenario_config/elementpath_overlay.py +++ b/misc/config_tools/scenario_config/elementpath_overlay.py @@ -6,12 +6,18 @@ # SPDX-License-Identifier: BSD-3-Clause # +import sys, os from decimal import Decimal from copy import copy import operator -import rdt import elementpath +# Allow this script to find the library module at misc/config_tools/library. +# +# TODO: Reshuffle the module structure of the configuration toolset for clearer imports. +sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), '..')) +import library.rdt as rdt + BaseParser = elementpath.XPath2Parser class CustomParser(BaseParser): diff --git a/misc/config_tools/scenario_config/validator.py b/misc/config_tools/scenario_config/validator.py index 40cad8412..dabb4583e 100755 --- a/misc/config_tools/scenario_config/validator.py +++ b/misc/config_tools/scenario_config/validator.py @@ -262,7 +262,6 @@ def validate_all(validation_pipeline, pipeline_obj, data_dir): return nr_all_errors def main(args): - from xml_loader import XMLLoadStage from lxml_loader import LXMLLoadStage validator_construction_pipeline = PipelineEngine(["schema_path", "datachecks_path"]) @@ -275,8 +274,8 @@ def main(args): validation_pipeline = PipelineEngine(["board_path", "scenario_path", "schema_etree", "validator"]) validation_pipeline.add_stages([ - XMLLoadStage("board"), - XMLLoadStage("scenario"), + LXMLLoadStage("board"), + LXMLLoadStage("scenario"), DefaultValuePopulatingStage(), SyntacticValidationStage(), SemanticValidationStage(), diff --git a/misc/config_tools/schema/checks/rdt_support.xsd b/misc/config_tools/schema/checks/rdt_support.xsd index 74b0b64ed..befc64831 100644 --- a/misc/config_tools/schema/checks/rdt_support.xsd +++ b/misc/config_tools/schema/checks/rdt_support.xsd @@ -91,7 +91,7 @@ This error cannot be fixed by adjusting the configuration. Report a `GitHub issu + $needed < $capacity"> The current CAT configuration requires {string($needed)} CLOS IDs, which exceeds the capacity of the platform which supports {string($capacity)} at most.