Maor Lipchuk has uploaded a new change for review. Change subject: core: Add message when template does not exists. ......................................................................
core: Add message when template does not exists. If template does not exists when it is being edited we should return a CDA message which implies it. Change-Id: I1232c9bc9ef75610e58a31568f45fb0ea075088c Signed-off-by: Maor Lipchuk <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java 1 file changed, 22 insertions(+), 21 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/47/10847/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java index ab31fa3..16d36e5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java @@ -39,27 +39,28 @@ } boolean returnValue = false; mOldTemplate = DbFacade.getInstance().getVmTemplateDao().get(getVmTemplate().getId()); - if (mOldTemplate != null) { - VmTemplateHandler.UpdateDisksFromDb(mOldTemplate); - if (!StringUtils.equals(mOldTemplate.getname(), getVmTemplate().getname()) - && isVmTemlateWithSameNameExist(getVmTemplateName())) { - addCanDoActionMessage(VdcBllMessages.VMT_CANNOT_CREATE_DUPLICATE_NAME); - } else { - if (getVdsGroup() == null) { - addCanDoActionMessage(VdcBllMessages.VMT_CLUSTER_IS_NOT_VALID); - } else if (VmHandler.isMemorySizeLegal(mOldTemplate.getOs(), - mOldTemplate.getMemSizeMb(), - getReturnValue() - .getCanDoActionMessages(), - getVdsGroup().getcompatibility_version().toString())) { - if (IsVmPriorityValueLegal(getParameters().getVmTemplateData().getPriority(), getReturnValue() - .getCanDoActionMessages()) - && IsDomainLegal(getParameters().getVmTemplateData().getDomain(), getReturnValue() - .getCanDoActionMessages())) { - returnValue = VmTemplateHandler.mUpdateVmTemplate.IsUpdateValid(mOldTemplate, getVmTemplate()); - if (!returnValue) { - addCanDoActionMessage(VdcBllMessages.VMT_CANNOT_UPDATE_ILLEGAL_FIELD); - } + if (mOldTemplate == null) { + return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_TEMPLATE_DOES_NOT_EXIST); + } + VmTemplateHandler.UpdateDisksFromDb(mOldTemplate); + if (!StringUtils.equals(mOldTemplate.getname(), getVmTemplate().getname()) + && isVmTemlateWithSameNameExist(getVmTemplateName())) { + addCanDoActionMessage(VdcBllMessages.VMT_CANNOT_CREATE_DUPLICATE_NAME); + } else { + if (getVdsGroup() == null) { + addCanDoActionMessage(VdcBllMessages.VMT_CLUSTER_IS_NOT_VALID); + } else if (VmHandler.isMemorySizeLegal(mOldTemplate.getOs(), + mOldTemplate.getMemSizeMb(), + getReturnValue() + .getCanDoActionMessages(), + getVdsGroup().getcompatibility_version().toString())) { + if (IsVmPriorityValueLegal(getParameters().getVmTemplateData().getPriority(), getReturnValue() + .getCanDoActionMessages()) + && IsDomainLegal(getParameters().getVmTemplateData().getDomain(), getReturnValue() + .getCanDoActionMessages())) { + returnValue = VmTemplateHandler.mUpdateVmTemplate.IsUpdateValid(mOldTemplate, getVmTemplate()); + if (!returnValue) { + addCanDoActionMessage(VdcBllMessages.VMT_CANNOT_UPDATE_ILLEGAL_FIELD); } } } -- To view, visit http://gerrit.ovirt.org/10847 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1232c9bc9ef75610e58a31568f45fb0ea075088c 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
