Limit the volume size of new instance to minimum of backup volume size

Author: abh1sar

api/src/main/java/org/apache/cloudstack/backup/BackupManager.java

@@ -161,6 +161,8 @@ public interface BackupManager extends BackupService, Configurable, PluggableSer
 
     List<DiskOfferingInfo> getDataDiskOfferingListFromBackup(Backup backup);
 
+    void updateDiskOfferingSizeFromBackup(List<DiskOfferingInfo> dataDiskOfferingsInfo, Backup backup);
+
     Map<String, String> getVmDetailsForBackup(VirtualMachine vm);
 
     Map<String, String> getDiskOfferingDetailsForBackup(Long vmId);

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

@@ -8873,6 +8873,9 @@ public UserVm allocateVMFromBackup(CreateVMFromBackupCmd cmd) throws Insufficien
         }
 
         List<DiskOfferingInfo> dataDiskOfferingsInfo = cmd.getDataDiskOfferingsInfo();
+        if (dataDiskOfferingsInfo != null) {
+            backupManager.updateDiskOfferingSizeFromBackup(dataDiskOfferingsInfo, backup);
+        }
         if (dataDiskOfferingsInfo != null && diskOfferingId != null) {
             new InvalidParameterValueException("Cannot specify both disk offering id and data disk offering details");
         }

server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java

@@ -820,6 +820,16 @@ private Backup.VolumeInfo getVolumeInfo(List<Backup.VolumeInfo> backedUpVolumes,
         return null;
     }
 
+    @Override
+    public void updateDiskOfferingSizeFromBackup(List<DiskOfferingInfo> dataDiskOfferingsInfo, Backup backup) {
+        List<DiskOfferingInfo> dataDiskOfferingsInfoFromBackup = getDataDiskOfferingListFromBackup(backup);
+        int index = 0;
+        for(DiskOfferingInfo diskOfferingInfo : dataDiskOfferingsInfo) {
+            diskOfferingInfo.setSize(Math.max(diskOfferingInfo.getSize(), dataDiskOfferingsInfoFromBackup.get(index).getSize()));
+            index++;
+        }
+    }
+
     @Override
     public List<DiskOfferingInfo> getDataDiskOfferingListFromBackup(Backup backup) {
         List<DiskOfferingInfo> diskOfferingInfoList = new ArrayList<>();
@@ -862,8 +872,7 @@ public List<DiskOfferingInfo> getDataDiskOfferingListFromBackup(Backup backup) {
                 index++;
                 continue;
             }
-            Long size = diskOffering.isCustomized() ? diskSizes.get(index) : diskOffering.getDiskSize();
-            size = size / (1024 * 1024 * 1024);
+            Long size = diskSizes.get(index) / (1024 * 1024 * 1024);
             Long minIops = (diskOffering.isCustomizedIops() != null && diskOffering.isCustomizedIops()) ?
                     minIopsList.get(index) : null;
             Long maxIops = (diskOffering.isCustomizedIops() != null && diskOffering.isCustomizedIops()) ?

ui/src/views/compute/wizard/VolumeDiskOfferingMap.vue

@@ -27,11 +27,10 @@
 
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'name'">
-          <span>{{ record.displaytext || record.name }}</span>
+          <span>{{ record.name }}</span>
         </template>
         <template v-if="column.key === 'offering'">
-          <span
-            v-if="validOfferings[record.id] && validOfferings[record.id].length > 0">
+          <span>
             <a-select
               @change="updateOfferingSelect($event, record.id)"
               :defaultValue="record.diskofferingid"
@@ -40,20 +39,18 @@
               :filterOption="(input, option) => {
                 return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
               }" >
-              <a-select-option v-for="offering in validOfferings[record.id]" :key="offering.id" :label="offering.displaytext">
+              <a-select-option v-for="offering in diskOfferings" :key="offering.id" :label="offering.displaytext">
                 {{ offering.displaytext }}
               </a-select-option>
             </a-select>
           </span>
