Maor Lipchuk has uploaded a new change for review. Change subject: core: Rename wrong method name. ......................................................................
core: Rename wrong method name. Method which checked if there is enough space in the storage was called as if it was checking whether there is not enough storage space. Change-Id: Ifa8bf68d35181fde5f2a5ef813d65b3653505411 Related-to: https://bugzilla.redhat.com/856201 Signed-off-by: Maor Lipchuk <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/command/utils/StorageDomainSpaceChecker.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/command/utils/StorageDomainSpaceCheckerTest.java 8 files changed, 25 insertions(+), 25 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/06/11406/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java index 5648e7c..88f6d47 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java @@ -237,7 +237,7 @@ } protected boolean isStorageDomainBelowThresholds(storage_domains storageDomain) { - return StorageDomainSpaceChecker.isBelowThresholds(storageDomain); + return StorageDomainSpaceChecker.isAboveThresholds(storageDomain); } /** @return The disk from the parameters, cast to a {@link DiskImage} */ diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java index ce02097..4116c9c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java @@ -173,7 +173,7 @@ returnValue = false; } else { for (storage_domains domain : destStorages) { - if (!StorageDomainSpaceChecker.isBelowThresholds(domain)) { + if (!StorageDomainSpaceChecker.isAboveThresholds(domain)) { returnValue = false; reasons.add(VdcBllMessages.ACTION_TYPE_FAILED_DISK_SPACE_LOW.toString()); break; 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 a5b0430..4b4aba9 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 @@ -82,7 +82,7 @@ StorageDomainValidator validator = new StorageDomainValidator(storageDomain); ArrayList<String> messages = new ArrayList<String>(); if (validator.isDomainExistAndActive(messages) && validator.domainIsValidDestination(messages) - && (notCheckSize || StorageDomainSpaceChecker.isBelowThresholds(storageDomain))) { + && (notCheckSize || StorageDomainSpaceChecker.isAboveThresholds(storageDomain))) { storageDomainsMap.put(storageDomain.getId(), storageDomain); } } @@ -555,7 +555,7 @@ break; } } - if (diskSpaceCheck && returnValue && !StorageDomainSpaceChecker.isBelowThresholds(domain)) { + if (diskSpaceCheck && returnValue && !StorageDomainSpaceChecker.isAboveThresholds(domain)) { returnValue = false; ListUtils.nullSafeAdd(messages, VdcBllMessages.ACTION_TYPE_FAILED_DISK_SPACE_LOW.toString()); break; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java index 5013bc9..e5c1813 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java @@ -148,7 +148,7 @@ */ protected boolean validateSpaceRequirements() { boolean retValue = true; - if (!isStorageDomainSpaceBelowThresholds()) { + if (!isStorageDomainSpaceAboveThresholds()) { retValue = false; addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_DISK_SPACE_LOW_ON_TARGET_STORAGE_DOMAIN); addCanDoActionMessage(String.format("$%1$s %2$s", "storageName", getStorageDomain().getstorage_name())); @@ -164,8 +164,8 @@ return retValue; } - protected boolean isStorageDomainSpaceBelowThresholds() { - return StorageDomainSpaceChecker.isBelowThresholds(getStorageDomain()); + protected boolean isStorageDomainSpaceAboveThresholds() { + return StorageDomainSpaceChecker.isAboveThresholds(getStorageDomain()); } protected List<DiskImage> getAllImageSnapshots() { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/command/utils/StorageDomainSpaceChecker.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/command/utils/StorageDomainSpaceChecker.java index 91c8a23..9e8d364 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/command/utils/StorageDomainSpaceChecker.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/command/utils/StorageDomainSpaceChecker.java @@ -7,20 +7,20 @@ public class StorageDomainSpaceChecker { - public static boolean isBelowThresholds(final storage_domains domain) { - return isBelowSpaceThreshold(domain) && isBelowPctThreshold(domain); + public static boolean isAboveThresholds(final storage_domains domain) { + return isEnoughFreeSpace(domain) && isEnoughFreePct(domain); } - private static boolean isBelowPctThreshold(final storage_domains domain) { + private static boolean isEnoughFreePct(final storage_domains domain) { return domain.getStorageDynamicData().getfreeDiskPercent() > getLowDiskPercentThreshold(); } - private static boolean isBelowSpaceThreshold(final storage_domains domain) { + private static boolean isEnoughFreeSpace(final storage_domains domain) { StorageDomainDynamic dynamic = domain.getStorageDynamicData(); return (dynamic != null - && dynamic.getfreeDiskInGB() > Config - .<Integer> GetValue(ConfigValues.FreeSpaceCriticalLowInGB) && dynamic.getfreeDiskPercent() > Config - .<Integer> GetValue(ConfigValues.FreeSpaceLow)); + && dynamic.getfreeDiskInGB() > Config + .<Integer> GetValue(ConfigValues.FreeSpaceCriticalLowInGB) && dynamic.getfreeDiskPercent() > Config + .<Integer> GetValue(ConfigValues.FreeSpaceLow)); } public static boolean hasSpaceForRequest(final storage_domains domain, final long requestedSize) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java index 94c9d44..6b369c2 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java @@ -290,7 +290,7 @@ Guid storagePoolId = disksList.get(0).getstorage_pool_id().getValue(); storage_domains destDomain = getStorageDomainById(destDomainId, storagePoolId); - if (!StorageDomainSpaceChecker.isBelowThresholds(destDomain)) { + if (!StorageDomainSpaceChecker.isAboveThresholds(destDomain)) { addCanDoActionMessage(String.format("$%1$s %2$s", "storageName", destDomain.getstorage_name())); return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_DISK_SPACE_LOW_ON_TARGET_STORAGE_DOMAIN); } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.java index 0c080ad..78aef78 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.java @@ -207,7 +207,7 @@ operation))); // Spy away the storage domain checker methods - doReturn(true).when(command).isStorageDomainSpaceBelowThresholds(); + doReturn(true).when(command).isStorageDomainSpaceAboveThresholds(); doReturn(true).when(command).doesStorageDomainHaveSpaceForRequest(anyLong()); // Spy away the image handler methods diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/command/utils/StorageDomainSpaceCheckerTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/command/utils/StorageDomainSpaceCheckerTest.java index 73ce89f..376d290 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/command/utils/StorageDomainSpaceCheckerTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/command/utils/StorageDomainSpaceCheckerTest.java @@ -23,7 +23,7 @@ settings.spaceThresholdGB = 5; settings.spaceThresholdPct = 10; storage_domains domain = setupForSpaceTest(settings); - assertTrue(StorageDomainSpaceChecker.isBelowThresholds(domain)); + assertTrue(StorageDomainSpaceChecker.isAboveThresholds(domain)); } @Test @@ -34,7 +34,7 @@ settings.spaceThresholdGB = 5; settings.spaceThresholdPct = 10; storage_domains domain = setupForSpaceTest(settings); - assertFalse(StorageDomainSpaceChecker.isBelowThresholds(domain)); + assertFalse(StorageDomainSpaceChecker.isAboveThresholds(domain)); } @Test @@ -45,7 +45,7 @@ settings.spaceThresholdGB = 5; settings.spaceThresholdPct = 70; storage_domains domain = setupForSpaceTest(settings); - assertFalse(StorageDomainSpaceChecker.isBelowThresholds(domain)); + assertFalse(StorageDomainSpaceChecker.isAboveThresholds(domain)); } @Test @@ -56,7 +56,7 @@ settings.spaceThresholdGB = 5; settings.spaceThresholdPct = 10; storage_domains domain = setupForSpaceTest(settings); - assertFalse(StorageDomainSpaceChecker.isBelowThresholds(domain)); + assertFalse(StorageDomainSpaceChecker.isAboveThresholds(domain)); } @Test @@ -67,7 +67,7 @@ settings.spaceThresholdGB = 1; settings.spaceThresholdPct = 50; storage_domains domain = setupForSpaceTest(settings); - assertFalse(StorageDomainSpaceChecker.isBelowThresholds(domain)); + assertFalse(StorageDomainSpaceChecker.isAboveThresholds(domain)); } @Test @@ -78,7 +78,7 @@ settings.spaceThresholdGB = 5; settings.spaceThresholdPct = 10; storage_domains domain = setupForSpaceTest(settings); - assertFalse(StorageDomainSpaceChecker.isBelowThresholds(domain)); + assertFalse(StorageDomainSpaceChecker.isAboveThresholds(domain)); } @Test @@ -89,7 +89,7 @@ settings.spaceThresholdGB = -5; settings.spaceThresholdPct = 10; storage_domains domain = setupForSpaceTest(settings); - assertTrue(StorageDomainSpaceChecker.isBelowThresholds(domain)); + assertTrue(StorageDomainSpaceChecker.isAboveThresholds(domain)); } @Test @@ -100,7 +100,7 @@ settings.spaceThresholdGB = 5; settings.spaceThresholdPct = -10; storage_domains domain = setupForSpaceTest(settings); - assertTrue(StorageDomainSpaceChecker.isBelowThresholds(domain)); + assertTrue(StorageDomainSpaceChecker.isAboveThresholds(domain)); } @Test @@ -111,7 +111,7 @@ settings.spaceThresholdGB = 5; settings.spaceThresholdPct = 110; storage_domains domain = setupForSpaceTest(settings); - assertFalse(StorageDomainSpaceChecker.isBelowThresholds(domain)); + assertFalse(StorageDomainSpaceChecker.isAboveThresholds(domain)); } public storage_domains setupForSpaceTest(final SpaceTestSettings settings) { -- To view, visit http://gerrit.ovirt.org/11406 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifa8bf68d35181fde5f2a5ef813d65b3653505411 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Maor Lipchuk <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
