def get_enum(source, options, obj_type): - elements = [str(x) for x in elementpath.select(source, options) if x] + if options == "//inputs/input": + inputs_etree = [x for x in elementpath.select(source, options) if x is not None] + elements = [f"Device name: {str(elementpath.select(i, './name/text()')[0])}, Device physical path: {str(elementpath.select(i, './phys/text()')[0])}" for i in inputs_etree] + else: + elements = [str(x) for x in elementpath.select(source, options) if x]
This file contains the general logic to extract enum values from annotations and is not where item-specific logic should be placed. XPATH 2.0 already supports functions like string-join and for-expressions. You should be able to express what you need using a single XPATH.
elements = list(set(elements)) if not elements: elements = [''] @@ -42,7 +47,10 @@ def get_dynamic_scenario(board): # get enum data enum = function(source, selector, obj_type) if sorted_func: - enum = sorted(enum, key=eval(sorted_func)) + try: + enum = sorted(enum, key=eval(sorted_func)) + except IndexError as e: + logging.warning(e)
Why do you need catch this exception?
-- Best Regards Junjie Mao
return enum
def dynamic_enum_apply(obj): diff --git a/misc/config_tools/schema/VMtypes.xsd b/misc/config_tools/schema/VMtypes.xsd index 302e152b6..8fe381caa 100644 --- a/misc/config_tools/schema/VMtypes.xsd +++ b/misc/config_tools/schema/VMtypes.xsd @@ -395,7 +395,8 @@ device file when user config it as virtio serial port, which can be read and wri <xs:complexType name="VirtioInputConfiguration"> <xs:sequence> <xs:element name="backend_device_file" type="xs:string" minOccurs="0"> - <xs:annotation acrn:title="Backend device file" acrn:widget-options="'placeholder': '/dev/input/eventX'"> + <xs:annotation acrn:title="Backend device file" acrn:widget-options="'placeholder': '/dev/input/eventX'" acrn:options="//inputs/input" + acrn:options-sorted-by="lambda s: (s.split('Device name: ')[1].split(', Device physical path')[0], s.split('Device physical path: ')[1])"> <xs:documentation>Specifying backend device in service vm with device description.</xs:documentation> </xs:annotation> </xs:element>
