github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-07-06 03:56:18 +00:00
Code Issues Projects Releases Wiki Activity

misc: configurator: Bugfix: Incorrect DynamicEnum type

Browse Source 
Currently dynamicEnum hook returns all available options (enums) as a
list of strings. However in some cases strings need to be converted to
target types.

One example is CPU affinity. The dynamicEnum should produce a list of
all available pCPUIDs (a list of integers), instead of a list of
strings.

This patch adds a converter in get_enum to do the type conversion.

Tracked-On: #7420
Signed-off-by: Yifan Liu <yifan1.liu@intel.com>
This commit is contained in:
Yifan Liu 2022-05-06 08:48:32 +08:00 committed by acrnsi-robot
parent 35dc60192f
commit bf656a1141
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
misc/config_tools/configurator/pyodide/loadBoard.py
View File

@ -19,11 +19,15 @@ def get_dynamic_scenario(board):
""" """
board_xml = etree.fromstring(board) board_xml = etree.fromstring(board)
def get_enum(source, options): def get_enum(source, options, obj_type):
elements = [str(x) for x in elementpath.select(source, options) if x] elements = [str(x) for x in elementpath.select(source, options) if x]
elements = list(set(elements)) elements = list(set(elements))
if not elements: if not elements:
elements = [''] elements = ['']
# TODO: Add more converters if needed
enum_type_convert = {'integer': int}
if obj_type in enum_type_convert.keys():
elements = [enum_type_convert[obj_type](x) for x in elements]
return elements return elements
def dynamic_enum(**enum_setting): def dynamic_enum(**enum_setting):
@ -33,10 +37,10 @@ def get_dynamic_scenario(board):
for key in ['function', 'source'] for key in ['function', 'source']
] ]
# value from given # value from given
selector, sorted_func = [enum_setting[key] for key in ['selector', 'sorted']] selector, sorted_func, obj_type = [enum_setting[key] for key in ['selector', 'sorted', 'type']]
# get enum data # get enum data
enum = function(source, selector) enum = function(source, selector, obj_type)
if sorted_func: if sorted_func:
enum = sorted(enum, key=eval(sorted_func)) enum = sorted(enum, key=eval(sorted_func))
return enum return enum
@ -47,7 +51,7 @@ def get_dynamic_scenario(board):
enum_setting = obj['enum'] enum_setting = obj['enum']
# check enum obj type # check enum obj type
if enum_setting['type'] == 'dynamicEnum': if enum_setting['type'] == 'dynamicEnum':
del enum_setting['type'] enum_setting['type'] = obj.get('type', '')
# replace json schema obj enum field data # replace json schema obj enum field data
obj['enum'] = dynamic_enum(**enum_setting) obj['enum'] = dynamic_enum(**enum_setting)
return obj return obj