OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

config_tools: resolve incompatibility with elementpath 2.5.3 

This patch adds to the customized function `number-of-clos-id-needed` more
robust checks, which ensures that a given node is a concrete element,
before that function passes the node to `get_policy_list`. This resolves
the incompatibility issue with elementpath 2.5.3 which is reported in v3.0.

Tracked-On: #7893
Signed-off-by: Junjie Mao <junjie.mao@intel.com>
This commit is contained in:
Junjie Mao 2022-07-11 22:36:36 +08:00 committed by acrnsi-robot
parent 05460f151a
commit df41ce807f
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
misc/config_tools/scenario_config/elementpath_overlay.py
View File

@ -96,10 +96,17 @@ def select_duplicate_values_function(self, context=None):
@method(function('number-of-clos-id-needed', nargs=1)) @method(function('number-of-clos-id-needed', nargs=1))
def evaluate_number_of_clos_id_needed(self, context=None): def evaluate_number_of_clos_id_needed(self, context=None):
op = self.get_argument(context, index=0) op = self.get_argument(context, index=0)
try: if op is not None:
return len(rdt.get_policy_list(op.elem)) if op else 0 if isinstance(op, elementpath.TypedElement):
except AttributeError as err: op = op.elem
raise self.error('XPTY0004', err)
# This function may be invoked when the xmlschema library parses the data check schemas, in which case `op` will
# be an object of class Xsd11Element. Only attempt to calculate the needed CLOS IDs when a real acrn-config node
# is given.
if hasattr(op, "xpath"):
return len(rdt.get_policy_list(op))
return 0
### ###
# Collection of counter examples # Collection of counter examples