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/1070823 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, 26 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/47/25847/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 8445517..00f1d3b 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 @@ -540,7 +540,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 49bed75..ee6a7fb 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,32 @@ } @Test + public void canDoActionUpdateWipeAfterDeleteVmDown() { + 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(VMStatus.Down))); + + CanDoActionTestUtils.runAndAssertCanDoActionSuccess(command); + } + + @Test + public void canDoActionUpdateWipeAfterDeleteVmUp() { + 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(VMStatus.Up))); + + 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/25847 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8fcb93ab0e45798745e2e5accc2d851b6df00d6d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
