Alissa Bonas has uploaded a new change for review. Change subject: core: Extract code to methods in ImagesHandler ......................................................................
core: Extract code to methods in ImagesHandler Extract code to isVMDown and checking for storage pool validity to external methods to make PerformImagesChecks more readable. Change-Id: I363f7bf24ca9b5d408a61ba9159b6e5f2a5c46e0 Signed-off-by: Alissa Bonas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java 1 file changed, 23 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/48/10148/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java index 3bdab2d..26ea634 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java @@ -439,6 +439,22 @@ return result; } + + public static boolean isVmDown(VM vm) { + return vm.getStatus() == VMStatus.Down; + } + + + public static boolean isStoragePoolValid(Guid storagePoolId) { + boolean isValid = true; + storage_pool pool = DbFacade.getInstance().getStoragePoolDao().get(storagePoolId); + if (pool == null || pool.getstatus() != StoragePoolStatus.Up) { + isValid = false; + } + return isValid; + } + + public static boolean PerformImagesChecks(VM vm, List<String> messages, Guid storagePoolId, @@ -452,28 +468,28 @@ boolean checkStorageDomain, boolean checkIsValid, Collection diskImageList) { - boolean returnValue = true;; - if (checkIsValid) { - storage_pool pool = DbFacade.getInstance().getStoragePoolDao().get( - storagePoolId); - if (pool == null || pool.getstatus() != StoragePoolStatus.Up) { + boolean returnValue = true; + + if (checkIsValid && !isStoragePoolValid(storagePoolId)) { returnValue = false; ListUtils.nullSafeAdd(messages, VdcBllMessages.ACTION_TYPE_FAILED_IMAGE_REPOSITORY_NOT_FOUND.toString()); - } } List<DiskImage> images = getImages(vm, diskImageList); if (returnValue && checkImagesLocked) { returnValue = checkImagesLocked(vm, messages, images); } - if (returnValue && checkVmIsDown && vm.getStatus() != VMStatus.Down) { + + if (returnValue && checkVmIsDown && !isVmDown(vm)) { returnValue = false; ListUtils.nullSafeAdd(messages, VdcBllMessages.ACTION_TYPE_FAILED_VM_IS_NOT_DOWN.toString()); } + if (returnValue && checkVmInPreview && isVmInPreview(vm.getId())) { returnValue = false; ListUtils.nullSafeAdd(messages, VdcBllMessages.ACTION_TYPE_FAILED_VM_IN_PREVIEW.toString()); } + if (returnValue && checkIsValid) { if (images.size() > 0) { returnValue = returnValue && -- To view, visit http://gerrit.ovirt.org/10148 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I363f7bf24ca9b5d408a61ba9159b6e5f2a5c46e0 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alissa Bonas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
