Arik Hadas has uploaded a new change for review. Change subject: core: minor refactoring in RemoveVmTemplateCommand ......................................................................
core: minor refactoring in RemoveVmTemplateCommand Change-Id: Ice8da0435109c0c0d605041cd54c3bce43a9655c Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java 1 file changed, 13 insertions(+), 16 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/13/27213/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java index 99841a8..6c09a0f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java @@ -120,9 +120,8 @@ } } if (!problematicDomains.isEmpty()) { - addCanDoActionMessage(VdcBllMessages.VMT_CANNOT_REMOVE_DOMAINS_LIST_MISMATCH); - addCanDoActionMessage(String.format("$domainsList %1$s", StringUtils.join(problematicDomains, ","))); - return false; + return failCanDoAction(VdcBllMessages.VMT_CANNOT_REMOVE_DOMAINS_LIST_MISMATCH, + String.format("$domainsList %1$s", StringUtils.join(problematicDomains, ","))); } getParameters().setRemoveTemplateFromDb(allDomainsList.size() == storageDomainsList.size()); } @@ -164,9 +163,8 @@ } if (!problematicVmNames.isEmpty()) { - addCanDoActionMessage(VdcBllMessages.VMT_CANNOT_REMOVE_DETECTED_DERIVED_VM); - addCanDoActionMessage(String.format("$vmsList %1$s", StringUtils.join(problematicVmNames, ","))); - return false; + return failCanDoAction(VdcBllMessages.VMT_CANNOT_REMOVE_DETECTED_DERIVED_VM, + String.format("$vmsList %1$s", StringUtils.join(problematicVmNames, ","))); } // for base templates, make sure it has no versions that need to be removed first @@ -178,17 +176,16 @@ templateVersionsNames.add(version.getName()); } - addCanDoActionMessage(VdcBllMessages.VMT_CANNOT_REMOVE_BASE_WITH_VERSIONS); - addCanDoActionMessage(String.format("$versionsList %1$s", StringUtils.join(templateVersionsNames, ","))); - return false; + return failCanDoAction(VdcBllMessages.VMT_CANNOT_REMOVE_BASE_WITH_VERSIONS, + String.format("$versionsList %1$s", StringUtils.join(templateVersionsNames, ","))); } } - if (isInstanceType) { - return true; - } else { - return validate(checkNoDisksBasedOnTemplateDisks()); + if (!isInstanceType && !validate(checkNoDisksBasedOnTemplateDisks())) { + return false; } + + return true; } private ValidationResult checkNoDisksBasedOnTemplateDisks() { @@ -227,9 +224,8 @@ protected void executeCommand() { // Set VM to lock status immediately, for reducing race condition. VmTemplateHandler.lockVmTemplateInTransaction(getVmTemplateId(), getCompensationContext()); - // if for some reason template doesn't have images, remove it now and not in end action - final boolean hasImages = imageTemplates.size() > 0; - if (hasImages) { + + if (!imageTemplates.isEmpty()) { TransactionSupport.executeInNewTransaction(new TransactionMethod<Void>() { @Override @@ -242,6 +238,7 @@ } }); } else { + // if for some reason template doesn't have images, remove it now and not in end action HandleEndAction(); } } -- To view, visit http://gerrit.ovirt.org/27213 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ice8da0435109c0c0d605041cd54c3bce43a9655c 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
