Minor bug fix in UserVmManagerImpl

Author: abh1sar

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

@@ -9096,6 +9096,7 @@ public UserVm allocateVMFromBackup(CreateVMFromBackupCmd cmd) throws Insufficien
             }
         }
 
+        Long size = null;
         Long diskOfferingId = cmd.getDiskOfferingId();
         if (diskOfferingId != null) {
             if (!isIso) {
@@ -9119,6 +9120,7 @@ public UserVm allocateVMFromBackup(CreateVMFromBackupCmd cmd) throws Insufficien
             }
             diskOfferingId = rootDiskOfferingInfo.getDiskOffering().getId();
             updateDetailsWithRootDiskAttributes(cmd.getDetails(), rootDiskOfferingInfo);
+            size = rootDiskOfferingInfo.getSize();
         }
 
         if (!isIso && overrideDiskOfferingId == null) {
@@ -9190,7 +9192,9 @@ public UserVm allocateVMFromBackup(CreateVMFromBackupCmd cmd) throws Insufficien
 
         String name = cmd.getName();
         String displayName = cmd.getDisplayName();
-        Long size = cmd.getSize();
+        if (size == null) {
+            size = cmd.getSize();
+        }
         Map<Long, DiskOffering> dataDiskTemplateToDiskOfferingMap = cmd.getDataDiskTemplateToDiskOfferingMap();
         List<String> sshKeyPairs = new ArrayList<String>();
         String ipAddress = cmd.getIpAddress();

ui/src/components/view/DeployVMFromBackup.vue

@@ -2257,17 +2257,15 @@ export default {
       this.form.startvm = true
       this.selectedZone = this.zoneId
       this.form.zoneid = this.zoneId
+      this.form.clusterid = undefined
+      this.form.podid = undefined
+      this.form.hostid = undefined
       this.form.templateid = undefined
       this.form.isoid = undefined
-
-      if (this.dataPreFill.isIso) {
-        this.tabKey = 'isoid'
-      } else if (this.isoId) {
+      this.tabKey = 'templateid'
+      if (this.isoId) {
         this.tabKey = 'isoid'
-      } else {
-        this.tabKey = 'templateid'
       }
-
       _.each(this.params, (param, name) => {
         if (this.networkId && name === 'networks') {
           param.options = {

ui/src/views/storage/CreateVMFromBackup.vue

@@ -132,6 +132,10 @@ export default {
         type: volume.type,
         diskofferingid: this.diskofferingids[index]
       })).filter(volume => volume.type === 'ROOT')
+      if (this.dataPreFill.isIso) {
+        this.dataPreFill.diskofferingid = rootdisksdetails[0].diskofferingid
+        this.dataPreFill.size = rootdisksdetails[0].size
+      }
       if (this.serviceOffering.diskofferingid === rootdisksdetails[0].diskofferingid || this.dataPreFill.isIso) {
         this.dataPreFill.overridediskoffering = false
       } else {