Vered Volansky has uploaded a new change for review. Change subject: core: Enhance RO need to update check ......................................................................
core: Enhance RO need to update check RO property's null is interpreted as false in VmDevice and remains null in Disk. This may result in a wrong decision whether to an update is in need or not. This patch addresses this issue. Change-Id: I9bbfc60c3e9bda0133eec9b1db116f8e7bad9d1d Related-To: https://bugzilla.redhat.com/1057721 Signed-off-by: Vered Volansky <[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, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/56/35456/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 b5b1e3e..d5ad91e 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 @@ -593,7 +593,8 @@ } protected boolean updateReadOnlyRequested() { - return !vmDeviceForVm.getIsReadOnly().equals(getNewDisk().getReadOnly()); + Boolean readOnlyNewValue = getNewDisk().getReadOnly(); + return readOnlyNewValue != null && !vmDeviceForVm.getIsReadOnly().equals(readOnlyNewValue); } protected boolean isAtLeastOneVmIsNotDown(List<VM> vmsDiskPluggedTo) { 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 5e84a0a..e856c34 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 @@ -765,7 +765,7 @@ null, true, true, - false, + null, "", null, null, -- To view, visit http://gerrit.ovirt.org/35456 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9bbfc60c3e9bda0133eec9b1db116f8e7bad9d1d 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
