Arik Hadas has uploaded a new change for review. Change subject: core: remove addCanDoActionMessage calls to set variable replacements ......................................................................
core: remove addCanDoActionMessage calls to set variable replacements Replace calls to addCanDoActionMessage which set variable replacements in the message with calls to CommandBase#failCanDoAction method that also gets variable replacements - it makes the code shorter and easier to read. Change-Id: Icd48fff9200efab6a2a30c7f03f4aa6b4404ad2f Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java 2 files changed, 8 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/56/18456/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java index 1367c06..fb0f678 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java @@ -119,10 +119,8 @@ if (getParameters().getTemplateMustExists()) { if (!CheckTemplateInStorageDomain(getVm().getStoragePoolId(), getParameters().getStorageDomainId(), getVm().getVmtGuid())) { - addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_TEMPLATE_NOT_FOUND_ON_EXPORT_DOMAIN); - getReturnValue().getCanDoActionMessages().add( + return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_TEMPLATE_NOT_FOUND_ON_EXPORT_DOMAIN, String.format("$TemplateName %1$s", getVm().getVmtName())); - return false; } } @@ -149,8 +147,8 @@ // check destination storage is Export domain if (getStorageDomain().getStorageDomainType() != StorageDomainType.ImportExport) { - addCanDoActionMessage(String.format("$storageDomainName %1$s", getStorageDomainName())); - return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_SPECIFY_DOMAIN_IS_NOT_EXPORT_DOMAIN); + return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_SPECIFY_DOMAIN_IS_NOT_EXPORT_DOMAIN, + String.format("$storageDomainName %1$s", getStorageDomainName())); } // get the snapshot that are going to be exported and have memory diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java index 1808755..8700304 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java @@ -379,10 +379,9 @@ // if collapse true we check that we have the template on source // (backup) domain if (getParameters().getCopyCollapse() && !isTemplateExistsOnExportDomain()) { - addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_IMPORTED_TEMPLATE_IS_MISSING); - addCanDoActionMessage(String.format("$DomainName %1$s", - getStorageDomainStaticDAO().get(getParameters().getSourceDomainId()).getStorageName())); - return false; + return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_IMPORTED_TEMPLATE_IS_MISSING, + String.format("$DomainName %1$s", + getStorageDomainStaticDAO().get(getParameters().getSourceDomainId()).getStorageName())); } if (!validateVdsCluster()) { @@ -462,9 +461,8 @@ protected boolean validateNoDuplicateVm() { VmStatic duplicateVm = getVmStaticDAO().get(getVm().getId()); if (duplicateVm != null) { - addCanDoActionMessage(VdcBllMessages.VM_CANNOT_IMPORT_VM_EXISTS); - addCanDoActionMessage(String.format("$VmName %1$s", duplicateVm.getName())); - return false; + return failCanDoAction(VdcBllMessages.VM_CANNOT_IMPORT_VM_EXISTS, + String.format("$VmName %1$s", duplicateVm.getName())); } return true; } -- To view, visit http://gerrit.ovirt.org/18456 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icd48fff9200efab6a2a30c7f03f4aa6b4404ad2f 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
