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

config_tools: show scenario data error when load scenario

Browse Source 
show scenario data errors when load scenario

Tracked-On: #6691
Signed-off-by: Weiyi Feng <weiyix.feng@intel.com>
This commit is contained in:
Weiyi Feng 2022-05-31 15:12:13 +08:00 committed by acrnsi-robot
parent 11204a378d
commit 101ac317ac
1 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
misc/config_tools/configurator/packages/configurator/src/pages/Config.vue
View File

@ -180,7 +180,8 @@ export default {
} }
}, },
scenarioUpdate(scenarioData) { scenarioUpdate(scenarioData) {
this.errors = [] let scenarioXMLData = this.scenarioToXML(scenarioData)
this.errors = configurator.pythonObject.validateScenario(this.board.content, scenarioXMLData)
this.scenario = scenarioData; this.scenario = scenarioData;
this.showFlag = false; this.showFlag = false;
this.updateCurrentFormSchema() this.updateCurrentFormSchema()
@ -277,7 +278,7 @@ export default {
for (let i = 0; i < files.length; i++) { for (let i = 0; i < files.length; i++) {
let arr = files[i].path.split('.') let arr = files[i].path.split('.')
let suffix = arr[arr.length - 1] let suffix = arr[arr.length - 1]
if (suffix == 'sh') { if (suffix === 'sh') {
configurator.removeFile(files[i].path) configurator.removeFile(files[i].path)
.catch((err) => alert(`${err}`)) .catch((err) => alert(`${err}`))
} }
@ -351,6 +352,25 @@ export default {
} }
return errorFlag return errorFlag
}, },
scenarioToXML(scenarioData) {
return configurator.convertScenarioToXML(
{
// simple deep copy
"acrn-config": JSON.parse(JSON.stringify(scenarioData))
}
)
},
applyScenarioDefaults(scenarioData) {
let scenarioXMLData = this.scenarioToXML(scenarioData)
// get scenario Defaults
let scenarioWithDefault = configurator.pythonObject.populateDefaultValues(scenarioXMLData)
scenarioWithDefault = scenarioWithDefault.json['acrn-config']
if (scenarioWithDefault.hv.FEATURES.RDT.RDT_ENABLED === 'n') {
delete scenarioWithDefault.hv.CACHE_REGION
}
return scenarioWithDefault
},
saveScenario() { saveScenario() {
if (_.isEmpty(this.scenario.vm)) { if (_.isEmpty(this.scenario.vm)) {
alert("Please add at least one VM") alert("Please add at least one VM")
@ -373,32 +393,10 @@ export default {
let totalMsg = msg.length // msg and errMsg must be same length. let totalMsg = msg.length // msg and errMsg must be same length.
let needSaveLaunchScript = false let needSaveLaunchScript = false
let scenarioXMLData = configurator.convertScenarioToXML( let scenarioWithDefaults = this.applyScenarioDefaults(this.scenario)
{ let scenarioXMLData = this.scenarioToXML(scenarioWithDefaults)
// simple deep copy this.scenario = scenarioWithDefaults
"acrn-config": JSON.parse(JSON.stringify(this.scenario))
}
);
console.log(scenarioXMLData)
// get scenario Defaults
let scenarioWithDefault = configurator.pythonObject.populateDefaultValues(scenarioXMLData)
console.log(scenarioWithDefault)
// write defaults to frontend
this.scenario = scenarioWithDefault.json['acrn-config']
console.log(this.scenario.hv.FEATURES)
if (this.scenario.hv.FEATURES.RDT.RDT_ENABLED === 'n') {
delete this.scenario.hv.CACHE_REGION
}
this.updateCurrentFormData() this.updateCurrentFormData()
// get scenario XML with defaults
scenarioXMLData = configurator.convertScenarioToXML(
{
// simple deep copy
"acrn-config": JSON.parse(JSON.stringify(this.scenario))
}
);
console.log(scenarioXMLData)
this.scenario.vm.map((vmConfig) => { this.scenario.vm.map((vmConfig) => {
if (vmConfig['load_order'] === 'POST_LAUNCHED_VM') { if (vmConfig['load_order'] === 'POST_LAUNCHED_VM') {