Liron Ar has uploaded a new change for review. Change subject: core: RegisterDiskCommand - fix and refactor CDA ......................................................................
core: RegisterDiskCommand - fix and refactor CDA The canDoAction() method of RegisterDiskCommand had bug when checking the the storage domain type, even though CDA message was added - true was returned. furthermore, as false is returned when a check fails, there's no need for else-ifs. Change-Id: Ie96fae8717053435eb1df62217ea3c1469c4768c Signed-off-by: Liron Aravot <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterDiskCommand.java 1 file changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/10/15210/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterDiskCommand.java index 5f2e454..1ca049b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterDiskCommand.java @@ -37,16 +37,22 @@ addCanDoActionMessage("$storageType " + getParameters().getDiskImage().getDiskStorageType()); addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_UNSUPPORTED_DISK_STORAGE_TYPE); return false; - } else if (!validate(new StorageDomainValidator(getStorageDomain()).isDomainExistAndActive())) { + } + + if (!validate(new StorageDomainValidator(getStorageDomain()).isDomainExistAndActive())) { addCanDoActionMessage("$diskId " + getParameters().getDiskImage().getId()); addCanDoActionMessage("$domainId " + getStorageDomainId()); addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_DOMAIN_UNAVAILABLE); return false; - } else if (getStorageDomain().getStorageDomainType() != StorageDomainType.Data) { + } + + if (getStorageDomain().getStorageDomainType() != StorageDomainType.Data) { addCanDoActionMessage("$domainId " + getParameters().getStorageDomainId()); addCanDoActionMessage("$domainType " + getStorageDomain().getStorageDomainType()); addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_DOMAIN_TYPE_UNSUPPORTED); + return false; } + return true; } -- To view, visit http://gerrit.ovirt.org/15210 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie96fae8717053435eb1df62217ea3c1469c4768c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Liron Ar <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
