Amit Aviram has uploaded a new change for review. Change subject: core: Extracting virtIO-scsi disabling check in CDA ......................................................................
core: Extracting virtIO-scsi disabling check in CDA VirtIO-scsi disabling validation in AddVmFromSnapshotCommand's CDA is extracted to an outer function for Simplification of the code. This enables a significant ease in unit-testing AddVmFromSnapshotCommand's functionality. Change-Id: Ic581f078b071b029444c699f08c7de8e87518723 Bug-Url: https://bugzilla.redhat.com/1215845 Signed-off-by: Amit Aviram <aavi...@redhat.com> --- 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/AddVmFromSnapshotCommandTest.java 2 files changed, 14 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/52/40752/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 6a9fa51..027042d 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 @@ -148,9 +148,7 @@ return false; } - VmValidator vmValidator = createVmValidator(vmFromConfiguration); - if (Boolean.FALSE.equals(getParameters().isVirtioScsiEnabled()) && - !validate(vmValidator.canDisableVirtioScsi(getAdjustedDiskImagesFromConfiguration()))) { + if (!checkCanDisableVirtIoScsi()) { return false; } @@ -161,6 +159,16 @@ return true; } + protected boolean checkCanDisableVirtIoScsi() { + VmValidator vmValidator = createVmValidator(vmFromConfiguration); + if (Boolean.FALSE.equals(getParameters().isVirtioScsiEnabled()) && + !validate(vmValidator.canDisableVirtioScsi(getAdjustedDiskImagesFromConfiguration()))) { + return false; + } else { + return true; + } + } + protected SnapshotsValidator createSnapshotsValidator() { return new SnapshotsValidator(); } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommandTest.java index e440bbc..b6b9fcb 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommandTest.java @@ -102,7 +102,9 @@ VmValidator vmValidator = spy(new VmValidator(vm)); doReturn(vmValidator).when(command).createVmValidator(vm); - CanDoActionTestUtils.runAndAssertCanDoActionFailure(command, + assertFalse(command.checkCanDisableVirtIoScsi()); + CanDoActionTestUtils.assertCanDoActionMessages("Validation should prevent disabling of virtIO-scsi.", + command, VdcBllMessages.CANNOT_DISABLE_VIRTIO_SCSI_PLUGGED_DISKS); } -- To view, visit https://gerrit.ovirt.org/40752 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic581f078b071b029444c699f08c7de8e87518723 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5.3 Gerrit-Owner: Amit Aviram <aavi...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
