Amit Aviram has uploaded a new change for review. Change subject: core: Code duplication refactoring. ......................................................................
core: Code duplication refactoring. The check if a disk's interface was updated in VM disk's updating is being called twice at the same scope, thus it is now valuated only once. Change-Id: Ic4ffa5b7a1647f0faade0d515740f02665ff1607 Signed-off-by: Amit Aviram <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/54/37654/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 96ee6eb..739ef87 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 @@ -155,6 +155,7 @@ return false; } + boolean isDiskInterfaceUpdated = getOldDisk().getDiskInterface() != getNewDisk().getDiskInterface(); if (!vmsDiskOrSnapshotPluggedTo.isEmpty()) { // only virtual drive size can be updated when VMs is running if (isAtLeastOneVmIsNotDown(vmsDiskOrSnapshotPluggedTo) && updateParametersRequiringVmDownRequested()) { @@ -167,7 +168,6 @@ return false; } - boolean isDiskInterfaceUpdated = getOldDisk().getDiskInterface() != getNewDisk().getDiskInterface(); if (isDiskInterfaceUpdated && !validatePciAndIdeLimit(vmsDiskOrSnapshotPluggedTo)) { return false; } @@ -180,8 +180,7 @@ return validateCanUpdateShareable() && validateCanUpdateReadOnly(diskValidator) && validateVmPoolProperties() && validate(diskValidator.isVirtIoScsiValid(getVm())) && - (getOldDisk().getDiskInterface() == getNewDisk().getDiskInterface() - || validate(diskValidator.isDiskInterfaceSupported(getVm()))) && + (!isDiskInterfaceUpdated || validate(diskValidator.isDiskInterfaceSupported(getVm()))) && setAndValidateDiskProfiles(); } -- To view, visit http://gerrit.ovirt.org/37654 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic4ffa5b7a1647f0faade0d515740f02665ff1607 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Amit Aviram <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
