Allon Mureinik has uploaded a new change for review. Change subject: core: Simplify isStorageFormatCompatibleWithDomain() ......................................................................
core: Simplify isStorageFormatCompatibleWithDomain() Simplified AddStorageDomainCommand.isStorageFormatCompatibleWithDomain() in order to increase readability. Change-Id: I1825105defd4c4aeb3f7ad20395730fb1ba8e990 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java 1 file changed, 4 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/53/30953/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java index cd97158..fc4c3cb 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java @@ -185,17 +185,14 @@ StorageType storageType = getStorageDomain().getStorageType(); StorageDomainType storageDomainFunction = getStorageDomain().getStorageDomainType(); - boolean isBlockStorage = storageType.isBlockDomain(); - boolean isDataStorageDomain = storageDomainFunction == StorageDomainType.Data; - // V2 is applicable only for block data storage domains - if (storageFormat == StorageFormatType.V2 && (!isBlockStorage || !isDataStorageDomain)) { - return false; + if (storageFormat == StorageFormatType.V2) { + return storageDomainFunction.isDataDomain() && storageType.isBlockDomain(); } // V3 is applicable only for data storage domains - if (storageFormat == StorageFormatType.V3 && !isDataStorageDomain) { - return false; + if (storageFormat == StorageFormatType.V3) { + return storageDomainFunction.isDataDomain(); } return true; -- To view, visit http://gerrit.ovirt.org/30953 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1825105defd4c4aeb3f7ad20395730fb1ba8e990 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
