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

config_tools: rename uos to user_vm in config UI

Browse Source 
since PRs #6760 and #6747 have renamed uos to user_vm,
we also need to rename it in config UI.

Tracked-On: #6744
Signed-off-by: Kunhui-Li <kunhuix.li@intel.com>
This commit is contained in:
Kunhui-Li 2021-11-02 16:09:14 +08:00 committed by wenlingz
parent 7f846b7ecf
commit 2b7c46377c
5 changed files with 71 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
misc/config_tools/config_app/controller.py
View File

@ -33,8 +33,8 @@ class XmlConfig:
try: try:
tree = etree.parse(xml_file) tree = etree.parse(xml_file)
root = tree.getroot() root = tree.getroot()
if 'uos_launcher' in root.attrib: if 'user_vm_launcher' in root.attrib:
xml_type = 'uos_launcher' xml_type = 'user_vm_launcher'
elif 'scenario' in root.attrib: elif 'scenario' in root.attrib:
xml_type = 'scenario' xml_type = 'scenario'
elif 'board' in root.attrib: elif 'board' in root.attrib:

4
misc/config_tools/config_app/static/main.js
View File

@ -440,7 +440,7 @@ $().ready(function(){
} }
}); });
$(document).on('change', "select[ID^='uos'][ID$='vuart0']", function() { $(document).on('change', "select[ID^='user_vm'][ID$='vuart0']", function() {
var id = $(this).attr('id'); var id = $(this).attr('id');
var value = $(this).val(); var value = $(this).val();
if(value == 'Enable') { if(value == 'Enable') {
@ -450,7 +450,7 @@ $().ready(function(){
} }
}); });
$(document).on('change', "select[ID^='uos'][ID$='console_vuart']", function() { $(document).on('change', "select[ID^='user_vm'][ID$='console_vuart']", function() {
var id = $(this).attr('id'); var id = $(this).attr('id');
var value = $(this).val(); var value = $(this).val();
if(value == 'Enable') { if(value == 'Enable') {

60
misc/config_tools/config_app/templates/launch.html
View File

@ -162,23 +162,23 @@ the launch scripts will be generated into misc/acrn-config/xmls/config-xmls/[boa
title="{{elem.attrib['desc'] if 'desc' in elem.attrib else elem.tag}}">{{elem.tag}}</label> title="{{elem.attrib['desc'] if 'desc' in elem.attrib else elem.tag}}">{{elem.tag}}</label>
<label class="col-sm-2 control-label"></label> <label class="col-sm-2 control-label"></label>
{% set elem_text = '' if elem.text == None else elem.text %} {% set elem_text = '' if elem.text == None else elem.text %}
{% if ','.join(['uos', elem.tag]) not in launch_item_values %} {% if ','.join(['user_vm', elem.tag]) not in launch_item_values %}
<div class="col-sm-6"> <div class="col-sm-6">
{% if 'readonly' in elem.attrib and elem.attrib['readonly'] == 'true' %} {% if 'readonly' in elem.attrib and elem.attrib['readonly'] == 'true' %}
{% if elem.tag == 'kernel_cmdline' %} {% if elem.tag == 'kernel_cmdline' %}
<textarea type="text" class="form-control" <textarea type="text" class="form-control"
id="{{'uos:id='+vm.attrib['id']+','+elem.tag}}" readonly>{{elem_text}}</textarea> id="{{'user_vm:id='+vm.attrib['id']+','+elem.tag}}" readonly>{{elem_text}}</textarea>
{% else %} {% else %}
<input type="text" class="form-control" <input type="text" class="form-control"
id="{{'uos:id='+vm.attrib['id']+','+elem.tag}}" value="{{elem_text}}" readonly/> id="{{'user_vm:id='+vm.attrib['id']+','+elem.tag}}" value="{{elem_text}}" readonly/>
{% endif %} {% endif %}
{% else %} {% else %}
{% if elem.tag == 'kernel_cmdline' %} {% if elem.tag == 'kernel_cmdline' %}
<textarea type="text" class="form-control" style="height:120px" <textarea type="text" class="form-control" style="height:120px"
id="{{'uos:id='+vm.attrib['id']+','+elem.tag}}">{{elem_text}}</textarea> id="{{'user_vm:id='+vm.attrib['id']+','+elem.tag}}">{{elem_text}}</textarea>
{% else %} {% else %}
<input type="text" class="form-control" value="{{elem_text}}" <input type="text" class="form-control" value="{{elem_text}}"
id="{{'uos:id='+vm.attrib['id']+','+elem.tag}}"/> id="{{'user_vm:id='+vm.attrib['id']+','+elem.tag}}"/>
{% endif %} {% endif %}
{% endif %} {% endif %}
</div> </div>
@ -186,13 +186,13 @@ the launch scripts will be generated into misc/acrn-config/xmls/config-xmls/[boa
<div class="dropdown col-sm-6"> <div class="dropdown col-sm-6">
{% if 'readonly' in elem.attrib and elem.attrib['readonly'] == 'true' %} {% if 'readonly' in elem.attrib and elem.attrib['readonly'] == 'true' %}
<select class="selectpicker" data-width="auto" title="" disabled <select class="selectpicker" data-width="auto" title="" disabled
id="{{'uos:id='+vm.attrib['id']+','+elem.tag}}"> id="{{'user_vm:id='+vm.attrib['id']+','+elem.tag}}">
{% else %} {% else %}
<select class="selectpicker" data-width="auto" title="" <select class="selectpicker" data-width="auto" title=""
id="{{'uos:id='+vm.attrib['id']+','+elem.tag}}"> id="{{'user_vm:id='+vm.attrib['id']+','+elem.tag}}">
{% endif %} {% endif %}
<option disabled selected value> -- Select an option -- </option> <option disabled selected value> -- Select an option -- </option>
{% for item_value in launch_item_values[','.join(['uos', elem.tag])] %} {% for item_value in launch_item_values[','.join(['user_vm', elem.tag])] %}
{% if item_value == elem_text %} {% if item_value == elem_text %}
<option value="{{item_value}}" selected="selected">{{item_value}}</option> <option value="{{item_value}}" selected="selected">{{item_value}}</option>
{% else %} {% else %}
@ -202,7 +202,7 @@ the launch scripts will be generated into misc/acrn-config/xmls/config-xmls/[boa
</select> </select>
</div> </div>
{% endif %} {% endif %}
<p id="{{'uos:id='+vm.attrib['id']+','+elem.tag}}_err" class="col-sm-3"></p> <p id="{{'user_vm:id='+vm.attrib['id']+','+elem.tag}}_err" class="col-sm-3"></p>
</div> </div>
{% elif elem|list != [] %} {% elif elem|list != [] %}
{% if 'multiselect' not in elem.attrib or elem.attrib['multiselect'] != 'true' %} {% if 'multiselect' not in elem.attrib or elem.attrib['multiselect'] != 'true' %}
@ -232,16 +232,16 @@ the launch scripts will be generated into misc/acrn-config/xmls/config-xmls/[boa
title="{{sub_elem.attrib['desc'] if 'desc' in sub_elem.attrib else sub_elem.tag}}"> title="{{sub_elem.attrib['desc'] if 'desc' in sub_elem.attrib else sub_elem.tag}}">
{{sub_elem.tag}}</label> {{sub_elem.tag}}</label>
{% if ','.join(['uos', elem.tag, sub_elem.tag]) not in launch_item_values {% if ','.join(['user_vm', elem.tag, sub_elem.tag]) not in launch_item_values
and elem.tag not in ['cpu_affinity', 'shm_regions', 'communication_vuarts']%} and elem.tag not in ['cpu_affinity', 'shm_regions', 'communication_vuarts']%}
<div class="col-sm-5"> <div class="col-sm-5">
{% if 'readonly' in sub_elem.attrib and sub_elem.attrib['readonly'] == 'true' %} {% if 'readonly' in sub_elem.attrib and sub_elem.attrib['readonly'] == 'true' %}
<input type="text" class="form-control" readonly <input type="text" class="form-control" readonly
id="{{'uos:id='+vm.attrib['id']+','+elem.tag+','+sub_elem.tag}}" id="{{'user_vm:id='+vm.attrib['id']+','+elem.tag+','+sub_elem.tag}}"
value="{{sub_elem_text}}"> value="{{sub_elem_text}}">
{% else %} {% else %}
<input type="text" class="form-control" <input type="text" class="form-control"
id="{{'uos:id='+vm.attrib['id']+','+elem.tag+','+sub_elem.tag}}" id="{{'user_vm:id='+vm.attrib['id']+','+elem.tag+','+sub_elem.tag}}"
value="{{sub_elem_text}}"> value="{{sub_elem_text}}">
{% endif %} {% endif %}
</div> </div>
@ -261,19 +261,19 @@ the launch scripts will be generated into misc/acrn-config/xmls/config-xmls/[boa
{% else %} {% else %}
{% if elem.tag == 'cpu_affinity' %} {% if elem.tag == 'cpu_affinity' %}
{% set item_key = ','.join(['uos', elem.tag]) %} {% set item_key = ','.join(['user_vm', elem.tag]) %}
{% elif elem.tag in ['shm_regions', 'communication_vuarts'] %} {% elif elem.tag in ['shm_regions', 'communication_vuarts'] %}
{% set item_key = ','.join(['uos:id='+vm.attrib['id'], elem.tag, sub_elem.tag]) %} {% set item_key = ','.join(['user_vm:id='+vm.attrib['id'], elem.tag, sub_elem.tag]) %}
{% else %} {% else %}
{% set item_key = ','.join(['uos', elem.tag, sub_elem.tag]) %} {% set item_key = ','.join(['user_vm', elem.tag, sub_elem.tag]) %}
{% endif %} {% endif %}
<div class="dropdown col-sm-6"> <div class="dropdown col-sm-6">
{% if 'readonly' in sub_elem.attrib and sub_elem.attrib['readonly'] == 'true' %} {% if 'readonly' in sub_elem.attrib and sub_elem.attrib['readonly'] == 'true' %}
<select class="selectpicker" data-width="auto" disabled <select class="selectpicker" data-width="auto" disabled
id="{{'uos:id='+vm.attrib['id']+','+elem.tag+','+sub_elem.tag}}"> id="{{'user_vm:id='+vm.attrib['id']+','+elem.tag+','+sub_elem.tag}}">
{% else %} {% else %}
<select class="selectpicker" data-width="auto" <select class="selectpicker" data-width="auto"
id="{{'uos:id='+vm.attrib['id']+','+elem.tag+','+sub_elem.tag}}"> id="{{'user_vm:id='+vm.attrib['id']+','+elem.tag+','+sub_elem.tag}}">
{% endif %} {% endif %}
<option disabled selected value> -- Select an option -- </option> <option disabled selected value> -- Select an option -- </option>
{% for item_value in launch_item_values[item_key] %} {% for item_value in launch_item_values[item_key] %}
@ -295,7 +295,7 @@ the launch scripts will be generated into misc/acrn-config/xmls/config-xmls/[boa
{% endif %} {% endif %}
</div> </div>
{% endif %} {% endif %}
<p id="{{'uos:id='+vm.attrib['id']+','+elem.tag+','+sub_elem.tag}}_err" class="col-sm-3"></p> <p id="{{'user_vm:id='+vm.attrib['id']+','+elem.tag+','+sub_elem.tag}}_err" class="col-sm-3"></p>
{% else %} {% else %}
{% if elem.tag in first_multi_child.keys() and first_multi_child[elem.tag] == 0 %} {% if elem.tag in first_multi_child.keys() and first_multi_child[elem.tag] == 0 %}
{% do first_multi_child.update({elem.tag: first_multi_child[elem.tag]+1}) %} {% do first_multi_child.update({elem.tag: first_multi_child[elem.tag]+1}) %}
@ -312,15 +312,15 @@ the launch scripts will be generated into misc/acrn-config/xmls/config-xmls/[boa
title="{{sub_elem.attrib['desc'] if 'desc' in sub_elem.attrib else sub_elem.tag}}"> title="{{sub_elem.attrib['desc'] if 'desc' in sub_elem.attrib else sub_elem.tag}}">
{{sub_elem.tag}}</label> {{sub_elem.tag}}</label>
{% if ','.join(['uos', elem.tag, sub_elem.tag]) not in launch_item_values %} {% if ','.join(['user_vm', elem.tag, sub_elem.tag]) not in launch_item_values %}
<div class="col-sm-6"> <div class="col-sm-6">
{% if 'readonly' in sub_elem.attrib and sub_elem.attrib['readonly'] == 'true' %} {% if 'readonly' in sub_elem.attrib and sub_elem.attrib['readonly'] == 'true' %}
<input type="text" class="form-control" readonly <input type="text" class="form-control" readonly
id="{{'uos:id='+vm.attrib['id']+','+elem.tag+':id='+elem.attrib['id']+','+sub_elem.tag}}" id="{{'user_vm:id='+vm.attrib['id']+','+elem.tag+':id='+elem.attrib['id']+','+sub_elem.tag}}"
value="{{sub_elem_text}}"> value="{{sub_elem_text}}">
{% else %} {% else %}
<input type="text" class="form-control" <input type="text" class="form-control"
id="{{'uos:id='+vm.attrib['id']+','+elem.tag+':id='+elem.attrib['id']+','+sub_elem.tag}}" id="{{'user_vm:id='+vm.attrib['id']+','+elem.tag+':id='+elem.attrib['id']+','+sub_elem.tag}}"
value="{{sub_elem_text}}"> value="{{sub_elem_text}}">
{% endif %} {% endif %}
</div> </div>
@ -328,13 +328,13 @@ the launch scripts will be generated into misc/acrn-config/xmls/config-xmls/[boa
<div class="dropdown col-sm-6"> <div class="dropdown col-sm-6">
{% if 'readonly' in sub_elem.attrib and sub_elem.attrib['readonly'] == 'true' %} {% if 'readonly' in sub_elem.attrib and sub_elem.attrib['readonly'] == 'true' %}
<select class="selectpicker" data-width="auto" disabled <select class="selectpicker" data-width="auto" disabled
id="{{'uos:id='+vm.attrib['id']+','+elem.tag+':id='+elem.attrib['id']+','+sub_elem.tag}}"> id="{{'user_vm:id='+vm.attrib['id']+','+elem.tag+':id='+elem.attrib['id']+','+sub_elem.tag}}">
{% else %} {% else %}
<select class="selectpicker" data-width="auto" <select class="selectpicker" data-width="auto"
id="{{'uos:id='+vm.attrib['id']+','+elem.tag+':id='+elem.attrib['id']+','+sub_elem.tag}}"> id="{{'user_vm:id='+vm.attrib['id']+','+elem.tag+':id='+elem.attrib['id']+','+sub_elem.tag}}">
{% endif %} {% endif %}
<option disabled selected value> -- Select an option -- </option> <option disabled selected value> -- Select an option -- </option>
{% for item_value in launch_item_values[','.join(['uos', elem.tag, sub_elem.tag])] %} {% for item_value in launch_item_values[','.join(['user_vm', elem.tag, sub_elem.tag])] %}
{% if item_value == sub_elem_text %} {% if item_value == sub_elem_text %}
<option value="{{item_value}}" selected="selected">{{item_value}}</option> <option value="{{item_value}}" selected="selected">{{item_value}}</option>
{% else %} {% else %}
@ -343,7 +343,7 @@ the launch scripts will be generated into misc/acrn-config/xmls/config-xmls/[boa
{% endfor %} {% endfor %}
</select> </select>
</div> </div>
<p id="{{'uos:id='+vm.attrib['id']+','+elem.tag+':id='+elem.attrib['id']+','+sub_elem.tag}}_err" <p id="{{'user_vm:id='+vm.attrib['id']+','+elem.tag+':id='+elem.attrib['id']+','+sub_elem.tag}}_err"
class="col-sm-3"></p> class="col-sm-3"></p>
{% endif %} {% endif %}
{% endif %} {% endif %}
@ -359,12 +359,12 @@ the launch scripts will be generated into misc/acrn-config/xmls/config-xmls/[boa
<div class="dropdown col-sm-9"> <div class="dropdown col-sm-9">
{% if 'readonly' in elem.attrib and elem.attrib['readonly'] == 'true' %} {% if 'readonly' in elem.attrib and elem.attrib['readonly'] == 'true' %}
<select class="selectpicker" data-width="auto" disabled <select class="selectpicker" data-width="auto" disabled
id="{{'uos:id='+vm.attrib['id']+','+elem.tag+','+elem.tag[:-1]}}" multiple> id="{{'user_vm:id='+vm.attrib['id']+','+elem.tag+','+elem.tag[:-1]}}" multiple>
{% else %} {% else %}
<select class="selectpicker" data-width="auto" disabled <select class="selectpicker" data-width="auto" disabled
id="{{'uos:id='+vm.attrib['id']+','+elem.tag+','+elem.tag[:-1]}}" multiple> id="{{'user_vm:id='+vm.attrib['id']+','+elem.tag+','+elem.tag[:-1]}}" multiple>
{% endif %} {% endif %}
{% if ','.join(['uos', elem.tag]) not in launch_item_values %} {% if ','.join(['user_vm', elem.tag]) not in launch_item_values %}
{% set x=1 %} {% set x=1 %}
{% for sub_elem in elem|list %} {% for sub_elem in elem|list %}
<option value="{{sub_elem.text}}" selected="selected">{{sub_elem.text}}</option> <option value="{{sub_elem.text}}" selected="selected">{{sub_elem.text}}</option>
@ -374,7 +374,7 @@ the launch scripts will be generated into misc/acrn-config/xmls/config-xmls/[boa
{% for sub_elem in elem|list %} {% for sub_elem in elem|list %}
{% do selected_list.append(sub_elem.text) %} {% do selected_list.append(sub_elem.text) %}
{% endfor %} {% endfor %}
{% for item_value in launch_item_values[','.join(['uos', elem.tag])] %} {% for item_value in launch_item_values[','.join(['user_vm', elem.tag])] %}
{% if item_value in selected_list %} {% if item_value in selected_list %}
<option value="{{item_value}}" selected="selected">{{item_value}}</option> <option value="{{item_value}}" selected="selected">{{item_value}}</option>
{% else %} {% else %}
@ -384,7 +384,7 @@ the launch scripts will be generated into misc/acrn-config/xmls/config-xmls/[boa
{% endif %} {% endif %}
</select> </select>
</div> </div>
<p id="{{'uos:id='+vm.attrib['id']+','+elem.tag+','+elem.tag[:-1]}}_err" class="col-sm-3"></p> <p id="{{'user_vm:id='+vm.attrib['id']+','+elem.tag+','+elem.tag[:-1]}}_err" class="col-sm-3"></p>
</div> </div>
{% endif %} {% endif %}
{% endif %} {% endif %}

2
misc/config_tools/config_app/templates/scenario.html
View File

@ -53,7 +53,7 @@ the source files will be generated into default path and overwirte the previous
<option value="PRE_STD_VM">PRE_STD_VM</option> <option value="PRE_STD_VM">PRE_STD_VM</option>
<option value="PRE_RT_VM">PRE_RT_VM</option> <option value="PRE_RT_VM">PRE_RT_VM</option>
<option value="SAFETY_VM">SAFETY_VM</option> <option value="SAFETY_VM">SAFETY_VM</option>
<option value="SOS_VM">SOS_VM</option> <option value="SERVICE_VM">SERVICE_VM</option>
<option value="POST_STD_VM">POST_STD_VM</option> <option value="POST_STD_VM">POST_STD_VM</option>
<option value="POST_RT_VM">POST_RT_VM</option> <option value="POST_RT_VM">POST_RT_VM</option>
<option value="KATA_VM">KATA_VM</option> <option value="KATA_VM">KATA_VM</option>

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

@ -60,13 +60,13 @@ def scenarios():
else: else:
scenario_list = ( scenario_list = (
generic_config_list[0], xml_config.list_all(xml_type='scenario')[0]) generic_config_list[0], xml_config.list_all(xml_type='scenario')[0])
if default_xml_config.list_all(xml_type='uos_launcher')[0]: if default_xml_config.list_all(xml_type='user_vm_launcher')[0]:
launch_list = ( launch_list = (
default_xml_config.list_all(xml_type='uos_launcher')[0], default_xml_config.list_all(xml_type='user_vm_launcher')[0],
xml_config.list_all(xml_type='uos_launcher')[0]) xml_config.list_all(xml_type='user_vm_launcher')[0])
else: else:
launch_list = ( launch_list = (
generic_config_list[1], xml_config.list_all(xml_type='uos_launcher')[0]) generic_config_list[1], xml_config.list_all(xml_type='user_vm_launcher')[0])
return render_template('scenario.html', board_info_list=get_board_list(), return render_template('scenario.html', board_info_list=get_board_list(),
board_info=board_info, board_type=board_type, board_info=board_info, board_type=board_type,
@ -98,13 +98,13 @@ def scenario(scenario_name):
else: else:
scenario_list = ( scenario_list = (
generic_config_list[0], xml_config.list_all(xml_type='scenario')[0]) generic_config_list[0], xml_config.list_all(xml_type='scenario')[0])
if default_xml_config.list_all(xml_type='uos_launcher')[0]: if default_xml_config.list_all(xml_type='user_vm_launcher')[0]:
launch_list = ( launch_list = (
default_xml_config.list_all(xml_type='uos_launcher')[0], default_xml_config.list_all(xml_type='user_vm_launcher')[0],
xml_config.list_all(xml_type='uos_launcher')[0]) xml_config.list_all(xml_type='user_vm_launcher')[0])
else: else:
launch_list = ( launch_list = (
generic_config_list[1], xml_config.list_all(xml_type='uos_launcher')[0]) generic_config_list[1], xml_config.list_all(xml_type='user_vm_launcher')[0])
xpath_dict = get_xpath_dict_of_xsd() xpath_dict = get_xpath_dict_of_xsd()
@ -154,13 +154,13 @@ def launches():
else: else:
scenario_list = ( scenario_list = (
generic_config_list[0], xml_config.list_all(xml_type='scenario')[0]) generic_config_list[0], xml_config.list_all(xml_type='scenario')[0])
if default_xml_config.list_all(xml_type='uos_launcher')[0]: if default_xml_config.list_all(xml_type='user_vm_launcher')[0]:
launch_list = ( launch_list = (
default_xml_config.list_all(xml_type='uos_launcher')[0], default_xml_config.list_all(xml_type='user_vm_launcher')[0],
xml_config.list_all(xml_type='uos_launcher')[0]) xml_config.list_all(xml_type='user_vm_launcher')[0])
else: else:
launch_list = ( launch_list = (
generic_config_list[1], xml_config.list_all(xml_type='uos_launcher')[0]) generic_config_list[1], xml_config.list_all(xml_type='user_vm_launcher')[0])
return render_template('launch.html', board_info_list=get_board_list(), return render_template('launch.html', board_info_list=get_board_list(),
board_info=board_info, board_type=board_type, board_info=board_info, board_type=board_type,
@ -191,13 +191,13 @@ def launch(launch_name):
else: else:
scenario_list = ( scenario_list = (
generic_config_list[0], xml_config.list_all(xml_type='scenario')[0]) generic_config_list[0], xml_config.list_all(xml_type='scenario')[0])
if default_xml_config.list_all(xml_type='uos_launcher')[0]: if default_xml_config.list_all(xml_type='user_vm_launcher')[0]:
launch_list = ( launch_list = (
default_xml_config.list_all(xml_type='uos_launcher')[0], default_xml_config.list_all(xml_type='user_vm_launcher')[0],
xml_config.list_all(xml_type='uos_launcher')[0]) xml_config.list_all(xml_type='user_vm_launcher')[0])
else: else:
launch_list = ( launch_list = (
generic_config_list[1], xml_config.list_all(xml_type='uos_launcher')[0]) generic_config_list[1], xml_config.list_all(xml_type='user_vm_launcher')[0])
launch_config.set_curr(launch_name) launch_config.set_curr(launch_name)
@ -432,7 +432,7 @@ def save_launch():
if generator.startswith('add_vm:'): if generator.startswith('add_vm:'):
vm_list = [] vm_list = []
for vm in list(launch_config.get_curr_root()): for vm in list(launch_config.get_curr_root()):
if vm.tag == 'uos': if vm.tag == 'user_vm':
vm_list.append(vm.attrib['id']) vm_list.append(vm.attrib['id'])
if len(vm_list) >= MAX_VM_NUM: if len(vm_list) >= MAX_VM_NUM:
return {'status': 'fail', return {'status': 'fail',
@ -464,7 +464,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 is not None and add_launch_config.tag == 'uos': if add_launch_config is not None and add_launch_config.tag == 'user_vm':
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
@ -475,12 +475,12 @@ def save_launch():
launch_config.insert_curr_elem(curr_vm_index, vm) launch_config.insert_curr_elem(curr_vm_index, vm)
elif generator.startswith('remove_vm:'): elif generator.startswith('remove_vm:'):
remove_vm_id = generator.split(':')[1] remove_vm_id = generator.split(':')[1]
launch_config.delete_curr_key('uos:id='+remove_vm_id.strip()) launch_config.delete_curr_key('user_vm:id='+remove_vm_id.strip())
launch_config.set_curr_attr('scenario', scenario_name) launch_config.set_curr_attr('scenario', scenario_name)
launch_config.set_curr_attr('board', current_app.config.get('BOARD_TYPE')) launch_config.set_curr_attr('board', current_app.config.get('BOARD_TYPE'))
launch_config.set_curr_attr('uos_launcher', str(len(list(launch_config.get_curr_root())))) launch_config.set_curr_attr('user_vm_launcher', str(len(list(launch_config.get_curr_root()))))
tmp_launch_file = os.path.join(current_app.config.get('CONFIG_PATH'), xml_configs[1], tmp_launch_file = os.path.join(current_app.config.get('CONFIG_PATH'), xml_configs[1],
'tmp_' + launch_config_data['new_launch_name'] + '.xml') 'tmp_' + launch_config_data['new_launch_name'] + '.xml')
@ -591,7 +591,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 = 'hybrid_launch_2uos' template_file_name = 'hybrid_launch_2user_vm'
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')
@ -603,8 +603,8 @@ def create_setting():
launch_config.set_curr(create_name) launch_config.set_curr(create_name)
if mode == 'create': if mode == 'create':
launch_config.delete_curr_key('uos:id=2') launch_config.delete_curr_key('user_vm:id=2')
launch_config.delete_curr_key('uos:id=1') launch_config.delete_curr_key('user_vm:id=1')
launch_config.save(create_name) launch_config.save(create_name)
if os.path.normcase(setting_path) != os.path.normcase(os.path.join(current_app.config.get('CONFIG_PATH'), board_type)): if os.path.normcase(setting_path) != os.path.normcase(os.path.join(current_app.config.get('CONFIG_PATH'), board_type)):
copyfile(os.path.join(current_app.config.get('CONFIG_PATH'), board_type, create_name + '.xml'), copyfile(os.path.join(current_app.config.get('CONFIG_PATH'), board_type, create_name + '.xml'),
@ -771,7 +771,7 @@ def upload_board_info():
board_type = None board_type = None
if board_info_root is not None and 'board' in board_info_root.attrib \ if board_info_root is not None and 'board' in board_info_root.attrib \
and 'scenario' not in board_info_root.attrib \ and 'scenario' not in board_info_root.attrib \
and 'uos_launcher' not in board_info_root.attrib: and 'user_vm_launcher' not in board_info_root.attrib:
board_type = board_info_root.attrib['board'] board_type = board_info_root.attrib['board']
if not board_type: if not board_type:
os.remove(save_tmp_board_path) os.remove(save_tmp_board_path)
@ -795,7 +795,7 @@ def upload_board_info():
xml_config.set_curr(generic_name.rsplit('.', 1)[0]) xml_config.set_curr(generic_name.rsplit('.', 1)[0])
xml_config.set_curr_attr('board', board_type) xml_config.set_curr_attr('board', board_type)
xml_config_root = xml_config.get_curr_root() xml_config_root = xml_config.get_curr_root()
if 'scenario' not in xml_config_root.attrib and 'uos_launcher' not in xml_config_root.attrib: if 'scenario' not in xml_config_root.attrib and 'user_vm_launcher' not in xml_config_root.attrib:
os.remove(new_file) os.remove(new_file)
continue continue
# update RDT->CLOS_MASK according to board xml # update RDT->CLOS_MASK according to board xml
@ -877,7 +877,7 @@ def upload_scenario():
else: else:
tmp_root = tmp_xml_config.get_curr_root() tmp_root = tmp_xml_config.get_curr_root()
if 'board' not in tmp_root.attrib or 'scenario' not in tmp_root.attrib \ if 'board' not in tmp_root.attrib or 'scenario' not in tmp_root.attrib \
or 'uos_launcher' in tmp_root.attrib: or 'user_vm_launcher' in tmp_root.attrib:
status = 'Invalid scenario xml file, \nonly board and scenario ' \ status = 'Invalid scenario xml file, \nonly board and scenario ' \
'need to be configured.' 'need to be configured.'
elif tmp_root.attrib['board'] != current_app.config.get('BOARD_TYPE'): elif tmp_root.attrib['board'] != current_app.config.get('BOARD_TYPE'):
@ -942,9 +942,9 @@ def upload_launch():
else: else:
tmp_root = tmp_xml_config.get_curr_root() tmp_root = tmp_xml_config.get_curr_root()
if 'board' not in tmp_root.attrib or 'scenario' not in tmp_root.attrib \ if 'board' not in tmp_root.attrib or 'scenario' not in tmp_root.attrib \
or 'uos_launcher' not in tmp_root.attrib: or 'user_vm_launcher' not in tmp_root.attrib:
status = 'Invalid launch xml file, \nboard, scenario,' \ status = 'Invalid launch xml file, \nboard, scenario,' \
'and uos_launcher need to be configured.' 'and user_vm_launcher need to be configured.'
elif tmp_root.attrib['board'] != current_app.config.get('BOARD_TYPE'): elif tmp_root.attrib['board'] != current_app.config.get('BOARD_TYPE'):
status = 'Current board: {} mismatched with the board in the launch file,' \ status = 'Current board: {} mismatched with the board in the launch file,' \
'\nplease reselect or upload the board info: {}' \ '\nplease reselect or upload the board info: {}' \
@ -992,9 +992,9 @@ def get_post_launch_vms():
launch_config = xml_configs[3] launch_config = xml_configs[3]
launch_config.set_curr(launch_name) launch_config.set_curr(launch_name)
if launch_config is not None and launch_config.get_curr_root() is not None: if launch_config is not None and launch_config.get_curr_root() is not None:
for uos in list(launch_config.get_curr_root()): for user_vm in list(launch_config.get_curr_root()):
if 'id' in uos.attrib: if 'id' in user_vm.attrib:
user_vmid_list.append(int(uos.attrib['id'])-1) user_vmid_list.append(int(user_vm.attrib['id'])-1)
vm_list_index = [i for i in range(len(vm_list))] vm_list_index = [i for i in range(len(vm_list))]
vm_list_index = set(vm_list_index) vm_list_index = set(vm_list_index)
@ -1083,8 +1083,8 @@ def get_generic_scenario_config(scenario_config, add_vm_type=None):
'POST_STD_VM': ('shared', 'vm:id=1'), 'POST_STD_VM': ('shared', 'vm:id=1'),
'POST_RT_VM': ('shared', 'vm:id=2'), 'POST_RT_VM': ('shared', 'vm:id=2'),
'KATA_VM': ('shared', 'vm:id=7'), 'KATA_VM': ('shared', 'vm:id=7'),
'LAUNCH_POST_STD_VM': ('hybrid_launch_2uos', 'uos:id=1'), 'LAUNCH_POST_STD_VM': ('hybrid_launch_2user_vm', 'user_vm:id=1'),
'LAUNCH_POST_RT_VM': ('shared_launch_6uos', 'uos:id=2') 'LAUNCH_POST_RT_VM': ('shared_launch_6user_vm', 'user_vm: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')
xml_path = os.path.join(config_path, vm_dict[add_vm_type][0] + '.xml') xml_path = os.path.join(config_path, vm_dict[add_vm_type][0] + '.xml')
@ -1107,7 +1107,7 @@ def get_generic_scenario_config(scenario_config, add_vm_type=None):
generic_scenario_config.set_curr(os.path.splitext(file)[0]) generic_scenario_config.set_curr(os.path.splitext(file)[0])
generic_scenario_config_root = generic_scenario_config.get_curr_root() generic_scenario_config_root = generic_scenario_config.get_curr_root()
if 'scenario' in generic_scenario_config_root.attrib \ if 'scenario' in generic_scenario_config_root.attrib \
and 'uos_launcher' not in generic_scenario_config_root.attrib \ and 'user_vm_launcher' not in generic_scenario_config_root.attrib \
and generic_scenario_config_root.attrib['scenario'] == \ and generic_scenario_config_root.attrib['scenario'] == \
scenario_config.get_curr_root().attrib['scenario']: scenario_config.get_curr_root().attrib['scenario']:
return generic_scenario_config return generic_scenario_config
@ -1338,9 +1338,9 @@ def get_generic_config_list():
if os.path.isfile(os.path.join(default_config_path, config_name)): if os.path.isfile(os.path.join(default_config_path, config_name)):
default_xml_config.set_curr(config_name.rsplit('.', 1)[0]) default_xml_config.set_curr(config_name.rsplit('.', 1)[0])
xml_config_root = default_xml_config.get_curr_root() xml_config_root = default_xml_config.get_curr_root()
if 'scenario' in xml_config_root.attrib and 'uos_launcher' not in xml_config_root.attrib: if 'scenario' in xml_config_root.attrib and 'user_vm_launcher' not in xml_config_root.attrib:
secenario_config_list.append(config_name.rsplit('.', 1)[0]) secenario_config_list.append(config_name.rsplit('.', 1)[0])
elif 'scenario' in xml_config_root.attrib and 'uos_launcher' in xml_config_root.attrib: elif 'scenario' in xml_config_root.attrib and 'user_vm_launcher' in xml_config_root.attrib:
launch_config_list.append(config_name.rsplit('.', 1)[0]) launch_config_list.append(config_name.rsplit('.', 1)[0])
return (secenario_config_list, launch_config_list) return (secenario_config_list, launch_config_list)