From 4125cd5b5c8e0212c226d9a13716d1478a7ec679 Mon Sep 17 00:00:00 2001
From: Abel Coronado <acoronado@opennebula.systems>
Date: Tue, 23 Oct 2018 09:59:25 +0200
Subject: [PATCH] B #2533: Impossible to instantiate a VM w/ RESTRICTED_ATTR
 DISK/SIZE (#2534)

(cherry picked from commit 21fdee105ab8502bd838aec7c2d92ea3afa6e4cd)
---
 src/sunstone/public/app/utils/disks-resize.js | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/sunstone/public/app/utils/disks-resize.js b/src/sunstone/public/app/utils/disks-resize.js
index 9122ad23e2..09ae93c05d 100644
--- a/src/sunstone/public/app/utils/disks-resize.js
+++ b/src/sunstone/public/app/utils/disks-resize.js
@@ -128,6 +128,7 @@ define(function(require){
           "</div>").appendTo($(".disksContainer", disksContext));
         if (disks_base) {
           disks_base[disk_id].SIZE = disk.SIZE;
+          disks_base[disk_id].ORIGINAL_SIZE = disk.ORIGINAL_SIZE;
           diskContext.data("template_disk", disks_base[disk_id]);
         }
 
@@ -223,14 +224,20 @@ define(function(require){
     $(".diskContainer", context).each(function(){
       if ($(this).data("template_disk")) {
         disk = $(this).data("template_disk");
-
         var fields = WizardFields.retrieve(this);
 
-        var size = $.extend(true, [], fields.SIZE);
-        var size = size.join("");
-        var diskAux = $.extend(true, {}, disk);
-        diskAux["SIZE"] = fields.SIZE;
-        disks.push(diskAux);
+        if (disk["SIZE"] && fields["SIZE"] && disk["ORIGINAL_SIZE"] === fields["SIZE"] && fields["SIZE"] === disk["SIZE"]){
+          if (disk["IMAGE_ID"] || disk["IMAGE_NAME"]){
+            delete disk["SIZE"];
+          }
+          delete disk["ORIGINAL_SIZE"];
+          disks.push(disk);
+        } else {
+          var diskAux = $.extend(true, {}, disk);
+          diskAux["SIZE"] = fields["SIZE"];
+          delete diskAux["ORIGINAL_SIZE"];
+          disks.push(diskAux);
+        }
       }
     });