Vered Volansky has uploaded a new change for review. Change subject: core: Removed AddVmFromSnapshot.canLockSnapshot() ......................................................................
core: Removed AddVmFromSnapshot.canLockSnapshot() Removed the method and inlined the check together with the other snapshot validations. Change-Id: Ic0baad35bfaf24ae534676a24a6abc63d7853c23 Signed-off-by: Vered Volansky <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java 2 files changed, 7 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/71/14571/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java index edcd8e5..1319a54 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java @@ -264,7 +264,8 @@ // If snapshot does not exist or is broken, there is not point in checking any of the VM related checks if (!validate(snapshotsValidator.snapshotExists(getSnapshot())) - || !validate(snapshotsValidator.snapshotNotBroken(getSnapshot()))) { + || !validate(snapshotsValidator.snapshotNotBroken(getSnapshot())) + || !validate(snapshotsValidator.vmNotDuringSnapshot(getSnapshot().getVmId()))) { return false; } @@ -293,9 +294,6 @@ return false; } - if (!canLockSnapshot()) { - return false; - } return true; } @@ -308,10 +306,6 @@ result = (VM) queryReturnValue.getReturnValue(); } return result; - } - - protected boolean canLockSnapshot() { - return validate(new SnapshotsValidator().vmNotDuringSnapshot(getSnapshot().getVmId())); } @Override diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java index 4adf184..46c2982 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java @@ -28,19 +28,20 @@ import org.mockito.runners.MockitoJUnitRunner; import org.mockito.stubbing.Answer; import org.ovirt.engine.core.bll.interfaces.BackendInternal; +import org.ovirt.engine.core.bll.snapshots.SnapshotsValidator; import org.ovirt.engine.core.common.action.AddVmFromSnapshotParameters; import org.ovirt.engine.core.common.action.AddVmFromTemplateParameters; import org.ovirt.engine.core.common.action.VmManagementParametersBase; import org.ovirt.engine.core.common.businessentities.DiskImage; import org.ovirt.engine.core.common.businessentities.DiskImageBase; import org.ovirt.engine.core.common.businessentities.Snapshot; +import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.StorageDomainStatus; import org.ovirt.engine.core.common.businessentities.StorageDomainType; import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.businessentities.VmDynamic; import org.ovirt.engine.core.common.businessentities.VmStatic; import org.ovirt.engine.core.common.businessentities.VmTemplate; -import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.interfaces.VDSBrokerFrontend; @@ -207,6 +208,9 @@ setupCanAddVmFromSnapshotTests(domainSizeGB, sizeRequired, sourceSnapshotId); cmd.getVm().setName("vm1"); mockNonInterestingMethodsForCloneVmFromSnapshot(cmd); + SnapshotsValidator sv = spy(new SnapshotsValidator()); + doReturn(ValidationResult.VALID).when(sv).vmNotDuringSnapshot(any(Guid.class)); + doReturn(sv).when(cmd).createSnapshotsValidator(); when(snapshotDao.get(sourceSnapshotId)).thenReturn(new Snapshot()); assertFalse("Clone vm should have failed due to non existing vm configuration", cmd.canDoAction()); reasons = cmd.getReturnValue().getCanDoActionMessages(); -- To view, visit http://gerrit.ovirt.org/14571 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic0baad35bfaf24ae534676a24a6abc63d7853c23 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Vered Volansky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
