Tal Nisan has uploaded a new change for review. Change subject: core: Remove image configuration check on disk move/copy ......................................................................
core: Remove image configuration check on disk move/copy Since the destination format type is determined by VDSM, there is no reason to check whether the image to be moved/copied configration is supported by the destination domain Change-Id: Ic774155b0811faf8607f735f19f9b785cf15e610 Signed-off-by: Tal Nisan <tni...@redhat.com> Bug-Url: https://bugzilla.redhat.com/1063996 --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.java 2 files changed, 0 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/45/26945/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java index 676a191..060abd0 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java @@ -84,7 +84,6 @@ && validateDestStorage() && checkTemplateInDestStorageDomain() && validateSpaceRequirements() - && checkImageConfiguration() && checkCanBeMoveInVm() && checkIfNeedToBeOverride(); } @@ -181,12 +180,6 @@ new StorageDomainValidator(getStorageDomainDAO().getForStoragePool(sourceDomainId, getImage().getStoragePoolId())); return validate(validator.isDomainExistAndActive()); - } - - protected boolean checkImageConfiguration() { - return ImagesHandler.checkImageConfiguration(getStorageDomain().getStorageStaticData(), - getImage(), - getReturnValue().getCanDoActionMessages()); } /** diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.java index bf8cfea..efb2b73 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.java @@ -263,9 +263,6 @@ destStorageId, operation))); - // Spy away the image handler method - doReturn(true).when(command).checkImageConfiguration(); - doReturn(mockStorageDomainValidatorWithSpace()).when(command).createStorageDomainValidator(); doReturn(false).when(command).acquireLock(); -- To view, visit http://gerrit.ovirt.org/26945 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic774155b0811faf8607f735f19f9b785cf15e610 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Tal Nisan <tni...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
