Arik Hadas has uploaded a new change for review. Change subject: core: minor cleanup ......................................................................
core: minor cleanup Rename GetDiskAlignmentCommand#getDiskType to getDiskStorageType Change-Id: If635aa172517945d940a29a3f0f4f4001ee3bc1c Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDiskAlignmentCommand.java 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/41/39141/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDiskAlignmentCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDiskAlignmentCommand.java index bef445d..633b764 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDiskAlignmentCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDiskAlignmentCommand.java @@ -110,7 +110,7 @@ return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_DISK_IS_NOT_VM_DISK); } - if (getDiskType() == DiskStorageType.IMAGE) { + if (getDiskStorageType() == DiskStorageType.IMAGE) { DiskImagesValidator diskImagesValidator = new DiskImagesValidator(Arrays.asList((DiskImage) getDisk())); if (!validate(diskImagesValidator.diskImagesNotLocked()) || !validate(diskImagesValidator.diskImagesNotIllegal())) { @@ -150,7 +150,7 @@ // Live scan is not supported yet, this might become: getVm().getId() Guid vmId = Guid.Empty; - if (getDiskType() == DiskStorageType.IMAGE) { + if (getDiskStorageType() == DiskStorageType.IMAGE) { DiskImage diskImage = (DiskImage) getDisk(); GetDiskImageAlignmentVDSCommandParameters imageParameters = @@ -162,7 +162,7 @@ imageParameters.setImageId(diskImage.getImageId()); parameters = imageParameters; - } else if (getDiskType() == DiskStorageType.LUN) { + } else if (getDiskStorageType() == DiskStorageType.LUN) { LunDisk lunDisk = (LunDisk) getDisk(); GetDiskLunAlignmentVDSCommandParameters lunParameters = @@ -173,7 +173,7 @@ parameters = lunParameters; } else { throw new VdcBLLException(VdcBllErrors.ENGINE, "Unknown DiskStorageType: " + - getDiskType().toString() + " Disk id: " + getDisk().getId().toString()); + getDiskStorageType().toString() + " Disk id: " + getDisk().getId().toString()); } Boolean isDiskAligned = (Boolean) runVdsCommand( @@ -230,7 +230,7 @@ * lock is not needed since the alignment scan can run without any interference * by a concurrent running VM. */ - return (getDiskType() == DiskStorageType.IMAGE && + return (getDiskStorageType() == DiskStorageType.IMAGE && ((DiskImage) getDisk()).getVolumeFormat() != VolumeFormat.RAW); } @@ -282,7 +282,7 @@ return ""; } - protected DiskStorageType getDiskType() { + protected DiskStorageType getDiskStorageType() { return getDisk().getDiskStorageType(); } -- To view, visit https://gerrit.ovirt.org/39141 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If635aa172517945d940a29a3f0f4f4001ee3bc1c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