-          <span v-else style="width: 50%">
-            {{ $t('label.no.matching.offering') }}
-          </span>
         </template>
         <template v-if="column.key === 'size'">
           <span
             v-if="custom[record.id]">
             <a-input-number
               :defaultValue="record.size"
+              :min="items[record.id].size"
               @change="updateCustomDiskSize($event, record.id)"
             />
           </span>
@@ -136,7 +133,6 @@ export default {
       ],
       loading: false,
       diskOfferings: [],
-      validOfferings: {},
       tablerows: {},
       selectedCustomDiskOffering: null,
       values: {
@@ -151,7 +147,7 @@ export default {
   computed: {
     tableSource () {
       return this.tablerows.map(row => {
-        var disk = { ...row, disabled: this.validOfferings[row.id] && this.validOfferings[row.id].length === 0 }
+        var disk = { ...row, disabled: this.diskofferings && this.diskOfferings.length === 0 }
         var item = this.items.find(item => item.id === row.id)
         disk.name = `${item.name} (${item.size} GB)`
         return disk
@@ -190,10 +186,6 @@ export default {
     },
     orderDiskOfferings () {
       this.loading = true
-      this.validOfferings = {}
-      for (const item of this.items) {
-        this.validOfferings[item.id] = this.diskOfferings.filter(x => x.disksize >= item.size || (x.iscustomized))
-      }
       this.items.map(x => {
         this.custom[x.id] = this.diskOfferings.find(offering => offering.id === x.diskofferingid)?.iscustomized
         this.customIops[x.id] = this.diskOfferings.find(offering => offering.id === x.diskofferingid)?.iscustomizediops || false
@@ -233,11 +225,10 @@ export default {
       this.values[diskId].offering = value
       if (this.diskOfferings.find(x => x.id === value)?.iscustomized) {
         this.values[diskId].size = this.items[diskId].size
-        this.tablerows[diskId].size = this.items[diskId].size
       } else {
-        this.values[diskId].size = this.diskOfferings.find(x => x.id === value)?.disksize
-        this.tablerows[diskId].size = this.diskOfferings.find(x => x.id === value)?.disksize
+        this.values[diskId].size = Math.max(this.diskOfferings.find(x => x.id === value)?.disksize, this.items[diskId].size)
       }
+      this.tablerows[diskId].size = this.values[diskId].size
 
       this.values[diskId].iscustomizediops = this.diskOfferings.find(x => x.id === value)?.iscustomizediops || false
 

ui/src/views/storage/CreateVMFromBackup.vue

@@ -40,7 +40,7 @@
     <div v-else class="form">
       <DeployVMFromBackup
         :preFillContent="dataPreFill"
-        @close-action="closeModal"/>
+        @close-action="closeAction"/>
     </div>
   </div>
 </template>
@@ -82,17 +82,18 @@ export default {
     this.deviceid = (this.resource.vmdetails.deviceids || '').split(',').map(item => item === 'null' ? '' : item)
     const volumes = JSON.parse(this.resource.volumes)
     const disksdetails = volumes.map((volume, index) => ({
-      id: index,
       name: volume.path,
       type: volume.type,
       size: volume.size / (1024 * 1024 * 1024),
       diskofferingid: this.diskofferingids[index],
       miniops: this.miniops[index],
       maxiops: this.maxiops[index],
       deviceid: this.deviceid[index]
+    })).filter(volume => volume.type !== 'ROOT')
+    this.dataPreFill.datadisksdetails = disksdetails.map((disk, index) => ({
+      id: index,
+      ...disk
     }))
-    const datadisksdetails = disksdetails.filter(datadisk => datadisk.type !== 'ROOT')
-    this.dataPreFill.datadisksdetails = datadisksdetails
   },
   methods: {
     setConfigure () {
@@ -101,9 +102,6 @@ export default {
     closeAction () {
       this.$emit('close-action')
     },
-    closeModal () {
-      this.$emit('close-action')
-    },
     handleSubmit (e) {
       console.log('wizard submit')
       e.preventDefault()