fix for ingestion volume, nic fail

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

Author: shwstppr

server/src/main/java/org/apache/cloudstack/ingestion/VmIngestionManagerImpl.java

@@ -343,7 +343,11 @@ public UserVmResponse importUnmanagedInstance(ImportUnmanageInstanceCmd cmd) {
                                         null, caller, true, null, owner.getAccountId(), userId,
                                         serviceOffering, diskOffering, null, null, hostName,
                                         cluster.getHypervisorType(), new HashMap<>(), powerState);
-                                if (userVm != null) {
+                            } catch (InsufficientCapacityException ice) {
+                                throw new ServerApiException(ApiErrorCode.INSUFFICIENT_CAPACITY_ERROR, ice.getMessage());
+                            }
+                            if (userVm != null) {
+                                try {
                                     ingestDisk(rootDisk, userVm, diskOffering, Volume.Type.ROOT, String.format("ROOT-%d", userVm.getId()), rootDiskSize, template, owner, null);
                                     Set<String> disks = dataDiskOfferingMap.keySet();
                                     for (String diskId : disks) {
@@ -354,7 +358,11 @@ public UserVmResponse importUnmanagedInstance(ImportUnmanageInstanceCmd cmd) {
                                             }
                                         }
                                     }
+                                } catch (Exception e) {
+                                    throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Failed to import volumes while ingesting vm: %s. %s", instanceName, e.getMessage()));
+                                }
 
+                                try {
                                     Set<String> nics = nicNetworkMap.keySet();
                                     int i = 0;
                                     for (String nicId : nics) {
@@ -367,9 +375,9 @@ public UserVmResponse importUnmanagedInstance(ImportUnmanageInstanceCmd cmd) {
                                         }
                                         i++;
                                     }
+                                } catch (Exception e) {
+                                    throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Failed to import NICs while ingesting vm: %s. %s", instanceName, e.getMessage()));
                                 }
-                            } catch (InsufficientCapacityException ice) {
-                                throw new ServerApiException(ApiErrorCode.INSUFFICIENT_CAPACITY_ERROR, ice.getMessage());
                             }
                             break;
                         }