smoke test failure + minor fixes

Author: abh1sar

api/src/main/java/com/cloud/vm/UserVmService.java

@@ -416,7 +416,8 @@ UserVm createAdvancedVirtualMachine(DataCenter zone, ServiceOffering serviceOffe
     void deletePrivateTemplateRecord(Long templateId);
 
     HypervisorType getHypervisorTypeOfUserVM(long vmid);
-UserVm createVirtualMachine(DeployVMCmd cmd) throws InsufficientCapacityException, ResourceUnavailableException, ConcurrentOperationException,
+
+    UserVm createVirtualMachine(DeployVMCmd cmd) throws InsufficientCapacityException, ResourceUnavailableException, ConcurrentOperationException,
         StorageUnavailableException, ResourceAllocationException;
 
     /**

engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java

@@ -573,8 +573,8 @@ public void allocate(final String vmInstanceName, final VirtualMachineTemplate t
                         long diskOfferingSize = diskOffering.getDiskSize() / (1024 * 1024 * 1024);
                         VMTemplateVO dataDiskTemplate = _templateDao.findById(dataDiskTemplateToDiskOfferingMap.getKey());
                         volumeMgr.allocateRawVolume(Type.DATADISK, "DATA-" + persistedVm.getId() + "-" + String.valueOf( diskNumber), diskOffering, diskOfferingSize, null, null,
-                                persistedVm, dataDiskTemplate, owner,  diskNumber);
-                         diskNumber++;
+                                persistedVm, dataDiskTemplate, owner, diskNumber);
+                        diskNumber++;
                     }
                 }
             } finally {

server/src/main/java/org/apache/cloudstack/resource/ResourceCleanupServiceImpl.java

@@ -324,20 +324,18 @@ protected Pair<List<Long>, List<Long>> getFilteredVmIdsForSnapshotsAndBackups(Li
             }
             currentSkippedVmIds.addAll(vmIdsWithActiveVolumeSnapshots);
         }
-        if (CollectionUtils.isNotEmpty(currentSkippedVmIds)) {
-            vmIds.removeAll(currentSkippedVmIds);
-        }
 
         List<BackupVO> backups = backupDao.searchByVmIds(vmIds);
-        if (CollectionUtils.isNotEmpty(activeSnapshots)) {
+        if (CollectionUtils.isNotEmpty(backups)) {
             HashSet<Long> vmIdsWithBackups = backups.stream().map(BackupVO::getVmId)
                     .collect(Collectors.toCollection(HashSet::new));
             if (logger.isDebugEnabled()) {
                 logger.debug(String.format("Skipping purging VMs with IDs %s as they have backups",
-                        StringUtils.join(vmIdsWithActiveVolumeSnapshots)));
+                        StringUtils.join(vmIdsWithBackups)));
             }
             currentSkippedVmIds.addAll(vmIdsWithBackups);
         }
+
         if (CollectionUtils.isNotEmpty(currentSkippedVmIds)) {
             vmIds.removeAll(currentSkippedVmIds);
         }

test/integration/smoke/test_attach_multiple_volumes.py

@@ -285,6 +285,8 @@ def test_attach_multiple_volumes(self):
         self.query_async_job(vol3_jobId.jobid)
         self.query_async_job(vol4_jobId.jobid)
 
+        time.sleep(60)
+
         # List all the volumes attached to the instance. Includes even the Root disk.
         list_volume_response = Volume.list(
                                             self.apiClient,
@@ -337,6 +339,8 @@ def test_attach_and_distribute_multiple_volumes(self):
         self.query_async_job(vol5_jobId.jobid)
         self.query_async_job(vol6_jobId.jobid)
 
+        time.sleep(60)
+
         volumes = Volume.list(self.apiClient,
                               virtualmachineid=self.virtual_machine.id,
                               type="DATADISK",