Allon Mureinik has uploaded a new change for review. Change subject: core: UpdateDiskToVm: use isDiskCanBeAddedToVm ......................................................................
core: UpdateDiskToVm: use isDiskCanBeAddedToVm Used AstractDiskCommand's isDiskCanBeAddedToVm(Disk) instead of duplicating the same code. Relates-To: https://bugzilla.redhat.com/854964 Change-Id: I6fef2259e2543fd47880a37dd8434838575db45b Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java 1 file changed, 2 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/97/12897/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 b047262..d088616 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 @@ -124,13 +124,8 @@ // Validate update boot disk. if (newDisk.isBoot()) { VmHandler.updateDisksForVm(getVm(), getOtherVmDisks()); - for (Disk disk : getVm().getDiskMap().values()) { - if (disk.isBoot()) { - addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_DISK_BOOT_IN_USE); - getReturnValue().getCanDoActionMessages().add( - String.format("$DiskName %1$s", disk.getDiskAlias())); - return false; - } + if (!isDiskCanBeAddedToVm(newDisk)) { + return false; } } -- To view, visit http://gerrit.ovirt.org/12897 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6fef2259e2543fd47880a37dd8434838575db45b 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
