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 #1572: Can't instantiate VM in Cloud view (#1573)

Browse Source
This commit is contained in:
Abel Coronado 2017-12-11 17:08:04 +01:00 committed by Tino Vázquez
parent 8b18be92e3
commit 8065f9efc9
2 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/sunstone/public/app/tabs/provision-tab.js
View File

@ -979,7 +979,6 @@ define(function(require) {
$(".provision_capacity_selector", create_vm_context),
template_json.VMTEMPLATE);
that.original_disks = jQuery.extend(true, {}, template_json.VMTEMPLATE.TEMPLATE.DISK);
var disksContext = $(".provision_disk_selector", create_vm_context);
disksContext.data("template_json", template_json);
@ -1091,29 +1090,13 @@ define(function(require) {
var vm_name = $("#vm_name", context).val();
var nics = NicsSection.retrieve(context);
var odisks = that.original_disks;
if (!Array.isArray(odisks)){
odisks = [odisks];
}
var disks = DisksResize.retrieve($(".provision_disk_selector", context));
$.each(disks, function(dkey, dvalue){
$.each(odisks, function(okey, ovalue){
if (dvalue.DISK_ID == ovalue.DISK_ID && dvalue.IMAGE_ID){
if (dvalue.SIZE != ovalue.SIZE) {
var disk = { IMAGE_ID: dvalue.IMAGE_ID, SIZE: dvalue.SIZE };
} else {
var disk = { IMAGE_ID: dvalue.IMAGE_ID };
}
disks[dkey] = disk;
}
});
});
var extra_info = {
'vm_name' : vm_name,
'template': {
}
}
};
var vmgroup = VMGroupSection.retrieve($(".vmgroupContext"+ template_id));

18
src/sunstone/public/app/utils/disks-resize.js
View File

@ -125,6 +125,7 @@ define(function(require){
'</div>' +
'</div>').appendTo($(".disksContainer", disksContext));
if (disks_base) {
disks_base[disk_id].SIZE = disk.SIZE;
diskContext.data('template_disk', disks_base[disk_id]);
}
@ -222,14 +223,17 @@ define(function(require){
disk = $(this).data("template_disk");
var fields = WizardFields.retrieve(this);
if (fields.SIZE != undefined){
disk['SIZE'] = fields.SIZE;
if (disk["SIZE"] && fields["SIZE"] && disk["SIZE"] === fields["SIZE"]){
delete disk["SIZE"];
disks.push(disk);
}
else if (fields.SIZE != undefined){
var size = $.extend(true, [], fields.SIZE);
var size = size.join("");
var diskAux = $.extend(true, {}, disk);
diskAux["SIZE"] = fields.SIZE;
disks.push(diskAux);
}
}
if (disk) {
disks.push(disk);
}
});