From d6cb6d5f6ddead3942f2ff55f5f18720d96fafad Mon Sep 17 00:00:00 2001 From: Darrin Husselmann Date: Fri, 7 Feb 2020 12:16:25 +0200 Subject: [PATCH 1/5] Fixed root volume resize from ui --- ui/scripts/storage.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js index ab9747990ebe..f2e74ecd2154 100644 --- a/ui/scripts/storage.js +++ b/ui/scripts/storage.js @@ -1594,12 +1594,13 @@ array1.push("&maxiops=" + encodeURIComponent(maxIops)); } //if original disk size > new disk size - if ((args.context.volumes[0].type == "ROOT") - && (args.context.volumes[0].size > (newSize * (1024 * 1024 * 1024)))) { - return args.response.error('message.volume.root.shrink.disk.size'); + if (args.context.volumes[0].type == "ROOT"){ + if (args.context.volumes[0].size > (args.data.newsize * (1024 * 1024 * 1024))) { + return args.response.error('message.volume.root.shrink.disk.size'); + } + array1.push("&size="+args.data.newsize); } - $.ajax({ url: createURL("resizeVolume&id=" + args.context.volumes[0].id + array1.join("")), dataType: "json", From d57d20d66c114053fbde34cc9c2a855bc1c257aa Mon Sep 17 00:00:00 2001 From: Darrin Husselmann Date: Mon, 10 Feb 2020 10:41:25 +0200 Subject: [PATCH 2/5] Fixed api error when diskoffering is null --- ui/scripts/storage.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js index f2e74ecd2154..890df46e2a1c 100644 --- a/ui/scripts/storage.js +++ b/ui/scripts/storage.js @@ -1575,13 +1575,13 @@ if (newDiskOffering != null && newDiskOffering.length > 0) { array1.push("&diskofferingid=" + encodeURIComponent(newDiskOffering)); } - if (selectedDiskOfferingObj.iscustomized == true) { + if (selectedDiskOfferingObj != null && selectedDiskOfferingObj.iscustomized == true) { cloudStack.addNewSizeToCommandUrlParameterArrayIfItIsNotNullAndHigherThanZero(array1, args.data.newsize); } var minIops; var maxIops - if (selectedDiskOfferingObj.iscustomizediops == true) { + if (selectedDiskOfferingObj != null && selectedDiskOfferingObj.iscustomizediops == true) { minIops = args.data.minIops; maxIops = args.data.maxIops; } From 5ab126d8a1c5c0c0e7770f3b16cfc6e2d04e9b18 Mon Sep 17 00:00:00 2001 From: Darrin Husselmann Date: Mon, 10 Feb 2020 11:38:18 +0200 Subject: [PATCH 3/5] Review logic change --- ui/scripts/storage.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js index 890df46e2a1c..7b9e08bf8ffc 100644 --- a/ui/scripts/storage.js +++ b/ui/scripts/storage.js @@ -1575,7 +1575,7 @@ if (newDiskOffering != null && newDiskOffering.length > 0) { array1.push("&diskofferingid=" + encodeURIComponent(newDiskOffering)); } - if (selectedDiskOfferingObj != null && selectedDiskOfferingObj.iscustomized == true) { + if (selectedDiskOfferingObj == null || selectedDiskOfferingObj.iscustomized == true) { cloudStack.addNewSizeToCommandUrlParameterArrayIfItIsNotNullAndHigherThanZero(array1, args.data.newsize); } @@ -1593,12 +1593,10 @@ if (maxIops != null && maxIops.length > 0) { array1.push("&maxiops=" + encodeURIComponent(maxIops)); } - //if original disk size > new disk size - if (args.context.volumes[0].type == "ROOT"){ - if (args.context.volumes[0].size > (args.data.newsize * (1024 * 1024 * 1024))) { - return args.response.error('message.volume.root.shrink.disk.size'); - } - array1.push("&size="+args.data.newsize); + //if original disk size > new disk size + if (args.context.volumes[0].type == "ROOT" && + args.context.volumes[0].size > (args.data.newsize * (1024 * 1024 * 1024))) { + return args.response.error('message.volume.root.shrink.disk.size'); } $.ajax({ From e33e79962a6fb312154cc25410f25464b52f0337 Mon Sep 17 00:00:00 2001 From: Darrin Husselmann Date: Tue, 11 Feb 2020 10:20:06 +0200 Subject: [PATCH 4/5] Logic change --- ui/scripts/storage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js index 7b9e08bf8ffc..859f64153c5c 100644 --- a/ui/scripts/storage.js +++ b/ui/scripts/storage.js @@ -1575,7 +1575,7 @@ if (newDiskOffering != null && newDiskOffering.length > 0) { array1.push("&diskofferingid=" + encodeURIComponent(newDiskOffering)); } - if (selectedDiskOfferingObj == null || selectedDiskOfferingObj.iscustomized == true) { + if ((args.context.volumes[0].type == "ROOT" || selectedDiskOfferingObj.iscustomized == true) { cloudStack.addNewSizeToCommandUrlParameterArrayIfItIsNotNullAndHigherThanZero(array1, args.data.newsize); } From 1b133952cf59cc7e4e6a0b34de71304fc79ebb07 Mon Sep 17 00:00:00 2001 From: Darrin Husselmann Date: Tue, 11 Feb 2020 10:30:27 +0200 Subject: [PATCH 5/5] Removed extra bracket --- ui/scripts/storage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js index 859f64153c5c..f790593fc3dd 100644 --- a/ui/scripts/storage.js +++ b/ui/scripts/storage.js @@ -1575,7 +1575,7 @@ if (newDiskOffering != null && newDiskOffering.length > 0) { array1.push("&diskofferingid=" + encodeURIComponent(newDiskOffering)); } - if ((args.context.volumes[0].type == "ROOT" || selectedDiskOfferingObj.iscustomized == true) { + if (args.context.volumes[0].type == "ROOT" || selectedDiskOfferingObj.iscustomized == true) { cloudStack.addNewSizeToCommandUrlParameterArrayIfItIsNotNullAndHigherThanZero(array1, args.data.newsize); }