github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-07-04 11:07:51 +00:00
Code Issues Projects Releases Wiki Activity

config_tools: add interface to save config xmls to user defined path in config editor

Browse Source 
add interface to save scenario xmls and launch xmls to user defined
path in config editor; move all config xmls and generated scripts
out of acrn-hypervisor.

Tracked-On: #6208
Signed-off-by: Shuang Zheng <shuang.zheng@intel.com>
Reviewed-by: Victor Sun <victor.sun@intel.com>
This commit is contained in:
Shuang Zheng 2021-07-22 19:30:00 +08:00 committed by Xie, Nanlin
parent 69fef2e685
commit e775db23b1
7 changed files with 207 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
misc/config_tools/config_app/configs.py
View File

@ -10,4 +10,9 @@ import os
BOARD_INFO = None BOARD_INFO = None
BOARD_TYPE = None BOARD_TYPE = None
SCENARIO = None SCENARIO = None
CONFIG_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', 'data') LAUNCH = None
DEFAULT_CONFIG_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', 'data')
CONFIG_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..', '..', '..', 'user_config')
if not os.path.isdir(CONFIG_PATH):
os.makedirs(CONFIG_PATH)

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

@ -313,7 +313,7 @@ class XmlConfig:
raise Exception('can not find node by {} from xml'.format(args)) raise Exception('can not find node by {} from xml'.format(args))
def save(self, xml=None, user_defined=True): def save(self, xml=None, user_defined=False):
""" """
save current xml to file. save current xml to file.
:param xml: the file name to save; if not specified, save current xml to default names. :param xml: the file name to save; if not specified, save current xml to default names.

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

