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

acrn-config: update config folders used in config app

Browse Source 
update config folders used in config app based on config tool folders
reorg; remove "Generate configuration files" button from config app
since the function is deprecated.

Tracked-On: #5644
Signed-off-by: Shuang Zheng <shuang.zheng@intel.com>
This commit is contained in:
Shuang Zheng 2021-01-28 17:54:04 +08:00 committed by wenlingz
parent d55ab87331
commit 2a3ef45b91
3 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,4 +10,4 @@ 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__)), '..', '..', 'vm_configs', 'xmls', 'config-xmls') CONFIG_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', 'data')

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

@ -790,7 +790,7 @@ function create_setting(type, default_name, name, mode){
create_flag = true create_flag = true
if(exist == "yes") { if(exist == "yes") {
overwirte_confirm_message = 'Setting name: ' + create_config['create_name'] + ' existed in ' + overwirte_confirm_message = 'Setting name: ' + create_config['create_name'] + ' existed in ' +
'acrn-hypervisor/misc/vm_configs/xmls/config-xmls/'+board_info+'/user_defined/.\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(overwirte_confirm_message)) {
create_flag = false create_flag = false
@ -906,7 +906,7 @@ function save_scenario(generator=null){
create_flag = true create_flag = true
if(exist == "yes") { if(exist == "yes") {
overwirte_confirm_message = 'Setting name: ' + scenario_config['create_name'] + ' existed in ' + overwirte_confirm_message = 'Setting name: ' + scenario_config['create_name'] + ' existed in ' +
'acrn-hypervisor/misc/vm_configs/xmls/config-xmls/'+board_info+'/user_defined/.\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(overwirte_confirm_message)) {
create_flag = false create_flag = false
@ -931,17 +931,17 @@ function save_scenario(generator=null){
if(no_err == true && status == 'success') { if(no_err == true && status == 'success') {
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/vm_configs/xmls/config-xmls/'+board_info+'/user_defined/.' +file_name+'\ninto acrn-hypervisor/misc/config_tools/data/'+board_info+'/user_defined/.'
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/vm_configs/xmls/config-xmls/'+board_info+'/user_defined/.'; +file_name+'\ninto acrn-hypervisor/misc/config_tools/data/'+board_info+'/user_defined/.';
} }
if(generator=="generate_config_src") { if(generator=="generate_config_src") {
var src_path = $("input#src_path").val(); 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' + overwirte_confirm_message = 'The Source Path for configuration files is not set.\n' +
'Do you want to generate them into the default path: acrn-hypervisor/misc/vm_configs/board/ and acrn-hypervisor/misc/vm_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(overwirte_confirm_message)) {
generate_flag = false generate_flag = false
@ -966,7 +966,7 @@ function save_scenario(generator=null){
error_list = result.error_list error_list = result.error_list
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 acrn-hypervisor/misc/vm_configs/board/ and acrn-hypervisor/misc/vm_configs/scenarios/ '); alert(generator+' successfully into acrn-hypervisor/build/hypervisor/configs/board/ and acrn-hypervisor/build/hypervisor/configs/scenarios/ ');
} else { } else {
alert(generator+' successfully into '+src_path); alert(generator+' successfully into '+src_path);
} }
@ -1080,7 +1080,7 @@ function save_launch(generator=null) {
create_flag = true create_flag = true
if(exist == "yes") { if(exist == "yes") {
overwirte_confirm_message = 'Setting name: ' + launch_config['create_name'] + ' existed in ' + overwirte_confirm_message = 'Setting name: ' + launch_config['create_name'] + ' existed in ' +
'acrn-hypervisor/misc/vm_configs/xmls/config-xmls/'+board_info+'/user_defined/.\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(overwirte_confirm_message)) {
create_flag = false create_flag = false
@ -1107,17 +1107,17 @@ function save_launch(generator=null) {
if(no_err == true && status == 'success') { if(no_err == true && status == 'success') {
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/vm_configs/xmls/config-xmls/'+board_info+'/user_defined/.' +file_name+'\nto acrn-hypervisor/misc/config_tools/data/'+board_info+'/user_defined/.'
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/vm_configs/xmls/config-xmls/'+board_info+'/user_defined/.'; +file_name+'\nto acrn-hypervisor/misc/config_tools/data/'+board_info+'/user_defined/.';
} }
if(generator == 'generate_launch_script') { if(generator == 'generate_launch_script') {
var src_path = $("input#src_path").val(); 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' + overwirte_confirm_message = 'The Source Path for launch scripts is not set.\n' +
'Do you want to generate them into the default path: misc/vm_configs/xmls/config-xmls/'+board_info+'/output/,\n'+ 'Do you want to generate them into the default path: misc/config_tools/data/'+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(overwirte_confirm_message)) {
generate_flag = false generate_flag = false
@ -1144,7 +1144,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/vm_configs/xmls/config-xmls/'+board_info+'/output/.'); 'acrn-hypervisor/misc/config_tools/data/'+board_info+'/output/.');
} else { } else {
alert(generator+' successfully into '+src_path); alert(generator+' successfully into '+src_path);
} }

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

@ -105,21 +105,11 @@ the source files will be generated into default path and overwirte the previous
id="export_scenario_xml">Export XML id="export_scenario_xml">Export XML
</button> </button>
</div> </div>
<div class="col-sm-2">
<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 %} {% else %}
<div class="col-sm-1"> <div class="col-sm-1">
<button type="button" disabled class="btn btn-primary" data-toggle="modal" data-target="#save_modal">Export XML <button type="button" disabled class="btn btn-primary" data-toggle="modal" data-target="#save_modal">Export XML
</button> </button>
</div> </div>
<div class="col-sm-2">
<button type="button" disabled class="btn btn-primary" data-toggle="modal" data-target="#save_modal">
Generate configuration files
</button>
</div>
{% endif %} {% endif %}
</div> </div>