Tal Nisan has uploaded a new change for review. Change subject: core: Fix HotPlugDiskToVm command test ......................................................................
core: Fix HotPlugDiskToVm command test Change-Id: I3b881c2328d8cf10f6d7bd831f426d437d9b749d Signed-off-by: Tal Nisan <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommandTest.java 2 files changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/13/8313/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommand.java index df1caf5..285c18a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommand.java @@ -41,7 +41,7 @@ protected boolean canDoAction() { disk = getDiskDao().get(getParameters().getDiskId()); return isVmExist() && isVmUpOrDown() && isDiskExist(disk) && checkCanPerformPlugUnPlugDisk() - && validate(new SnapshotsValidator().vmNotDuringSnapshot(getVmId())); + && validate(getSnapshotsValidator().vmNotDuringSnapshot(getVmId())); } private boolean checkCanPerformPlugUnPlugDisk() { @@ -112,4 +112,8 @@ public String getDiskAlias() { return disk.getDiskAlias(); } + + protected SnapshotsValidator getSnapshotsValidator() { + return new SnapshotsValidator(); + } } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommandTest.java index 8e8a255..33e6142 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommandTest.java @@ -19,6 +19,7 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; +import org.ovirt.engine.core.bll.snapshots.SnapshotsValidator; import org.ovirt.engine.core.common.action.HotPlugDiskToVmParameters; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.DiskImage; @@ -134,6 +135,9 @@ mockVds(); when(command.getActionType()).thenReturn(getCommandActionType()); doReturn(mock(VmNetworkInterfaceDAO.class)).when(command).getVmNetworkInterfaceDAO(); + SnapshotsValidator snapshotsValidator = mock(SnapshotsValidator.class); + doReturn(snapshotsValidator).when(command).getSnapshotsValidator(); + doReturn(ValidationResult.VALID).when(snapshotsValidator).vmNotDuringSnapshot(any(Guid.class)); } protected HotPlugDiskToVmCommand<HotPlugDiskToVmParameters> createCommand() { -- To view, visit http://gerrit.ovirt.org/8313 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3b881c2328d8cf10f6d7bd831f426d437d9b749d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tal Nisan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