@ -265,7 +265,6 @@ $().ready(function(){
$('#export_scenario_xml').on('click', function() { $('#export_scenario_xml').on('click', function() {
var dataId = $(this).data('id'); var dataId = $(this).data('id');
$("#save_scenario").data('id', dataId); $("#save_scenario").data('id', dataId);
$('#src_path_row').addClass('hidden');
}); });
$('#generate_config_src').on('click', function() { $('#generate_config_src').on('click', function() {
@ -277,7 +276,6 @@ $().ready(function(){
$('#export_launch_xml').on('click', function() { $('#export_launch_xml').on('click', function() {
var dataId = $(this).data('id'); var dataId = $(this).data('id');
$("#save_launch").data('id', dataId); $("#save_launch").data('id', dataId);
$('#src_path_row').addClass('hidden');
}); });
@ -777,6 +775,7 @@ function create_setting(type, default_name, name, mode){
type: type, type: type,
default_name: default_name, default_name: default_name,
create_name: name, create_name: name,
src_path: '',
mode: mode mode: mode
} }
@ -789,10 +788,10 @@ function create_setting(type, default_name, name, mode){
exist = result.exist exist = result.exist
create_flag = true create_flag = true
if(exist == "yes") { if(exist == "yes") {
overwirte_confirm_message = 'Setting name: ' + create_config['create_name'] + ' existed in ' + overwrite_confirm_message = 'Setting name: ' + create_config['create_name'] + ' existed in ' +
'acrn-hypervisor/misc/config_tools/data/'+board_info+'/user_defined/.\n'+ 'acrn-hypervisor/../user_config/'+board_info+'/.\n'+
'Do you want to overwrite it?\nClick OK to overwrite it; click Cancel to rename it.' 'Do you want to overwrite it?\nClick OK to overwrite it; click Cancel to rename it.'
if(!confirm(overwirte_confirm_message)) { if(!confirm(overwrite_confirm_message)) {
create_flag = false create_flag = false
} }
} }
@ -870,8 +869,7 @@ function save_scenario(generator=null){
scenario_config[id] = [value]; scenario_config[id] = [value];
} }
} else if(id!='new_scenario_name' && id!='new_scenario_name2' && id!='board_info_file' && id!='board_info_upload' } else if(id!='new_scenario_name' && id!='new_scenario_name2' && id!='board_info_file' && id!='board_info_upload'
&& id!='scenario_file' && id!='create_name' && id!='load_scenario_name2' && id!='load_launch_name2' && id!='scenario_file' && id!='create_name' && id!='load_scenario_name2' && id!='load_launch_name2') {
&& id!='src_path') {
scenario_config[id] = value; scenario_config[id] = value;
} }
}) })
@ -905,10 +903,10 @@ function save_scenario(generator=null){
exist = result.exist exist = result.exist
create_flag = true create_flag = true
if(exist == "yes") { if(exist == "yes") {
overwirte_confirm_message = 'Setting name: ' + scenario_config['create_name'] + ' existed in ' + overwrite_confirm_message = 'Setting name: ' + ' existed in current setting ' +
'acrn-hypervisor/misc/config_tools/data/'+board_info+'/user_defined/.\n'+ 'acrn-hypervisor/../user_config/'+board_info+'/.\n'+
'Do you want to overwrite it?\nClick OK to overwrite it; click Cancel to rename it.' 'Do you want to overwrite it?\nClick OK to overwrite it; click Cancel to rename it.'
if(!confirm(overwirte_confirm_message)) { if(!confirm(overwrite_confirm_message)) {
create_flag = false create_flag = false
} }
} }
@ -929,21 +927,26 @@ function save_scenario(generator=null){
$("#"+index+"_err").text(item); $("#"+index+"_err").text(item);
}) })
if(no_err == true && status == 'success') { if(no_err == true && status == 'success') {
var src_path = $("input#src_path").val();
if(src_path == null || src_path == '') {
xml_path = 'acrn-hypervisor/../user_config/'+board_info+'/.'
} else {
xml_path = src_path
}
file_name = result.file_name; file_name = result.file_name;
validate_message = 'Scenario setting saved successfully with name: ' validate_message = 'Scenario setting saved successfully with name: '
+file_name+'\ninto acrn-hypervisor/misc/config_tools/data/'+board_info+'/user_defined/.' +file_name+'\ninto '+xml_path;
if(result.rename==true) { if(result.rename==true) {
validate_message = 'Scenario setting existed, saved successfully with a new name: ' validate_message = 'Scenario setting existed, saved successfully with a new name: '
+file_name+'\ninto acrn-hypervisor/misc/config_tools/data/'+board_info+'/user_defined/.'; +file_name+'\ninto acrn-hypervisor/../user_config/'+board_info+'/.';
} }
if(generator=="generate_config_src") { if(generator=="generate_config_src") {
var src_path = $("input#src_path").val();
generate_flag = true; generate_flag = true;
if(src_path == null || src_path == '') { if(src_path == null || src_path == '') {
overwirte_confirm_message = 'The Source Path for configuration files is not set.\n' + overwrite_confirm_message = 'The Source Path for configuration files is not set.\n' +
'Do you want to generate them into the default path: acrn-hypervisor/build/hypervisor/configs/board/ and acrn-hypervisor/build/hypervisor/configs/scenarios/,\n'+ 'Do you want to generate them into the default path: acrn-hypervisor/build/hypervisor/configs/board/ and acrn-hypervisor/build/hypervisor/configs/scenarios/,\n'+
'and overwrite the old ones?\nClick OK to overwrite them; click Cancel to edit the Source Path.' 'and overwrite the old ones?\nClick OK to overwrite them; click Cancel to edit the Source Path.'
if(!confirm(overwirte_confirm_message)) { if(!confirm(overwrite_confirm_message)) {
generate_flag = false generate_flag = false
} }
} }
@ -1043,8 +1046,7 @@ function save_launch(generator=null) {
launch_config[id] = [value]; launch_config[id] = [value];
} }
} else if(id!='new_launch_name' && id!='new_launch_name2' && id!='board_info_file' && id!='board_info_upload' } else if(id!='new_launch_name' && id!='new_launch_name2' && id!='board_info_file' && id!='board_info_upload'
&& id!="launch_file" && id!='create_name' && id!='load_scenario_name2' && id!='load_launch_name2' && id!="launch_file" && id!='create_name' && id!='load_scenario_name2' && id!='load_launch_name2') {
&& id!='src_path') {
launch_config[id] = value; launch_config[id] = value;
} }
}) })
@ -1079,10 +1081,9 @@ function save_launch(generator=null) {
exist = result.exist exist = result.exist
create_flag = true create_flag = true
if(exist == "yes") { if(exist == "yes") {
overwirte_confirm_message = 'Setting name: ' + launch_config['create_name'] + ' existed in ' + overwrite_confirm_message = 'Setting name: existed in the XML path\n'+
'acrn-hypervisor/misc/config_tools/data/'+board_info+'/user_defined/.\n'+
'Do you want to overwrite it?\nClick OK to overwrite it; click Cancel to rename it.' 'Do you want to overwrite it?\nClick OK to overwrite it; click Cancel to rename it.'
if(!confirm(overwirte_confirm_message)) { if(!confirm(overwrite_confirm_message)) {
create_flag = false create_flag = false
} }
} }
@ -1105,21 +1106,26 @@ function save_launch(generator=null) {
$("#"+index+"_err").text(item); $("#"+index+"_err").text(item);
}) })
if(no_err == true && status == 'success') { if(no_err == true && status == 'success') {
var src_path = $("input#src_path").val();
if(src_path == null || src_path == '') {
xml_path = 'acrn-hypervisor/../user_config/'+board_info+'/.'
} else {
xml_path = src_path
}
file_name = result.file_name; file_name = result.file_name;
validate_message = 'Launch setting saved successfully with name: ' validate_message = 'Launch setting saved successfully with name: '
+file_name+'\nto acrn-hypervisor/misc/config_tools/data/'+board_info+'/user_defined/.' +file_name+'\nto '+xml_path;
if(result.rename==true) { if(result.rename==true) {
validate_message = 'Launch setting existed, saved successfully with a new name: ' validate_message = 'Launch setting existed, saved successfully with a new name: '
+file_name+'\nto acrn-hypervisor/misc/config_tools/data/'+board_info+'/user_defined/.'; +file_name+'\nto '+xml_path;
} }
if(generator == 'generate_launch_script') { if(generator == 'generate_launch_script') {
var src_path = $("input#src_path").val();
generate_flag = true; generate_flag = true;
if(src_path == null || src_path == '') { if(src_path == null || src_path == '') {
overwirte_confirm_message = 'The Source Path for launch scripts is not set.\n' + overwrite_confirm_message = 'The Source Path for launch scripts is not set.\n' +
'Do you want to generate them into the default path: misc/config_tools/data/'+board_info+'/output/,\n'+ 'Do you want to generate them into the default path: acrn-hypervisor/../user_config/'+board_info+'/output/,\n'+
'and overwrite the old ones?\nClick OK to overwrite them; click Cancel to edit the Source Path.' 'and overwrite the old ones?\nClick OK to overwrite them; click Cancel to edit the Source Path.'
if(!confirm(overwirte_confirm_message)) { if(!confirm(overwrite_confirm_message)) {
generate_flag = false generate_flag = false
} }
} }
@ -1144,7 +1150,7 @@ function save_launch(generator=null) {
if (status == 'success' && (JSON.stringify(error_list)=='{}' || JSON.stringify(error_list)=='null')) { if (status == 'success' && (JSON.stringify(error_list)=='{}' || JSON.stringify(error_list)=='null')) {
if(src_path==null || src_path==='') { if(src_path==null || src_path==='') {
alert(generator+' successfully into '+ alert(generator+' successfully into '+
'acrn-hypervisor/misc/config_tools/data/'+board_info+'/output/.'); 'acrn-hypervisor/../user_config'+board_info+'/output/.');
} else { } else {
alert(generator+' successfully into '+src_path); alert(generator+' successfully into '+src_path);
} }

4
misc/config_tools/config_app/templates/base.html
View File

@ -123,7 +123,7 @@
<a href="{{ url_for('CONFIG_APP.scenarios') }}"> <a href="{{ url_for('CONFIG_APP.scenarios') }}">
Scenario Setting <span class="caret"></span></a> Scenario Setting <span class="caret"></span></a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
{% if scenarios[0] %} {% if scenarios[0] or scenarios[1] %}
<li><a href="" data-toggle="modal" data-target="#create_modal" class="create_menu" <li><a href="" data-toggle="modal" data-target="#create_modal" class="create_menu"
data-id="scenario">Create a new scenario</a></li> data-id="scenario">Create a new scenario</a></li>
<li><a href="" data-toggle="modal" data-target="#load_scenario_modal" class="load_menu" <li><a href="" data-toggle="modal" data-target="#load_scenario_modal" class="load_menu"
@ -143,7 +143,7 @@
<a href="{{ url_for('CONFIG_APP.launches') }}">Launch Setting <span <a href="{{ url_for('CONFIG_APP.launches') }}">Launch Setting <span
class="caret"></span></a> class="caret"></span></a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
{% if launches[0] %} {% if launches[0] or launches[1] %}
<li><a href="" data-toggle="modal" data-target="#create_modal" class="create_menu" <li><a href="" data-toggle="modal" data-target="#create_modal" class="create_menu"
data-id="launch">Create a new Launch script</a></li> data-id="launch">Create a new Launch script</a></li>
<li><a href="" data-toggle="modal" data-target="#load_launch_modal" class="load_menu" <li><a href="" data-toggle="modal" data-target="#load_launch_modal" class="load_menu"

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

@ -11,20 +11,20 @@
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="form-group row"> <div class="form-group row">
<label for="new_launch_name" class="col-sm-3 control-label">Launch Name: </label> <label for="new_launch_name" class="col-sm-3 control-label">XML Name: </label>
<div class="col-sm-6"> <div class="col-sm-6">
<input type="text" class="form-control" id="new_launch_name" <input type="text" class="form-control" id="new_launch_name"
value={{launch}}> value={{launch}}>
</div> </div>
</div> </div>
<div class="form-group row hidden" id="src_path_row"> <div class="form-group row" id="src_path_row">
<label for="src_path" class="col-sm-3 control-label" <label for="src_path" class="col-sm-3 control-label"
title="the relative path of acrn-hypervisor; if no path is specified, title="the path to save config xmls; if no path is specified,
the launch scripts will be generated into misc/acrn-config/xmls/config-xmls/[board]/output and overwirte the previous files."> the launch scripts will be generated into misc/acrn-config/xmls/config-xmls/[board]/output and overwirte the previous files.">
Source Path: </label> Source Path: </label>
<div class="col-sm-9"> <div class="col-sm-9">
<input type="text" class="form-control" id="src_path" value="" <input type="text" class="form-control" id="src_path" value=""
placeholder="input the path to generate launch scripts"> placeholder="[acrn-hypervisor]/../user_config/">
</div> </div>
</div> </div>
</div> </div>

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

@ -11,20 +11,20 @@
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="form-group row"> <div class="form-group row">
<label for="new_scenario_name" class="col-sm-3 control-label">Scenario Name: </label> <label for="new_scenario_name" class="col-sm-3 control-label">XML Name: </label>
<div class="col-sm-6"> <div class="col-sm-6">
<input type="text" class="form-control" id="new_scenario_name" <input type="text" class="form-control" id="new_scenario_name"
value={{ scenario }}> value={{ scenario }}>
</div> </div>
</div> </div>
<div class="form-group row hidden" id="src_path_row"> <div class="form-group row" id="src_path_row">
<label for="src_path" class="col-sm-3 control-label" <label for="src_path" class="col-sm-3 control-label"
title="the relative path of acrn-hypervisor; if no path is specified, title="the path to save config xmls; if no path is specified,
the source files will be generated into default path and overwirte the previous files."> the source files will be generated into default path and overwirte the previous files.">
Source Path: </label> Scenario XML Path: </label>
<div class="col-sm-9"> <div class="col-sm-9">
<input type="text" class="form-control" id="src_path" value="" <input type="text" class="form-control" id="src_path" value=""
placeholder="input the path to generate source files"> placeholder="[acrn-hypervisor]/../user_config/">
</div> </div>
</div> </div>
</div> </div>

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

@ -7,7 +7,7 @@
import os, copy import os, copy
from datetime import datetime from datetime import datetime
from shutil import copyfile from shutil import copyfile, move
# flask: Copyright 2010 Pallets # flask: Copyright 2010 Pallets
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
@ -47,12 +47,19 @@ def scenarios():
""" """
board_info, board_type, scenario_config, launch_config = get_xml_configs() board_info, board_type, scenario_config, launch_config = get_xml_configs()
(bios_info, base_board_info) = get_board_info(board_info) (bios_info, base_board_info) = get_board_info(board_info)
scenario_list = ([], [])
launch_list = ([], [])
if board_type is not None:
default_xml_config = XmlConfig(os.path.join(current_app.config.get('DEFAULT_CONFIG_PATH'), board_type))
xml_config = XmlConfig(os.path.join(current_app.config.get('CONFIG_PATH'), board_type))
scenario_list = (default_xml_config.list_all(xml_type='scenario')[0], xml_config.list_all(xml_type='scenario')[0])
launch_list = (default_xml_config.list_all(xml_type='uos_launcher')[0], xml_config.list_all(xml_type='uos_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,
bios_info=bios_info, base_board_info=base_board_info, bios_info=bios_info, base_board_info=base_board_info,
scenarios=scenario_config.list_all(xml_type='scenario'), scenarios=scenario_list,
launches=launch_config.list_all(xml_type='uos_launcher'), launches=launch_list,
scenario='', root=None) scenario='', root=None)
@ -66,6 +73,13 @@ def scenario(scenario_name):
board_info, board_type, scenario_config, launch_config = get_xml_configs() board_info, board_type, scenario_config, launch_config = get_xml_configs()
(bios_info, base_board_info) = get_board_info(board_info) (bios_info, base_board_info) = get_board_info(board_info)
scenario_list = ([], [])
launch_list = ([], [])
if board_type is not None:
default_xml_config = XmlConfig(os.path.join(current_app.config.get('DEFAULT_CONFIG_PATH'), board_type))
xml_config = XmlConfig(os.path.join(current_app.config.get('CONFIG_PATH'), board_type))
scenario_list = (default_xml_config.list_all(xml_type='scenario')[0], xml_config.list_all(xml_type='scenario')[0])
launch_list = (default_xml_config.list_all(xml_type='uos_launcher')[0], xml_config.list_all(xml_type='uos_launcher')[0])
xpath_dict = get_xpath_dict_of_xsd() xpath_dict = get_xpath_dict_of_xsd()
current_app.config.update(SCENARIO=scenario_name) current_app.config.update(SCENARIO=scenario_name)
@ -75,10 +89,10 @@ def scenario(scenario_name):
scenario_item_values = {} scenario_item_values = {}
if board_info is not None and board_type is not None: if board_info is not None and board_type is not None:
scenario_file_path = os.path.join(current_app.config.get('CONFIG_PATH'), board_type, scenario_file_path = os.path.join(current_app.config.get('CONFIG_PATH'), board_type,
'user_defined', scenario_name + '.xml') scenario_name + '.xml')
if os.path.isfile(scenario_file_path): if os.path.isfile(scenario_file_path):
scenario_item_values = get_scenario_item_values( scenario_item_values = get_scenario_item_values(
os.path.join(os.path.dirname(os.path.abspath(__file__)), 'res', board_info+'.xml'), os.path.join(current_app.config.get('CONFIG_PATH'), board_type, board_info+'.xml'),
scenario_file_path) scenario_file_path)
for xpath in xpath_dict: for xpath in xpath_dict:
if xpath_dict[xpath]['enumeration'] and len(xpath.split('/')) > 2: if xpath_dict[xpath]['enumeration'] and len(xpath.split('/')) > 2:
@ -87,8 +101,8 @@ def scenario(scenario_name):
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,
bios_info=bios_info, base_board_info=base_board_info, bios_info=bios_info, base_board_info=base_board_info,
scenarios=scenario_config.list_all(xml_type='scenario'), scenarios=scenario_list,
launches=launch_config.list_all(xml_type='uos_launcher'), launches=launch_list,
scenario=scenario_name, root=scenario_config.get_curr_root(), scenario=scenario_name, root=scenario_config.get_curr_root(),
scenario_item_values=scenario_item_values, scenario_item_values=scenario_item_values,
xpath_dict=xpath_dict) xpath_dict=xpath_dict)
@ -102,12 +116,19 @@ def launches():
""" """
board_info, board_type, scenario_config, launch_config = get_xml_configs() board_info, board_type, scenario_config, launch_config = get_xml_configs()
(bios_info, base_board_info) = get_board_info(board_info) (bios_info, base_board_info) = get_board_info(board_info)
scenario_list = ([], [])
launch_list = ([], [])
if board_type is not None:
default_xml_config = XmlConfig(os.path.join(current_app.config.get('DEFAULT_CONFIG_PATH'), board_type))
xml_config = XmlConfig(os.path.join(current_app.config.get('CONFIG_PATH'), board_type))
scenario_list = (default_xml_config.list_all(xml_type='scenario')[0], xml_config.list_all(xml_type='scenario')[0])
launch_list = (default_xml_config.list_all(xml_type='uos_launcher')[0], xml_config.list_all(xml_type='uos_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,
bios_info=bios_info, base_board_info=base_board_info, bios_info=bios_info, base_board_info=base_board_info,
scenarios=scenario_config.list_all(xml_type='scenario'), scenarios=scenario_list,
launches=launch_config.list_all(xml_type='uos_launcher'), launches=launch_list,
launch='', root=None) launch='', root=None)
@ -120,6 +141,13 @@ def launch(launch_name):
""" """
board_info, board_type, scenario_config, launch_config = get_xml_configs() board_info, board_type, scenario_config, launch_config = get_xml_configs()
(bios_info, base_board_info) = get_board_info(board_info) (bios_info, base_board_info) = get_board_info(board_info)
scenario_list = ([], [])
launch_list = ([], [])
if board_type is not None:
default_xml_config = XmlConfig(os.path.join(current_app.config.get('DEFAULT_CONFIG_PATH'), board_type))
xml_config = XmlConfig(os.path.join(current_app.config.get('CONFIG_PATH'), board_type))
scenario_list = (default_xml_config.list_all(xml_type='scenario')[0], xml_config.list_all(xml_type='scenario')[0])
launch_list = (default_xml_config.list_all(xml_type='uos_launcher')[0], xml_config.list_all(xml_type='uos_launcher')[0])
launch_config.set_curr(launch_name) launch_config.set_curr(launch_name)
@ -129,7 +157,7 @@ def launch(launch_name):
scenario_name = current_app.config.get('SCENARIO') scenario_name = current_app.config.get('SCENARIO')
scenario_file = None scenario_file = None
if board_info is not None and scenario_name is not None: if board_info is not None and scenario_name is not None:
scenario_file = os.path.join(current_app.config.get('CONFIG_PATH'), board_type, 'user_defined', scenario_file = os.path.join(current_app.config.get('CONFIG_PATH'), board_type,
scenario_name+'.xml') scenario_name+'.xml')
if not os.path.isfile(scenario_file): if not os.path.isfile(scenario_file):
scenario_file = os.path.join(current_app.config.get('CONFIG_PATH'), board_type, scenario_file = os.path.join(current_app.config.get('CONFIG_PATH'), board_type,
@ -137,7 +165,7 @@ def launch(launch_name):
if not os.path.isfile(scenario_file): if not os.path.isfile(scenario_file):
scenario_file = None scenario_file = None
launch_item_values = get_launch_item_values( launch_item_values = get_launch_item_values(
os.path.join(os.path.dirname(os.path.abspath(__file__)), 'res', board_info + '.xml'), scenario_file) os.path.join(current_app.config.get('CONFIG_PATH'), board_type, board_info + '.xml'), scenario_file)
scenario_name = None scenario_name = None
launch_config_root = launch_config.get_curr_root() launch_config_root = launch_config.get_curr_root()
@ -148,8 +176,8 @@ def launch(launch_name):
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,
bios_info=bios_info, base_board_info=base_board_info, bios_info=bios_info, base_board_info=base_board_info,
scenarios=scenario_config.list_all(xml_type='scenario'), scenarios=scenario_list,
launches=launch_config.list_all(xml_type='uos_launcher'), launches=launch_list,
launch=launch_name, root=launch_config.get_curr_root(), launch=launch_name, root=launch_config.get_curr_root(),
scenario=current_app.config.get('SCENARIO'), scenario=current_app.config.get('SCENARIO'),
post_launch_vm_list=post_launch_vm_list, post_launch_vm_list=post_launch_vm_list,
@ -192,7 +220,7 @@ def save_scenario():
if scenario_config_data[key] in [None, 'None']: if scenario_config_data[key] in [None, 'None']:
scenario_config_data[key] = '' scenario_config_data[key] = ''
if key not in ['old_scenario_name', 'new_scenario_name', 'generator', 'add_vm_type']: if key not in ['old_scenario_name', 'new_scenario_name', 'generator', 'add_vm_type', 'src_path']:
if isinstance(scenario_config_data[key], list): if isinstance(scenario_config_data[key], list):
scenario_config.set_curr_list(scenario_config_data[key], *tuple(key.split(','))) scenario_config.set_curr_list(scenario_config_data[key], *tuple(key.split(',')))
elif key.find('communication_vuart') >= 0: elif key.find('communication_vuart') >= 0:
@ -282,10 +310,9 @@ def save_scenario():
scenario_config.set_curr_attr('board', board_type) scenario_config.set_curr_attr('board', board_type)
scenario_config.set_curr_attr('scenario', scenario_config_data['new_scenario_name']) scenario_config.set_curr_attr('scenario', scenario_config_data['new_scenario_name'])
tmp_scenario_file = os.path.join(scenario_path, 'user_defined', tmp_scenario_file = os.path.join(scenario_path,
'tmp_'+scenario_config_data['new_scenario_name']+'.xml') 'tmp_'+scenario_config_data['new_scenario_name']+'.xml')
# if os.path.isfile(tmp_scenario_file):
# os.remove(tmp_scenario_file)
scenario_config.save('tmp_'+scenario_config_data['new_scenario_name']) scenario_config.save('tmp_'+scenario_config_data['new_scenario_name'])
# call validate function # call validate function
@ -295,7 +322,7 @@ def save_scenario():
try: try:
if generator is None or not (generator.startswith('add_vm:') or generator.startswith('remove_vm:')): if generator is None or not (generator.startswith('add_vm:') or generator.startswith('remove_vm:')):
(error_list, vm_info) = validate_scenario_setting( (error_list, vm_info) = validate_scenario_setting(
os.path.join(os.path.dirname(os.path.abspath(__file__)), 'res', xml_configs[0]+'.xml'), os.path.join(current_app.config.get('CONFIG_PATH'), board_type, xml_configs[0]+'.xml'),
tmp_scenario_file) tmp_scenario_file)
except Exception as error: except Exception as error:
if os.path.isfile(tmp_scenario_file): if os.path.isfile(tmp_scenario_file):
@ -305,12 +332,17 @@ def save_scenario():
if not error_list: if not error_list:
scenario_config.save(new_scenario_name) scenario_config.save(new_scenario_name)
if old_scenario_name != new_scenario_name:
os.remove(os.path.join(scenario_path, 'user_defined', old_scenario_name + '.xml'))
if os.path.isfile(tmp_scenario_file): if os.path.isfile(tmp_scenario_file):
os.remove(tmp_scenario_file) os.remove(tmp_scenario_file)
src_path = scenario_config_data['src_path']
if src_path is not None and str(src_path).strip() != '':
if not os.path.isdir(src_path):
os.makedirs(src_path)
copyfile(os.path.join(scenario_path, scenario_config_data['new_scenario_name']+'.xml'),
os.path.join(src_path, scenario_config_data['new_scenario_name']+'.xml'))
return {'status': 'success', 'file_name': new_scenario_name, return {'status': 'success', 'file_name': new_scenario_name,
'rename': rename, 'error_list': error_list} 'rename': rename, 'error_list': error_list}
@ -334,12 +366,12 @@ def save_launch():
scenario_name = launch_config_data['scenario_name'] scenario_name = launch_config_data['scenario_name']
scenario_file_path = os.path.join(current_app.config.get('CONFIG_PATH'), scenario_file_path = os.path.join(current_app.config.get('CONFIG_PATH'),
current_app.config.get('BOARD_TYPE'), current_app.config.get('BOARD_TYPE'),
'user_defined', scenario_name + '.xml') scenario_name + '.xml')
for key in launch_config_data: for key in launch_config_data:
if launch_config_data[key] in [None, 'None']: if launch_config_data[key] in [None, 'None']:
launch_config_data[key] = '' launch_config_data[key] = ''
if key not in ['old_launch_name', 'new_launch_name', 'generator', 'add_launch_type', 'scenario_name']: if key not in ['old_launch_name', 'new_launch_name', 'generator', 'add_launch_type', 'scenario_name', 'src_path']:
if isinstance(launch_config_data[key], list): if isinstance(launch_config_data[key], list):
launch_config.set_curr_list(launch_config_data[key], *tuple(key.split(','))) launch_config.set_curr_list(launch_config_data[key], *tuple(key.split(',')))
else: else:
@ -401,10 +433,8 @@ def save_launch():
launch_config.set_curr_attr('uos_launcher', str(len(list(launch_config.get_curr_root())))) launch_config.set_curr_attr('uos_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],
'user_defined',
'tmp_' + launch_config_data['new_launch_name'] + '.xml') 'tmp_' + launch_config_data['new_launch_name'] + '.xml')
# if os.path.isfile(tmp_launch_file):
# os.remove(tmp_launch_file)
launch_config.save('tmp_' + launch_config_data['new_launch_name']) launch_config.save('tmp_' + launch_config_data['new_launch_name'])
# call validate function # call validate function
@ -413,7 +443,7 @@ def save_launch():
try: try:
if generator is None or not (generator.startswith('add_vm:') or generator.startswith('remove_vm:')): if generator is None or not (generator.startswith('add_vm:') or generator.startswith('remove_vm:')):
(error_list, pthru_sel, virtio, dm_value) = validate_launch_setting( (error_list, pthru_sel, virtio, dm_value) = validate_launch_setting(
os.path.join(os.path.dirname(os.path.abspath(__file__)), 'res', xml_configs[0]+'.xml'), os.path.join(current_app.config.get('CONFIG_PATH'), xml_configs[1], xml_configs[0]+'.xml'),
scenario_file_path, scenario_file_path,
tmp_launch_file) tmp_launch_file)
except Exception as error: except Exception as error:
@ -424,13 +454,18 @@ def save_launch():
if not error_list: if not error_list:
launch_config.save(launch_config_data['new_launch_name']) launch_config.save(launch_config_data['new_launch_name'])
if old_launch_name != launch_config_data['new_launch_name']:
os.remove(os.path.join(current_app.config.get('CONFIG_PATH'), xml_configs[1], 'user_defined',
old_launch_name + '.xml'))
if os.path.isfile(tmp_launch_file): if os.path.isfile(tmp_launch_file):
os.remove(tmp_launch_file) os.remove(tmp_launch_file)
src_path = launch_config_data['src_path']
if src_path is not None and str(src_path).strip() != '':
if not os.path.isdir(src_path):
os.makedirs(src_path)
copyfile(os.path.join(current_app.config.get('CONFIG_PATH'), current_app.config.get('BOARD_TYPE'),
launch_config_data['new_launch_name'] + '.xml'),
os.path.join(src_path, launch_config_data['new_launch_name'] + '.xml'))
return {'status': 'success', 'file_name': launch_config_data['new_launch_name'], return {'status': 'success', 'file_name': launch_config_data['new_launch_name'],
'rename': rename, 'error_list': error_list} 'rename': rename, 'error_list': error_list}
@ -442,23 +477,27 @@ def check_setting_exist():
:return: setting exist or not. :return: setting exist or not.
""" """
config_data = request.json if request.method == "POST" else request.args config_data = request.json if request.method == "POST" else request.args
src_path = config_data['src_path']
board_info = current_app.config.get('BOARD_TYPE') board_info = current_app.config.get('BOARD_TYPE')
setting_path = os.path.join(current_app.config.get('CONFIG_PATH'), board_info) setting_path = os.path.join(current_app.config.get('CONFIG_PATH'), board_info)
if src_path is not None and str(src_path).strip() != '':
setting_path = src_path
if 'old_scenario_name' in list(config_data.keys()) and 'new_scenario_name' in list(config_data.keys()): if 'old_scenario_name' in list(config_data.keys()) and 'new_scenario_name' in list(config_data.keys()):
if config_data['old_scenario_name'] != config_data['new_scenario_name'] and \ if config_data['old_scenario_name'] != config_data['new_scenario_name'] and \
os.path.isfile(os.path.join(setting_path, 'user_defined', config_data['new_scenario_name'] + '.xml')): os.path.isfile(os.path.join(setting_path, config_data['new_scenario_name'] + '.xml')):
return {'exist': 'yes'} return {'exist': 'yes'}
else: else:
return {'exist': 'no'} return {'exist': 'no'}
elif 'old_launch_name' in list(config_data.keys()) and 'new_launch_name' in list(config_data.keys()): elif 'old_launch_name' in list(config_data.keys()) and 'new_launch_name' in list(config_data.keys()):
if config_data['old_launch_name'] != config_data['new_launch_name'] and \ if config_data['old_launch_name'] != config_data['new_launch_name'] and \
os.path.isfile(os.path.join(setting_path, 'user_defined', config_data['new_launch_name'] + '.xml')): os.path.isfile(os.path.join(setting_path, config_data['new_launch_name'] + '.xml')):
return {'exist': 'yes'} return {'exist': 'yes'}
else: else:
return {'exist': 'no'} return {'exist': 'no'}
elif 'create_name' in list(config_data.keys()): elif 'create_name' in list(config_data.keys()):
if os.path.isfile(os.path.join(setting_path, 'user_defined', config_data['create_name'] + '.xml')): if os.path.isfile(os.path.join(setting_path, config_data['create_name'] + '.xml')):
return {'exist': 'yes'} return {'exist': 'yes'}
else: else:
return {'exist': 'no'} return {'exist': 'no'}
@ -476,8 +515,10 @@ def create_setting():
mode = create_config_data['mode'] mode = create_config_data['mode']
default_name = create_config_data['default_name'] default_name = create_config_data['default_name']
create_name = create_config_data['create_name'] create_name = create_config_data['create_name']
src_path = create_config_data['src_path']
setting_type = create_config_data['type']
xml_configs = get_xml_configs(True) xml_configs = get_xml_configs()
board_info = xml_configs[0] board_info = xml_configs[0]
board_type = xml_configs[1] board_type = xml_configs[1]
scenario_config = xml_configs[2] scenario_config = xml_configs[2]
@ -487,7 +528,12 @@ def create_setting():
return {'status': 'fail', return {'status': 'fail',
'error_list': {'error': 'Please select the board info before this operation.'}} 'error_list': {'error': 'Please select the board info before this operation.'}}
setting_path = os.path.join(current_app.config.get('CONFIG_PATH'), board_type, 'user_defined') setting_path = os.path.join(current_app.config.get('CONFIG_PATH'), board_info)
if not os.path.isdir(setting_path):
os.makedirs(setting_path)
if src_path is not None and str(src_path).strip() != '':
setting_path = src_path
if not os.path.isdir(setting_path): if not os.path.isdir(setting_path):
os.makedirs(setting_path) os.makedirs(setting_path)
@ -498,17 +544,20 @@ def create_setting():
if mode == 'create': if mode == 'create':
template_file_name = 'industry_launch_2uos' template_file_name = 'industry_launch_2uos'
src_file_name = os.path.join(current_app.config.get('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: else:
src_file_name = os.path.join(current_app.config.get('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')
copyfile(src_file_name, copyfile(src_file_name,
os.path.join(current_app.config.get('CONFIG_PATH'), board_type, 'user_defined', create_name + '.xml')) os.path.join(current_app.config.get('CONFIG_PATH'), board_type, create_name + '.xml'))
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('uos:id=2')
launch_config.delete_curr_key('uos:id=1') launch_config.delete_curr_key('uos: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)):
copyfile(os.path.join(current_app.config.get('CONFIG_PATH'), board_type, create_name + '.xml'),
os.path.join(setting_path, create_name + '.xml'))
return {'status': 'success', 'setting': create_name, 'error_list': {}} return {'status': 'success', 'setting': create_name, 'error_list': {}}
elif create_config_data['type'] == 'scenario': elif create_config_data['type'] == 'scenario':
@ -518,11 +567,11 @@ def create_setting():
if mode == 'create': if mode == 'create':
template_file_name = 'industry' template_file_name = 'industry'
src_file_name = os.path.join(current_app.config.get('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: else: # load
src_file_name = os.path.join(current_app.config.get('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')
copyfile(src_file_name, copyfile(src_file_name,
os.path.join(current_app.config.get('CONFIG_PATH'), board_type, 'user_defined', os.path.join(current_app.config.get('CONFIG_PATH'), board_type,
create_name + '.xml')) create_name + '.xml'))
if mode == 'create': if mode == 'create':
# update RDT->CLOS_MASK according to board xml # update RDT->CLOS_MASK according to board xml
@ -541,6 +590,9 @@ def create_setting():
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)
scenario_config.save(create_name) scenario_config.save(create_name)
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'),
os.path.join(setting_path, create_name + '.xml'))
return {'status': 'success', 'setting': create_name, 'error_list': {}} return {'status': 'success', 'setting': create_name, 'error_list': {}}
else: else:
@ -562,7 +614,6 @@ def remove_setting():
old_setting_path = os.path.join(current_app.config.get('CONFIG_PATH'), old_setting_path = os.path.join(current_app.config.get('CONFIG_PATH'),
current_app.config.get('BOARD_TYPE'), current_app.config.get('BOARD_TYPE'),
'user_defined',
old_setting_name + '.xml') old_setting_name + '.xml')
if os.path.isfile(old_setting_path): if os.path.isfile(old_setting_path):
@ -581,17 +632,19 @@ def generate_src():
src_type = generator_config_data['type'] src_type = generator_config_data['type']
board_info = generator_config_data['board_info'] board_info = generator_config_data['board_info']
board_type = current_app.config.get('BOARD_TYPE') board_type = current_app.config.get('BOARD_TYPE')
board_info_xml = os.path.join(os.path.dirname(os.path.abspath(__file__)), board_info_xml = os.path.join(current_app.config.get('CONFIG_PATH'),
'res', board_info+'.xml') board_type, board_info+'.xml')
scenario_setting = generator_config_data['scenario_setting'] scenario_setting = generator_config_data['scenario_setting']
scenario_setting_xml = os.path.join(current_app.config.get('CONFIG_PATH'), board_type, scenario_setting_xml = os.path.join(current_app.config.get('CONFIG_PATH'), board_type,
'user_defined', scenario_setting+'.xml') scenario_setting+'.xml')
src_path = generator_config_data['src_path'] src_path = generator_config_data['src_path']
if src_path is None or str(src_path).strip() == '':
src_path = os.path.join(current_app.config.get('CONFIG_PATH'))
launch_setting_xml = None launch_setting_xml = None
if 'launch_setting' in generator_config_data: if 'launch_setting' in generator_config_data:
launch_setting = generator_config_data['launch_setting'] launch_setting = generator_config_data['launch_setting']
launch_setting_xml = os.path.join(current_app.config.get('CONFIG_PATH'), launch_setting_xml = os.path.join(current_app.config.get('CONFIG_PATH'),
board_type, 'user_defined', launch_setting + '.xml') board_type, launch_setting + '.xml')
msg = {} msg = {}
error_list = {} error_list = {}
status = 'success' status = 'success'
@ -611,7 +664,7 @@ def generate_src():
error_list = {'scenario setting error': str(error)} error_list = {'scenario setting error': str(error)}
elif src_type == 'generate_launch_script': elif src_type == 'generate_launch_script':
scenario_setting_xml = os.path.join(current_app.config.get('CONFIG_PATH'), board_type, scenario_setting_xml = os.path.join(current_app.config.get('CONFIG_PATH'), board_type,
'user_defined', scenario_setting + '.xml') scenario_setting + '.xml')
try: try:
from launch_config.launch_cfg_gen import ui_entry_api from launch_config.launch_cfg_gen import ui_entry_api
@ -640,22 +693,18 @@ def upload_board_info():
if file and '.' in file.filename and file.filename.rsplit('.', 1)[1] in ['xml']: if file and '.' in file.filename and file.filename.rsplit('.', 1)[1] in ['xml']:
filename = secure_filename(file.filename) filename = secure_filename(file.filename)
tmp_filename = 'tmp_' + filename tmp_filename = 'tmp_' + filename
save_tmp_board_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), config_path = current_app.config.get('CONFIG_PATH')
'res', tmp_filename) default_config_path = current_app.config.get('DEFAULT_CONFIG_PATH')
save_tmp_board_path = os.path.join(config_path, tmp_filename)
file.save(save_tmp_board_path) file.save(save_tmp_board_path)
board_type_list = [] board_type_list = []
config_path = current_app.config.get('CONFIG_PATH') for config_name in os.listdir(default_config_path):
for config_name in os.listdir(config_path): if os.path.isdir(os.path.join(default_config_path, config_name)) \
if os.path.isdir(os.path.join(config_path, config_name)) \
and config_name not in ['generic_board', 'sample_launch_scripts']: and config_name not in ['generic_board', 'sample_launch_scripts']:
board_type_list.append(config_name) board_type_list.append(config_name)
res_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'res') board_info_config = XmlConfig(config_path)
if not os.path.isdir(res_path):
os.makedirs(res_path)
board_info_config = XmlConfig(res_path)
board_info_config.set_curr(tmp_filename.rsplit('.', 1)[0]) board_info_config.set_curr(tmp_filename.rsplit('.', 1)[0])
board_info_root = board_info_config.get_curr_root() board_info_root = board_info_config.get_curr_root()
board_type = None board_type = None
@ -669,38 +718,37 @@ def upload_board_info():
'check the xml syntax and whether there is only the board ' 'check the xml syntax and whether there is only the board '
'attribute in the board info file'} 'attribute in the board info file'}
os.rename(save_tmp_board_path, board_path =os.path.join(config_path, board_type)
os.path.join(os.path.dirname(os.path.abspath(__file__)), if not os.path.isdir(board_path):
'res', filename)) os.makedirs(board_path)
move(save_tmp_board_path, os.path.join(board_path, filename))
info = 'updated' info = 'updated'
if board_type not in board_type_list: # if board_type not in board_type_list:
info = board_type # info = board_type
os.makedirs(os.path.join(config_path, board_type)) # for generic_name in os.listdir(os.path.join(config_path, 'generic_board')):
for generic_name in os.listdir(os.path.join(config_path, 'generic_board')): # generic_file = os.path.join(config_path, 'generic_board', generic_name)
generic_file = os.path.join(config_path, 'generic_board', generic_name) # if os.path.isfile(generic_file):
if os.path.isfile(generic_file): # new_file = os.path.join(user_config_path, board_type, generic_name)
new_file = os.path.join(config_path, board_type, generic_name) # copyfile(generic_file, new_file)
copyfile(generic_file, new_file) # xml_config = XmlConfig(user_config_path, user_defined=False)
xml_config = XmlConfig(os.path.join(current_app.config.get('CONFIG_PATH'), # xml_config.set_curr(generic_name.rsplit('.', 1)[0])
board_type)) # xml_config.set_curr_attr('board', board_type)
xml_config.set_curr(generic_name.rsplit('.', 1)[0]) # # update RDT->CLOS_MASK according to board xml
xml_config.set_curr_attr('board', board_type) # xml_config_root = xml_config.get_curr_root()
# update RDT->CLOS_MASK according to board xml # if 'board' in xml_config_root.attrib and 'scenario' in xml_config_root.attrib \
xml_config_root = xml_config.get_curr_root() # and 'uos_launcher' not in xml_config_root.attrib:
if 'board' in xml_config_root.attrib and 'scenario' in xml_config_root.attrib \ # cdp_enabled = xml_config.get_curr_value('hv', 'FEATURES', 'RDT', 'CDP_ENABLED')
and 'uos_launcher' not in xml_config_root.attrib: # (num_clos_mask, num_mba_delay) = \
cdp_enabled = xml_config.get_curr_value('hv', 'FEATURES', 'RDT', 'CDP_ENABLED') # get_num_of_rdt_res(filename.rsplit('.', 1)[0], cdp_enabled)
(num_clos_mask, num_mba_delay) = \ # elem_clos_max = xml_config.get_curr_elem('hv', 'FEATURES', 'RDT', 'CLOS_MASK')
get_num_of_rdt_res(filename.rsplit('.', 1)[0], cdp_enabled) # elem_mba_delay = xml_config.get_curr_elem('hv', 'FEATURES', 'RDT', 'MBA_DELAY')
elem_clos_max = xml_config.get_curr_elem('hv', 'FEATURES', 'RDT', 'CLOS_MASK') # xml_config.delete_curr_elem('hv', 'FEATURES', 'RDT', 'CLOS_MASK')
elem_mba_delay = xml_config.get_curr_elem('hv', 'FEATURES', 'RDT', 'MBA_DELAY') # xml_config.delete_curr_elem('hv', 'FEATURES', 'RDT', 'MBA_DELAY')
xml_config.delete_curr_elem('hv', 'FEATURES', 'RDT', 'CLOS_MASK') # for i in range(num_clos_mask):
xml_config.delete_curr_elem('hv', 'FEATURES', 'RDT', 'MBA_DELAY') # xml_config.clone_curr_elem(elem_clos_max, 'hv', 'FEATURES', 'RDT')
for i in range(num_clos_mask): # for i in range(num_mba_delay):
xml_config.clone_curr_elem(elem_clos_max, 'hv', 'FEATURES', 'RDT') # xml_config.clone_curr_elem(elem_mba_delay, 'hv', 'FEATURES', 'RDT')
for i in range(num_mba_delay): # xml_config.save(generic_name.rsplit('.', 1)[0], user_defined=False)
xml_config.clone_curr_elem(elem_mba_delay, 'hv', 'FEATURES', 'RDT')
xml_config.save(generic_name.rsplit('.', 1)[0], user_defined=False)
board_info = os.path.splitext(file.filename)[0] board_info = os.path.splitext(file.filename)[0]
current_app.config.update(BOARD_INFO=board_info) current_app.config.update(BOARD_INFO=board_info)
@ -745,8 +793,7 @@ def upload_scenario():
board_type = current_app.config.get('BOARD_TYPE') board_type = current_app.config.get('BOARD_TYPE')
tmp_scenario_name = 'tmp_' + scenario_file_name + '.xml' tmp_scenario_name = 'tmp_' + scenario_file_name + '.xml'
tmp_scenario_file = os.path.join(current_app.config.get('CONFIG_PATH'), board_type, tmp_scenario_file = os.path.join(current_app.config.get('CONFIG_PATH'), board_type, tmp_scenario_name)
'user_defined', tmp_scenario_name)
tmp_scenario_folder = os.path.dirname(tmp_scenario_file) tmp_scenario_folder = os.path.dirname(tmp_scenario_file)
if not os.path.exists(tmp_scenario_folder): if not os.path.exists(tmp_scenario_folder):
os.makedirs(tmp_scenario_folder) os.makedirs(tmp_scenario_folder)
@ -756,7 +803,7 @@ def upload_scenario():
file.save(tmp_scenario_file) file.save(tmp_scenario_file)
tmp_xml_config = XmlConfig(os.path.join(current_app.config.get('CONFIG_PATH'), tmp_xml_config = XmlConfig(os.path.join(current_app.config.get('CONFIG_PATH'),
board_type, 'user_defined')) board_type))
tmp_xml_config.set_curr(tmp_scenario_name[:-4]) tmp_xml_config.set_curr(tmp_scenario_name[:-4])
status = None status = None
if tmp_xml_config.get_curr_root() is None: if tmp_xml_config.get_curr_root() is None:
@ -782,15 +829,14 @@ def upload_scenario():
rename = False rename = False
if not error_list: if not error_list:
new_scenario_path = os.path.join(current_app.config.get('CONFIG_PATH'), board_type, new_scenario_path = os.path.join(current_app.config.get('CONFIG_PATH'), board_type,
'user_defined', scenario_file_name + '.xml') scenario_file_name + '.xml')
if os.path.isfile(new_scenario_path): if os.path.isfile(new_scenario_path):
new_scenario_name = new_scenario_name + '_' \ new_scenario_name = new_scenario_name + '_' \
+ datetime.now().strftime('%Y%m%d%H%M%S') + datetime.now().strftime('%Y%m%d%H%M%S')
rename = True rename = True
os.rename(tmp_scenario_file, os.path.join(current_app.config.get('CONFIG_PATH'), os.rename(tmp_scenario_file, os.path.join(current_app.config.get('CONFIG_PATH'),
board_type, 'user_defined', board_type, new_scenario_name + '.xml'))
new_scenario_name + '.xml'))
return {'status': 'success', 'file_name': new_scenario_name, return {'status': 'success', 'file_name': new_scenario_name,
'rename': rename, 'error_list': error_list} 'rename': rename, 'error_list': error_list}
@ -815,14 +861,14 @@ def upload_launch():
tmp_launch_name = 'tmp_' + launch_file_name + '.xml' tmp_launch_name = 'tmp_' + launch_file_name + '.xml'
tmp_launch_file = os.path.join(current_app.config.get('CONFIG_PATH'), board_type, tmp_launch_file = os.path.join(current_app.config.get('CONFIG_PATH'), board_type,
'user_defined', tmp_launch_name) tmp_launch_name)
if os.path.isfile(tmp_launch_file): if os.path.isfile(tmp_launch_file):
os.remove(tmp_launch_file) os.remove(tmp_launch_file)
file.save(tmp_launch_file) file.save(tmp_launch_file)
tmp_xml_config = XmlConfig(os.path.join(current_app.config.get('CONFIG_PATH'), tmp_xml_config = XmlConfig(os.path.join(current_app.config.get('CONFIG_PATH'),
board_type, 'user_defined')) board_type))
tmp_xml_config.set_curr(tmp_launch_name[:-4]) tmp_xml_config.set_curr(tmp_launch_name[:-4])
status = None status = None
if tmp_xml_config.get_curr_root() is None: if tmp_xml_config.get_curr_root() is None:
@ -848,15 +894,14 @@ def upload_launch():
rename = False rename = False
if not error_list: if not error_list:
new_launch_path = os.path.join(current_app.config.get('CONFIG_PATH'), board_type, new_launch_path = os.path.join(current_app.config.get('CONFIG_PATH'), board_type,
'user_defined', launch_file_name + '.xml') launch_file_name + '.xml')
if os.path.isfile(new_launch_path): if os.path.isfile(new_launch_path):
new_launch_name = new_launch_name + '_' + \ new_launch_name = new_launch_name + '_' + \
datetime.now().strftime('%Y%m%d%H%M%S') datetime.now().strftime('%Y%m%d%H%M%S')
rename = True rename = True
os.rename(tmp_launch_file, os.path.join(current_app.config.get('CONFIG_PATH'), os.rename(tmp_launch_file, os.path.join(current_app.config.get('CONFIG_PATH'),
board_type, 'user_defined', board_type, new_launch_name + '.xml'))
new_launch_name + '.xml'))
return {'status': 'success', 'file_name': new_launch_name, return {'status': 'success', 'file_name': new_launch_name,
'rename': rename, 'error_list': error_list} 'rename': rename, 'error_list': error_list}
@ -934,18 +979,17 @@ def get_board_list():
get all available board info files get all available board info files
:return: the file list of board info :return: the file list of board info
""" """
res_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'res') config_path = current_app.config.get('CONFIG_PATH')
if not os.path.isdir(res_path): board_type_list = []
os.makedirs(res_path) for config_name in os.listdir(config_path):
board_info_list = [] if os.path.isdir(os.path.join(config_path, config_name)) \
for file in os.listdir(res_path): and config_name not in ['generic_board', 'sample_launch_scripts']:
if os.path.isfile(os.path.join(res_path, file)) and \ board_type_list.append(config_name)
'.' in file and file.rsplit('.', 1)[1] in ['xml']:
board_info_list.append(file.rsplit('.', 1)[0]) return board_type_list
return board_info_list
def get_xml_configs(user_defined=True): def get_xml_configs(user_defined=False):
""" """
get xml config related variables get xml config related variables
:return: board_info, board_config, scenario_config, launch_config :return: board_info, board_config, scenario_config, launch_config
@ -977,7 +1021,7 @@ def get_generic_scenario_config(scenario_config, add_vm_type=None):
'LAUNCH_POST_STD_VM': ('industry_launch_2uos', 'uos:id=1'), 'LAUNCH_POST_STD_VM': ('industry_launch_2uos', 'uos:id=1'),
'LAUNCH_POST_RT_VM': ('industry_launch_2uos', 'uos:id=2') 'LAUNCH_POST_RT_VM': ('industry_launch_2uos', 'uos:id=2')
} }
config_path = os.path.join(current_app.config.get('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)
if os.path.isfile(os.path.join(config_path, vm_dict[add_vm_type][0] + '.xml')): if os.path.isfile(os.path.join(config_path, vm_dict[add_vm_type][0] + '.xml')):
generic_scenario_config.set_curr(vm_dict[add_vm_type][0]) generic_scenario_config.set_curr(vm_dict[add_vm_type][0])
@ -1009,7 +1053,7 @@ def get_board_config(board_info):
""" """
board_config = None board_config = None
if board_info is not None: if board_info is not None:
board_config = XmlConfig(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'res')) board_config = XmlConfig(os.path.join(current_app.config.get('CONFIG_PATH'), board_info), board_info)
board_config.set_curr(board_info) board_config.set_curr(board_info)
return board_config return board_config
@ -1023,6 +1067,7 @@ def get_board_type(board_info):
""" """
board_config = get_board_config(board_info) board_config = get_board_config(board_info)
board_type = None board_type = None
if board_config is not None: if board_config is not None:
board_info_root = board_config.get_curr_root() board_info_root = board_config.get_curr_root()
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: