Allon Mureinik has uploaded a new change for review. Change subject: core: UpdaveVmDiskCommand: don't shadow members ......................................................................
core: UpdaveVmDiskCommand: don't shadow members Stop shadowing the vmsDiskOrSnapshotPluggedTo member. This is a bad practice that leads to hard-to-find bugs. Change-Id: I9373239dda65c4d498bbafa714575827be9554f7 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, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/41/25841/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 cfdac1d..8758597 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 @@ -135,7 +135,7 @@ if (!vmsDiskOrSnapshotPluggedTo.isEmpty()) { // only virtual drive size can be updated when VMs is running - if (isAtLeastOneVmIsNotDown(vmsDiskOrSnapshotPluggedTo) && shouldUpdatePropertiesOtherThanSizeAndAlias()) { + if (isAtLeastOneVmIsNotDown() && shouldUpdatePropertiesOtherThanSizeAndAlias()) { return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_VM_IS_NOT_DOWN); } @@ -146,7 +146,7 @@ } boolean isDiskInterfaceUpdated = getOldDisk().getDiskInterface() != getNewDisk().getDiskInterface(); - if (isDiskInterfaceUpdated && !validatePciAndIdeLimit(vmsDiskOrSnapshotPluggedTo)) { + if (isDiskInterfaceUpdated && !validatePciAndIdeLimit()) { return false; } } @@ -169,7 +169,7 @@ addCanDoActionMessage(VdcBllMessages.VAR__TYPE__VM_DISK); } - protected boolean validatePciAndIdeLimit(List<VM> vmsDiskPluggedTo) { + protected boolean validatePciAndIdeLimit() { for (VM vm : vmsDiskPluggedTo) { List<VmNic> allVmInterfaces = getVmNicDao().getAllForVm(vm.getId()); List<Disk> allVmDisks = new LinkedList<Disk>(getOtherVmDisks(vm.getId())); @@ -558,7 +558,7 @@ return !vmDeviceForVm.getIsReadOnly().equals(getNewDisk().getReadOnly()); } - private boolean isAtLeastOneVmIsNotDown(List<VM> vmsDiskPluggedTo) { + private boolean isAtLeastOneVmIsNotDown() { for (VM vm : vmsDiskPluggedTo) { if (vm.getStatus() != VMStatus.Down) { return true; 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 f5b74bc..25ebf52 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 @@ -373,7 +373,7 @@ }); initializeCommand(parameters); - doReturn(true).when(command).validatePciAndIdeLimit(any(List.class)); + doReturn(true).when(command).validatePciAndIdeLimit(); when(diskValidator.isReadOnlyPropertyCompatibleWithInterface()).thenReturn(ValidationResult.VALID); when(diskValidator.isDiskInterfaceSupported(any(VM.class))).thenReturn(new ValidationResult(VdcBllMessages.ACTION_TYPE_DISK_INTERFACE_UNSUPPORTED)); -- To view, visit http://gerrit.ovirt.org/25841 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9373239dda65c4d498bbafa714575827be9554f7 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
