acrn-config: one button to generate config file
Currently we use separate button to generate board configuration files and scenario configuration files for hypervisor, this is not friendly from UX perspective. So remove redundant button on HV configuration generation. Tracked-On: #3854 Signed-off-by: Victor Sun <victor.sun@intel.com> Reviewed-by: Shuang Zheng <shuang.zheng@intel.com>
This commit is contained in:
parent
1d2aea1ebd
commit
0074ad1d20
|
@ -167,7 +167,7 @@ $().ready(function(){
|
|||
|
||||
$('#save_scenario').on('click', function() {
|
||||
var name = $(this).data('id');
|
||||
if(name=="generate_board_src" || name=="generate_scenario_src") {
|
||||
if(name=="generate_config_src") {
|
||||
save_scenario(name);
|
||||
}
|
||||
else {
|
||||
|
@ -271,12 +271,7 @@ $().ready(function(){
|
|||
});
|
||||
});
|
||||
|
||||
$('#generate_board_src').on('click', function() {
|
||||
var dataId = $(this).data('id');
|
||||
$("#save_scenario").data('id', dataId);
|
||||
});
|
||||
|
||||
$('#generate_scenario_src').on('click', function() {
|
||||
$('#generate_config_src').on('click', function() {
|
||||
var dataId = $(this).data('id');
|
||||
$("#save_scenario").data('id', dataId);
|
||||
});
|
||||
|
@ -437,19 +432,12 @@ function save_scenario(generator=null){
|
|||
validate_message = 'Scenario setting existed, saved successfully with a new name: '
|
||||
+file_name+'\ninto acrn-hypervisor/misc/acrn-config/xmls/config-xmls/'+board_info+'/user_defined/.';
|
||||
}
|
||||
if(generator=="generate_board_src" || generator=="generate_scenario_src") {
|
||||
commit_confirm_message = validate_message+'\n\nGenerate source codes from scenario setting.'
|
||||
+'\n\nDo you want to commit changes to local tree?'
|
||||
commit_confirm = 'no'
|
||||
if(confirm(commit_confirm_message)) {
|
||||
commit_confirm = 'yes'
|
||||
}
|
||||
if(generator=="generate_config_src") {
|
||||
generator_config = {
|
||||
type: generator,
|
||||
board_info: $("select#board_info").val(),
|
||||
board_setting: "board_setting",
|
||||
scenario_setting: file_name,
|
||||
commit: commit_confirm
|
||||
}
|
||||
$.ajax({
|
||||
type : "POST",
|
||||
|
@ -461,10 +449,7 @@ function save_scenario(generator=null){
|
|||
status = result.status
|
||||
error_list = result.error_list
|
||||
if (status == 'success' && (JSON.stringify(error_list)=='{}' || JSON.stringify(error_list)=='null')) {
|
||||
if(commit_confirm == 'yes')
|
||||
alert(generator+' with commit successfully.');
|
||||
else
|
||||
alert(generator+' successfully.');
|
||||
alert(generator+' successfully.');
|
||||
} else {
|
||||
alert(generator+' failed. \nError list:\n'+JSON.stringify(error_list));
|
||||
}
|
||||
|
@ -573,19 +558,12 @@ function save_launch(generator=null) {
|
|||
+file_name+'\nto acrn-hypervisor/misc/acrn-config/xmls/config-xmls/'+board_info+'/user_defined/.';
|
||||
}
|
||||
if(generator != null) {
|
||||
commit_confirm_message = validate_message+'\n\nGenerate launch scripts from launch setting.'
|
||||
+'\n\nDo you want to commit changes to local tree?'
|
||||
commit_confirm = 'no'
|
||||
if(confirm(commit_confirm_message)) {
|
||||
commit_confirm = 'yes'
|
||||
}
|
||||
generator_config = {
|
||||
type: generator,
|
||||
board_info: $("select#board_info").val(),
|
||||
board_setting: "board_setting",
|
||||
scenario_setting: $("select#scenario_name").val(),
|
||||
launch_setting: file_name,
|
||||
commit: commit_confirm
|
||||
}
|
||||
$.ajax({
|
||||
type : "POST",
|
||||
|
@ -597,11 +575,7 @@ function save_launch(generator=null) {
|
|||
status = result.status
|
||||
error_list = result.error_list
|
||||
if (status == 'success' && (JSON.stringify(error_list)=='{}' || JSON.stringify(error_list)=='null')) {
|
||||
if(commit_confirm == 'yes')
|
||||
alert(generator+' successfully into '+
|
||||
'acrn-hypervisor/misc/acrn-config/xmls/config-xmls/'+board_info+'/output/ with changes committed.');
|
||||
else
|
||||
alert(generator+' successfully into '+
|
||||
alert(generator+' successfully into '+
|
||||
'acrn-hypervisor/misc/acrn-config/xmls/config-xmls/'+board_info+'/output/.');
|
||||
} else {
|
||||
alert(generator+' failed. \nError list:\n'+JSON.stringify(error_list));
|
||||
|
|
|
@ -57,13 +57,8 @@
|
|||
</button>
|
||||
</div>
|
||||
<div class="col-sm-2">
|
||||
<button type="button" id="generate_board_src" data-id="generate_board_src" class="btn btn-primary"
|
||||
data-toggle="modal" data-target="#save_modal">Generate Board SRC
|
||||
</button>
|
||||
</div>
|
||||
<div class="col-sm-2">
|
||||
<button type="button" id="generate_scenario_src" data-id="generate_scenario_src" class="btn btn-primary"
|
||||
data-toggle="modal" data-target="#save_modal">Generate Scenario SRC
|
||||
<button type="button" id="generate_config_src" data-id="generate_config_src" class="btn btn-primary"
|
||||
data-toggle="modal" data-target="#save_modal">Generate configuration files
|
||||
</button>
|
||||
</div>
|
||||
{% else %}
|
||||
|
@ -74,12 +69,7 @@
|
|||
</div>
|
||||
<div class="col-sm-2">
|
||||
<button type="button" disabled class="btn btn-primary" data-toggle="modal" data-target="#save_modal">
|
||||
Generate Board SRC
|
||||
</button>
|
||||
</div>
|
||||
<div class="col-sm-2">
|
||||
<button type="button" disabled class="btn btn-primary" data-toggle="modal" data-target="#save_modal">
|
||||
Generate Scenario SRC
|
||||
Generate configuration files
|
||||
</button>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
|
|
@ -384,14 +384,14 @@ def generate_src():
|
|||
msg = {}
|
||||
error_list = {}
|
||||
status = 'success'
|
||||
if src_type == 'generate_board_src':
|
||||
if src_type == 'generate_config_src':
|
||||
try:
|
||||
from board_config.board_cfg_gen import ui_entry_api
|
||||
error_list = ui_entry_api(board_info_xml, scenario_setting_xml, commit)
|
||||
except Exception as error:
|
||||
status = 'fail'
|
||||
error_list = {'board setting error': str(error)}
|
||||
elif src_type == 'generate_scenario_src':
|
||||
|
||||
try:
|
||||
from scenario_config.scenario_cfg_gen import ui_entry_api
|
||||
error_list = ui_entry_api(board_info_xml, scenario_setting_xml, commit)
|
||||
|
|
Loading…
Reference in New Issue