Allon Mureinik has uploaded a new change for review. Change subject: core: Remove vmId from PerformImagesChecks ......................................................................
core: Remove vmId from PerformImagesChecks Removed the VM ID from PerformImagesChecks, Since this function is all about validating images, not VMs. In order to achieve this support for passing a null list of disks was dropped, and in the one(!) place it was used (RemoveSnaphotCommand), an explicit DAO call was added. Change-Id: Ia628932ca7767aa9cca4b572523321346828dfa0 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmRunHandler.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddDiskToVmCommandTest.java 14 files changed, 19 insertions(+), 20 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/30/11230/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java index cf975b8..5648e7c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java @@ -141,7 +141,7 @@ if (returnValue && vm != null) { returnValue = isStoragePoolMatching(vm) && - performImagesChecks(vm) && + performImagesChecks(vm.getStoragePoolId()) && validate(getSnapshotValidator().vmNotDuringSnapshot(vm.getId())) && validate(getSnapshotValidator().vmNotInPreview(vm.getId())) && validate(new VmValidator(vm).vmNotLocked()); @@ -199,10 +199,10 @@ getReturnValue().getCanDoActionMessages()); } - protected boolean performImagesChecks(VM vm) { - return ImagesHandler.PerformImagesChecks(vm.getId(), + protected boolean performImagesChecks(Guid spId) { + return ImagesHandler.PerformImagesChecks( getReturnValue().getCanDoActionMessages(), - vm.getStoragePoolId(), + spId, getStorageDomainId().getValue(), false, true, diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java index a4ce48b..2d0a7ac 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java @@ -200,7 +200,7 @@ for (Guid srcStorageDomainId : sourceImageDomainsImageMap.keySet()) { boolean checkIsValid = true; - if (!ImagesHandler.PerformImagesChecks(getVmId(), + if (!ImagesHandler.PerformImagesChecks( getReturnValue().getCanDoActionMessages(), getVm().getStoragePoolId(), srcStorageDomainId, diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java index 69aeb46..6555e9c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java @@ -294,7 +294,7 @@ && validate(vmValidator.vmNotDuringMigration()) && validate(vmValidator.vmNotRunningStateless()) && validate(vmValidator.vmNotIlegal()) - && ImagesHandler.PerformImagesChecks(getVmId(), + && ImagesHandler.PerformImagesChecks( getReturnValue().getCanDoActionMessages(), getVm().getStoragePoolId(), Guid.Empty, diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java index 8661e24..bcd11f5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java @@ -157,7 +157,7 @@ && validate(snapshotValidator.vmNotDuringSnapshot(getVmId())) && validate(snapshotValidator.vmNotInPreview(getVmId())) && validate(new VmValidator(getVm()).vmDown()) - && ImagesHandler.PerformImagesChecks(getVmId(), + && ImagesHandler.PerformImagesChecks( getReturnValue().getCanDoActionMessages(), getVm().getStoragePoolId(), Guid.Empty, diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java index 04133a4..a5b0430 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java @@ -450,7 +450,7 @@ } - public static boolean PerformImagesChecks(Guid vmId, + public static boolean PerformImagesChecks( List<String> messages, Guid storagePoolId, Guid storageDomainId, @@ -469,7 +469,7 @@ ListUtils.nullSafeAdd(messages, VdcBllMessages.ACTION_TYPE_FAILED_IMAGE_REPOSITORY_NOT_FOUND.toString()); } - List<DiskImage> images = getImages(vmId, diskImageList); + List<DiskImage> images = filterImageDisks(diskImageList, true, false); if (returnValue && checkImagesLocked) { returnValue = checkImagesLocked(messages, images); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveVmCommand.java index 9130a10..2145a1e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveVmCommand.java @@ -76,7 +76,7 @@ // CheckTemplateInStorageDomain later VmHandler.updateDisksFromDb(getVm()); List<DiskImage> diskImages = ImagesHandler.filterImageDisks(getVm().getDiskMap().values(), false, false); - retValue = retValue && ImagesHandler.PerformImagesChecks(getVmId(), + retValue = retValue && ImagesHandler.PerformImagesChecks( getReturnValue().getCanDoActionMessages(), getVm().getStoragePoolId(), Guid.Empty, diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java index 6f79079..f663707 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java @@ -229,7 +229,7 @@ for (VM vm : listVms) { if (!validate(snapshotsValidator.vmNotDuringSnapshot(vm.getId())) || !validate(snapshotsValidator.vmNotInPreview(vm.getId())) || - !ImagesHandler.PerformImagesChecks(vm.getId(), + !ImagesHandler.PerformImagesChecks( getReturnValue().getCanDoActionMessages(), vm.getStoragePoolId(), getParameters().getStorageDomainId(), diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java index f507471..2bcf736 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java @@ -211,9 +211,9 @@ // TODO: this is a temporary method used until ImagesHandler.PerformImagesChecks will get decoupeld to several tests // Until then, this method is called and passes hasImages() onwards so the VM validations are done even for diskless VMs protected boolean validateImagesAndVMStates() { - return ImagesHandler.PerformImagesChecks(getVmId(), getReturnValue().getCanDoActionMessages(), + return ImagesHandler.PerformImagesChecks(getReturnValue().getCanDoActionMessages(), getVm().getStoragePoolId(), Guid.Empty, - hasImages(), hasImages(), hasImages(), hasImages(), true, true, null); + hasImages(), hasImages(), hasImages(), hasImages(), true, true, getDiskDao().getAllForVm(getVmId())); } protected boolean validateImageNotInTemplate() { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java index 40f8156..e96ce18 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java @@ -145,7 +145,7 @@ return false; } - if (!ImagesHandler.PerformImagesChecks(getVmId(), + if (!ImagesHandler.PerformImagesChecks( getReturnValue().getCanDoActionMessages(), getVm().getStoragePoolId(), Guid.Empty, diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java index 9204b4d..e7bdbd7 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java @@ -326,8 +326,7 @@ protected boolean performImagesChecks() { return ImagesHandler.PerformImagesChecks - (getVmId(), - getReturnValue().getCanDoActionMessages(), + (getReturnValue().getCanDoActionMessages(), getVm().getStoragePoolId(), Guid.Empty, true, diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java index e580b7e..71b40a5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java @@ -217,7 +217,7 @@ if (vmDisk != null) { result = result - && ImagesHandler.PerformImagesChecks(getVmId(), + && ImagesHandler.PerformImagesChecks( getReturnValue().getCanDoActionMessages(), getVm().getStoragePoolId(), Guid.Empty, diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolCommandBase.java index 1f14019..bd78384 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolCommandBase.java @@ -203,7 +203,7 @@ Guid storageDomainId = vmImages.size() > 0 ? vmImages.get(0).getstorage_ids().get(0) : Guid.Empty; VM vm = DbFacade.getInstance().getVmDao().get(vmId); returnValue = - ImagesHandler.PerformImagesChecks(vmId, + ImagesHandler.PerformImagesChecks( messages, vm.getStoragePoolId(), storageDomainId, diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmRunHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmRunHandler.java index c79ac6a..2757e08 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmRunHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmRunHandler.java @@ -221,7 +221,7 @@ */ protected boolean performImageChecksForRunningVm (VM vm, List<String> message, RunVmParams runParams, List<Disk> vmDisks) { - return ImagesHandler.PerformImagesChecks(vm.getId(), message, + return ImagesHandler.PerformImagesChecks(message, vm.getStoragePoolId(), Guid.Empty, !vm.isAutoStartup(), true, false, false, !vm.isAutoStartup() || !runParams.getIsInternal() && vm.isAutoStartup(), diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddDiskToVmCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddDiskToVmCommandTest.java index cc764b9..e94e2d6 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddDiskToVmCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddDiskToVmCommandTest.java @@ -370,7 +370,7 @@ AuditLogableBaseMockUtils.mockVmDao(command, vmDAO); doNothing().when(command).updateDisksFromDb(); doReturn(true).when(command).checkImageConfiguration(); - doReturn(true).when(command).performImagesChecks(any(VM.class)); + doReturn(true).when(command).performImagesChecks(any(Guid.class)); doReturn(true).when(command).isStorageDomainBelowThresholds(any(storage_domains.class)); doReturn(mockSnapshotValidator()).when(command).getSnapshotValidator(); } -- To view, visit http://gerrit.ovirt.org/11230 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia628932ca7767aa9cca4b572523321346828dfa0 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
