shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

B #5518: Cost calculations take into account only the base template (oneFlow)

Browse Source
This commit is contained in:
abelCoronado93 2017-10-31 09:56:30 +01:00 committed by Jaime Melis
parent 4a47fbed3f
commit e8be19ff53
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/instantiate.js
View File

@ -30,6 +30,7 @@ define(function(require) {
var WizardFields = require('utils/wizard-fields');
var UserInputs = require('utils/user-inputs');
var Config = require('sunstone-config');
var TemplateUtils = require('utils/template-utils');
/*
TEMPLATES
@ -137,10 +138,34 @@ define(function(require) {
},
timeout: true,
success: function (request, vm_template_json){
that.vm_template_json = vm_template_json;
$("#"+div_id, context).empty();
var cost = OpenNebulaTemplate.cost(vm_template_json);
if (role.vm_template_contents){
roleTemplate = TemplateUtils.stringToTemplate(role.vm_template_contents);
var append = roleTemplate.APPEND.split(",");
$.each(append, function(key, value){
if (!that.vm_template_json.VMTEMPLATE.TEMPLATE[value]){
that.vm_template_json.VMTEMPLATE.TEMPLATE[value] = roleTemplate[value];
} else {
if (!Array.isArray(that.vm_template_json.VMTEMPLATE.TEMPLATE[value])){
that.vm_template_json.VMTEMPLATE.TEMPLATE[value] = [that.vm_template_json.VMTEMPLATE.TEMPLATE[value]];
}
if (Array.isArray(roleTemplate[value])){
$.each(roleTemplate[value], function(rkey, rvalue){
that.vm_template_json.VMTEMPLATE.TEMPLATE[value].push(rvalue);
});
} else {
that.vm_template_json.VMTEMPLATE.TEMPLATE[value].push(roleTemplate[value]);
}
}
delete roleTemplate[value];
});
delete roleTemplate.APPEND;
$.extend(true, that.vm_template_json.VMTEMPLATE.TEMPLATE, roleTemplate);
}
var cost = OpenNebulaTemplate.cost(that.vm_template_json);
if (cost != 0 && Config.isFeatureEnabled("showback")) {
total_cost += (cost * role.cardinality);