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 #5238: Fix disk resize on instantiate (#2335)

Browse Source
This commit is contained in:
Frederick Borges 2022-11-02 16:12:16 +01:00 committed by GitHub
parent c8da8a2ce5
commit 7e1a81cc4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -190,21 +190,39 @@ define(function(require) {
});
}
function diffValues(newValues, oldValues){
var diff = [];
if(oldValues && newValues){
oldValues = Array.isArray(oldValues)? oldValues: [oldValues];
newValues = Array.isArray(newValues)? newValues: [newValues];
var oldValuesString = oldValues.map(function(internalValue){
return JSON.stringify(internalValue);
});
/**
* Retrieves the diference between two objects
*
* @param {Object} newValues - New object values
* @param {Object} oldValues - Old object values
* @returns {Object} Difference between the two given objects
*/
function diffValues(newValues, oldValues = {}){
var diff = {};
newValues.forEach(function (newValue){
if($.inArray(JSON.stringify(newValue),oldValuesString) === -1){
diff.push(newValue);
}
});
for (const [key, value] of Object.entries(newValues)) {
if (oldValues[key] && oldValues[key] !== value || oldValues[key] === undefined){
diff[key] = value;
}
}
return diff;
}
/**
* Retrieves the diference between two objects arrays
*
* @param {Object[]} newValues - Array with all the new object to be compared
* @param {Object[]} oldValues - Array with all the old object to be compared
* @returns {Object} Difference between the two given objects array
*/
function diffValuesArray(newValues, oldValues = []){
var diff = [];
newValues.forEach(function (value, index){
diff.push(diffValues(value, oldValues[index]))
});
return diff;
}
@ -254,8 +272,7 @@ define(function(require) {
});
var disks = DisksResize.retrieve($(".disksContext" + template_id, context));
var has_changes = diffValues(disks, original_tmpl.TEMPLATE.DISK).length > 0
if (disks.length > 0 && has_changes) {
if (disks.length > 0) {
tmp_json.DISK = disks;
}
@ -379,11 +396,11 @@ define(function(require) {
if (capacityRetrieveValues.hasOwnProperty(key)) {
var diff = diffValues(
{[key]: capacityRetrieveValues[key]},
{[key]:original_tmpl.TEMPLATE[key]}
{[key]: original_tmpl.TEMPLATE[key]}
);
if(diff[0] && typeof diff[0] === "object") {
$.extend(tmp_json, diff[0]);
if(Object.keys(diff).length > 0) {
$.extend(tmp_json, diff);
}
}
}

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

@ -225,13 +225,15 @@ define(function(require){
if ($(this).data("template_disk")) {
disk = $(this).data("template_disk");
var fields = WizardFields.retrieve(this);
if (disk["SIZE"] && fields["SIZE"] && disk["ORIGINAL_SIZE"] === fields["SIZE"] && fields["SIZE"] === disk["SIZE"]){
if (disk["IMAGE_ID"] || disk["IMAGE_NAME"]){
delete disk["SIZE"];
if (disk.IMAGE_ID){
var newDisk = {
IMAGE_ID: disk.IMAGE_ID,
OPENNEBULA_MANAGED: disk.OPENNEBULA_MANAGED
}
delete disk["ORIGINAL_SIZE"];
disks.push(disk);
if (disk.SIZE !== fields.SIZE) {
newDisk["SIZE"] = fields.SIZE
}
disks.push(newDisk)
} else {
var diskAux = $.extend(true, {}, disk);
diskAux["SIZE"] = fields["SIZE"];