Throw exception if diskOffering stored in the backup is not present.

Author: abh1sar

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

@@ -8812,7 +8812,7 @@ public UserVm allocateVMFromBackup(CreateVMFromBackupCmd cmd) throws Insufficien
         } else {
             String serviceOfferingUuid = backup.getDetail(ApiConstants.SERVICE_OFFERING_ID);
             if (serviceOfferingUuid == null) {
-                throw new CloudRuntimeException("Backup doesn't contain service offering uuid. Please specify a valid service offering id while creating instance");
+                throw new CloudRuntimeException("Backup doesn't contain service offering uuid. Please specify a valid service offering id while creating the instance");
             }
             serviceOffering = serviceOfferingDao.findByUuid(serviceOfferingUuid);
             if (serviceOffering == null) {
@@ -8852,7 +8852,7 @@ public UserVm allocateVMFromBackup(CreateVMFromBackupCmd cmd) throws Insufficien
             }
             template = _templateDao.findByUuid(templateUuid);
             if (template == null) {
-                throw new CloudRuntimeException("Unable to find template with the uuid stored in backup. Please specify a valid template id while creating instance");
+                throw new CloudRuntimeException("Unable to find template with the uuid stored in backup. Please specify a valid template id while creating the instance");
             }
         }
 
@@ -8902,7 +8902,7 @@ public UserVm allocateVMFromBackup(CreateVMFromBackupCmd cmd) throws Insufficien
             for (String networkUuid: networkUuids) {
                 Network network = _networkDao.findByUuid(networkUuid);
                 if (network == null) {
-                    throw new CloudRuntimeException("Unable to find network with the uuid " + networkUuid + "stored in backup. Please specify a valid network id while creating instance");
+                    throw new CloudRuntimeException("Unable to find network with the uuid " + networkUuid + "stored in backup. Please specify a valid network id while creating the instance");
                 }
                 Long networkId = network.getId();
                 ipToNetworkMap.put(networkId, null);

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

@@ -835,8 +835,13 @@ public List<DiskOfferingInfo> getDataDiskOfferingListFromBackup(Backup backup) {
         }
 
         diskOfferings = Stream.of(diskOfferingIds.split(","))
-                .map(uuid -> diskOfferingDao.findByUuid(uuid))
-                .collect(Collectors.toList());
+                .map(uuid -> {
+                    DiskOfferingVO diskOffering = diskOfferingDao.findByUuid(uuid);
+                    if (diskOffering == null) {
+                        throw new CloudRuntimeException("Unable to find disk offering with uuid (" + uuid + ") stored in backup. Please specify a valid disk offering id while creating the instance");
+                    }
+                    return diskOffering;
+                }).collect(Collectors.toList());
         diskSizes = Stream.of(backup.getDetail(ApiConstants.DISK_SIZES).split(","))
                 .map(Long::valueOf)
                 .collect(Collectors.toList());