Allon Mureinik has uploaded a new change for review. Change subject: core: Allow updating wipeAfterDelete for an UP VM ......................................................................
core: Allow updating wipeAfterDelete for an UP VM The wipeAfterDelete property simply determines how the VM's volumes should be treated when they are deleted, and has no effect on how the VM is run. There is no reason to disallow updating them when the VM is running. Change-Id: I8fcb93ab0e45798745e2e5accc2d851b6df00d6d Bug-Url: http://bugzilla.redhat.com/1103679 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmDiskCommandTest.java 2 files changed, 22 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/88/28588/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java index 3d1a1fd..8564b0f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java @@ -544,7 +544,6 @@ return getOldDisk().isBoot() != getNewDisk().isBoot() || getOldDisk().getDiskInterface() != getNewDisk().getDiskInterface() || getOldDisk().getPropagateErrors() != getNewDisk().getPropagateErrors() || - getOldDisk().isWipeAfterDelete() != getNewDisk().isWipeAfterDelete() || getOldDisk().isShareable() != getNewDisk().isShareable() || getOldDisk().getSgio() != getNewDisk().getSgio() || !StringUtils.equals(getOldDisk().getDiskDescription(), getNewDisk().getDiskDescription()); diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmDiskCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmDiskCommandTest.java index 13acce8..826c155 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmDiskCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmDiskCommandTest.java @@ -311,6 +311,28 @@ } @Test + public void canDoActionUpdateWipeAfterDeleteVmDown() { + canDoActionUpdateWipeAfterDelete(VMStatus.Down); + } + + @Test + public void canDoActionUpdateWipeAfterDeleteVmUp() { + canDoActionUpdateWipeAfterDelete(VMStatus.Up); + } + + private void canDoActionUpdateWipeAfterDelete(VMStatus status) { + DiskImage disk = createDiskImage(); + disk.setReadOnly(false); + when(diskDao.get(diskImageGuid)).thenReturn(disk); + UpdateVmDiskParameters parameters = createParameters(); + parameters.getDiskInfo().setReadOnly(false); + parameters.getDiskInfo().setWipeAfterDelete(true); + initializeCommand(parameters, Arrays.asList(createVm(status))); + + CanDoActionTestUtils.runAndAssertCanDoActionSuccess(command); + } + + @Test public void clearAddressOnInterfaceChange() { final UpdateVmDiskParameters parameters = createParameters(); // update new disk interface so it will be different than the old one -- To view, visit http://gerrit.ovirt.org/28588 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8fcb93ab0e45798745e2e5accc2d851b6df00d6d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
