Vered Volansky has uploaded a new change for review. Change subject: core: Remove old allocation checks from code ......................................................................
core: Remove old allocation checks from code Old Storage allocation verifications are no longer used in the code, and therefor removed from tests and StorageDoaminValidator. Change-Id: Ib3a30522af4d3657362ee55b2c116e096a248f45 Signed-off-by: Vered Volansky <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/StorageDomainValidator.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java 2 files changed, 0 insertions(+), 51 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/01/33801/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/StorageDomainValidator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/StorageDomainValidator.java index 9a2da45..26ed10a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/StorageDomainValidator.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/StorageDomainValidator.java @@ -2,8 +2,6 @@ import java.util.Collection; import java.util.Collections; -import java.util.HashMap; -import java.util.Map; import org.ovirt.engine.core.bll.ValidationResult; import org.ovirt.engine.core.common.businessentities.DiskImage; @@ -65,32 +63,6 @@ private String storageName() { return String.format("$%1$s %2$s", "storageName", storageDomain.getStorageName()); - } - - /** - * @deprecated - * This validation is replaced by hadSpaceForClonedDisks,hadSpaceForClonedDisk, hasSpaceForNewDisks and - * hasSpaceForNewDisk, according to the situation. - */ - @Deprecated - public ValidationResult isDomainHasSpaceForRequest(final long requestedSize) { - return isDomainHasSpaceForRequest(requestedSize, true); - } - - /** - * @deprecated - * This validation is replaced by hadSpaceForClonedDisks,hadSpaceForClonedDisk, hasSpaceForNewDisks and - * hasSpaceForNewDisk, according to the situation. - */ - @Deprecated - public ValidationResult isDomainHasSpaceForRequest(final long requestedSize, final boolean useThresHold) { - long size = useThresHold ? getLowDiskSpaceThreshold() : 0L; - if (storageDomain.getAvailableDiskSize() != null && - storageDomain.getAvailableDiskSize() - requestedSize < size) { - return new ValidationResult(VdcBllMessages.ACTION_TYPE_FAILED_DISK_SPACE_LOW_ON_STORAGE_DOMAIN, - storageName()); - } - return ValidationResult.VALID; } private static Integer getLowDiskSpaceThreshold() { @@ -243,28 +215,6 @@ return new ValidationResult(VdcBllMessages.ACTION_TYPE_FAILED_DISK_SPACE_LOW_ON_STORAGE_DOMAIN, storageName()); - } - - /** - * @deprecated - * This validation is replaced by hadSpaceForClonedDisks,hadSpaceForClonedDisk, hasSpaceForNewDisks and - * hasSpaceForNewDisk, according to the situation. - */ - @Deprecated - public static Map<StorageDomain, Integer> getSpaceRequirementsForStorageDomains(Map<DiskImage, StorageDomain> imageToDomainMap) { - Map<StorageDomain, Integer> map = new HashMap<StorageDomain, Integer>(); - if (!imageToDomainMap.isEmpty()) { - for (Map.Entry<DiskImage, StorageDomain> entry : imageToDomainMap.entrySet()) { - StorageDomain domain = entry.getValue(); - int size = (int) entry.getKey().getActualSize(); - if (map.containsKey(domain)) { - map.put(domain, map.get(domain) + size); - } else { - map.put(domain, size); - } - } - } - return map; } /** diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java index ec27594..069dfda 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java @@ -598,7 +598,6 @@ initDestSDs(cmd); storageDomainValidator = mock(StorageDomainValidator.class); doReturn(ValidationResult.VALID).when(storageDomainValidator).isDomainWithinThresholds(); - doReturn(ValidationResult.VALID).when(storageDomainValidator).isDomainHasSpaceForRequest(any(int.class)); doReturn(storageDomainValidator).when(cmd).createStorageDomainValidator(any(StorageDomain.class)); return cmd; } -- To view, visit http://gerrit.ovirt.org/33801 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib3a30522af4d3657362ee55b2c116e096a248f45 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Vered Volansky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
