Arik Hadas has uploaded a new change for review. Change subject: core: cleanup in can-do-action of addVmFromTemplate ......................................................................
core: cleanup in can-do-action of addVmFromTemplate Change-Id: I97adba801d1d6c8949c1560e0c2921d7b7dce1fa Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommand.java 1 file changed, 14 insertions(+), 15 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/57/38457/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommand.java index a6e2e28..e81b34c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommand.java @@ -138,25 +138,24 @@ @Override protected boolean canDoAction() { - boolean retValue = super.canDoAction(); - if (retValue) { - for (DiskImage dit : getVmTemplate().getDiskTemplateMap().values()) { - retValue = - ImagesHandler.checkImageConfiguration(destStorages.get(diskInfoDestinationMap.get(dit.getId()).getStorageIds().get(0)) - .getStorageStaticData(), - diskInfoDestinationMap.get(dit.getId()), - getReturnValue().getCanDoActionMessages()); - if (!retValue) { - break; - } - } + if (!super.canDoAction()) { + return false; + } - if (getParameters().getVm().isUseLatestVersion()) { - return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_CANNOT_USE_LATEST_WITH_CLONE); + for (DiskImage dit : getVmTemplate().getDiskTemplateMap().values()) { + if (!ImagesHandler.checkImageConfiguration(destStorages.get(diskInfoDestinationMap.get(dit.getId()).getStorageIds().get(0)) + .getStorageStaticData(), + diskInfoDestinationMap.get(dit.getId()), + getReturnValue().getCanDoActionMessages())) { + return false; } } - return retValue; + if (getParameters().getVm().isUseLatestVersion()) { + return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_CANNOT_USE_LATEST_WITH_CLONE); + } + + return true; } private Set<GraphicsType> getEntityGraphicsTypes(Guid id) { -- To view, visit https://gerrit.ovirt.org/38457 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I97adba801d1d6c8949c1560e0c2921d7b7dce1fa 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
