[cloudstack-primate] branch master updated: compute: Fixing rootdisk size override in deploy vm form (#542)

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack-primate.git


The following commit(s) were added to refs/heads/master by this push:
     new 398defa  compute: Fixing rootdisk size override in deploy vm form (#542)
398defa is described below

commit 398defa06f0090118023b566766386ca8276b263
Author: davidjumani <dj...@gmail.com>
AuthorDate: Thu Jul 16 10:43:35 2020 +0530

    compute: Fixing rootdisk size override in deploy vm form (#542)
    
    Addresses an issue from #520
---
 src/views/compute/DeployVM.vue                 | 5 +++--
 src/views/compute/wizard/DiskSizeSelection.vue | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/compute/DeployVM.vue b/src/views/compute/DeployVM.vue
index f91cdc4..946ae67 100644
--- a/src/views/compute/DeployVM.vue
+++ b/src/views/compute/DeployVM.vue
@@ -960,7 +960,8 @@ export default {
         })
         const templates = this.options.templates.filter(x => x.id === value)
         if (templates.length > 0) {
-          this.dataPreFill.minrootdisksize = templates[0].size / (1024 * 1024 * 1024) || 0 // bytes to GB
+          var size = templates[0].size / (1024 * 1024 * 1024) || 0 // bytes to GB
+          this.dataPreFill.minrootdisksize = Math.ceil(size)
         }
       } else if (name === 'isoid') {
         this.tabKey = 'isoid'
@@ -1065,7 +1066,7 @@ export default {
         } else {
           deployVmData.templateid = values.isoid
         }
-        if (values.rootdisksize && values.rootdisksize > 0) {
+        if (this.showRootDiskSizeChanger && values.rootdisksize && values.rootdisksize > 0) {
           deployVmData.rootdisksize = values.rootdisksize
         }
         if (values.hypervisor && values.hypervisor.length > 0) {
diff --git a/src/views/compute/wizard/DiskSizeSelection.vue b/src/views/compute/wizard/DiskSizeSelection.vue
index b4f9a77..319cf6e 100644
--- a/src/views/compute/wizard/DiskSizeSelection.vue
+++ b/src/views/compute/wizard/DiskSizeSelection.vue
@@ -53,8 +53,9 @@ export default {
   },
   watch: {
     minDiskSize (newItem) {
-      if (this.inputValue < newItem) {
+      if (newItem && newItem > 0) {
         this.inputValue = newItem
+        this.updateDiskSize(newItem)
       }
     }
   },