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

config_tools: fix UI issue of creating new settings

Browse Source 
1. as a workaround, comment the code to check MBA_DELAY tag when
creating a new scenario xml setting because of this tag are retrived
from scenario xml files in generic_board folder where it is removed
now.
2. update the template launch xml file names according the recent
update for launch xml files in generic folder.

Tracked-On: #6315
Signed-off-by: Kunhui-Li <kunhuix.li@intel.com>
This commit is contained in:
Kunhui-Li 2021-08-19 17:34:33 +08:00 committed by wenlingz
parent 499f62e8bd
commit adcf51e5f5
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
misc/config_tools/config_app/views.py
View File

@ -463,7 +463,7 @@ def save_launch():
if curr_vm_id == vm_list[i]: if curr_vm_id == vm_list[i]:
curr_vm_index = i + 1 curr_vm_index = i + 1
break break
if add_launch_config and add_launch_config.tag == 'uos': if add_launch_config is not None and add_launch_config.tag == 'uos':
for i in range(1, MAX_VM_NUM): for i in range(1, MAX_VM_NUM):
if str(i) not in vm_list: if str(i) not in vm_list:
break break
@ -590,7 +590,7 @@ def create_setting():
launch_file = os.path.join(setting_path, create_name + '.xml') launch_file = os.path.join(setting_path, create_name + '.xml')
if mode == 'create': if mode == 'create':
template_file_name = 'industry_launch_2uos' template_file_name = 'hybrid_launch_2uos'
src_file_name = os.path.join(current_app.config.get('DEFAULT_CONFIG_PATH'), 'generic_board', template_file_name + '.xml') src_file_name = os.path.join(current_app.config.get('DEFAULT_CONFIG_PATH'), 'generic_board', template_file_name + '.xml')
else: #load else: #load
src_file_name = os.path.join(current_app.config.get('DEFAULT_CONFIG_PATH'), board_type, default_name + '.xml') src_file_name = os.path.join(current_app.config.get('DEFAULT_CONFIG_PATH'), board_type, default_name + '.xml')
@ -629,15 +629,15 @@ def create_setting():
# update RDT->CLOS_MASK according to board xml # update RDT->CLOS_MASK according to board xml
scenario_config.set_curr(create_name) scenario_config.set_curr(create_name)
elem_clos_max = scenario_config.get_curr_elem('hv', 'FEATURES', 'RDT', 'CLOS_MASK') elem_clos_max = scenario_config.get_curr_elem('hv', 'FEATURES', 'RDT', 'CLOS_MASK')
elem_mba_delay = scenario_config.get_curr_elem('hv', 'FEATURES', 'RDT', 'MBA_DELAY') # elem_mba_delay = scenario_config.get_curr_elem('hv', 'FEATURES', 'RDT', 'MBA_DELAY')
scenario_config.delete_curr_elem('hv', 'FEATURES', 'RDT', 'CLOS_MASK') scenario_config.delete_curr_elem('hv', 'FEATURES', 'RDT', 'CLOS_MASK')
scenario_config.delete_curr_elem('hv', 'FEATURES', 'RDT', 'MBA_DELAY') # scenario_config.delete_curr_elem('hv', 'FEATURES', 'RDT', 'MBA_DELAY')
cdp_enabled = scenario_config.get_curr_value('hv', 'FEATURES', 'RDT', 'CDP_ENABLED') cdp_enabled = scenario_config.get_curr_value('hv', 'FEATURES', 'RDT', 'CDP_ENABLED')
(num_clos_mask, num_mba_delay) = get_num_of_rdt_res(board_info, cdp_enabled) (num_clos_mask, num_mba_delay) = get_num_of_rdt_res(board_info, cdp_enabled)
for i in range(num_clos_mask): for i in range(num_clos_mask):
scenario_config.clone_curr_elem(elem_clos_max, 'hv', 'FEATURES', 'RDT') scenario_config.clone_curr_elem(elem_clos_max, 'hv', 'FEATURES', 'RDT')
for i in range(num_mba_delay): # for i in range(num_mba_delay):
scenario_config.clone_curr_elem(elem_mba_delay, 'hv', 'FEATURES', 'RDT') # scenario_config.clone_curr_elem(elem_mba_delay, 'hv', 'FEATURES', 'RDT')
for i in range(8): for i in range(8):
scenario_config.delete_curr_key('vm:id={}'.format(i)) scenario_config.delete_curr_key('vm:id={}'.format(i))
scenario_config = set_default_config(scenario_config) scenario_config = set_default_config(scenario_config)
@ -1074,8 +1074,8 @@ def get_generic_scenario_config(scenario_config, add_vm_type=None):
'POST_STD_VM': ('industry', 'vm:id=1'), 'POST_STD_VM': ('industry', 'vm:id=1'),
'POST_RT_VM': ('industry', 'vm:id=2'), 'POST_RT_VM': ('industry', 'vm:id=2'),
'KATA_VM': ('industry', 'vm:id=7'), 'KATA_VM': ('industry', 'vm:id=7'),
'LAUNCH_POST_STD_VM': ('industry_launch_2uos', 'uos:id=1'), 'LAUNCH_POST_STD_VM': ('hybrid_launch_2uos', 'uos:id=1'),
'LAUNCH_POST_RT_VM': ('industry_launch_2uos', 'uos:id=2') 'LAUNCH_POST_RT_VM': ('industry_launch_6uos', 'uos:id=2')
} }
config_path = os.path.join(current_app.config.get('DEFAULT_CONFIG_PATH'), 'generic_board') config_path = os.path.join(current_app.config.get('DEFAULT_CONFIG_PATH'), 'generic_board')
generic_scenario_config = XmlConfig(config_path) generic_scenario_config = XmlConfig(config_path)