Arik Hadas has uploaded a new change for review. Change subject: core: cleanup in RemoveVmCommand class ......................................................................
core: cleanup in RemoveVmCommand class - Remove canRemoveVmWithDetachDisks#isSnapshotsPresent field - Extract the parameters construction in removeVmImages method to separate method Change-Id: I4079a58d39c613a55c832c62831e78767580842a Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java 1 file changed, 11 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/08/16708/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java index eadd328..0c4eeb9 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java @@ -207,31 +207,20 @@ return failCanDoAction(VdcBllMessages.VM_CANNOT_REMOVE_WITH_DETACH_DISKS_BASED_ON_TEMPLATE); } - - boolean isSnapshotsPresent = false; for (Disk disk : getVm().getDiskList()) { List<DiskImage> diskImageList = getDiskImageDao().getAllSnapshotsForImageGroup(disk.getId()); if (diskImageList.size() > 1) { - isSnapshotsPresent = true; - break; + return failCanDoAction(VdcBllMessages.VM_CANNOT_REMOVE_WITH_DETACH_DISKS_SNAPSHOTS_EXIST); } - } - - if (isSnapshotsPresent) { - return failCanDoAction(VdcBllMessages.VM_CANNOT_REMOVE_WITH_DETACH_DISKS_SNAPSHOTS_EXIST); } return true; } protected VdcReturnValueBase removeVmImages(List<DiskImage> images) { - RemoveAllVmImagesParameters tempVar = new RemoveAllVmImagesParameters(getVmId(), images); - tempVar.setParentCommand(getActionType()); - tempVar.setEntityInfo(getParameters().getEntityInfo()); - tempVar.setParentParameters(getParameters()); VdcReturnValueBase vdcRetValue = Backend.getInstance().runInternalAction(VdcActionType.RemoveAllVmImages, - tempVar, + buildRemoveAllVmImagesParameters(images), ExecutionHandler.createDefaultContexForTasks(getExecutionContext())); if (vdcRetValue.getSucceeded()) { @@ -239,6 +228,14 @@ } return vdcRetValue; + } + + private RemoveAllVmImagesParameters buildRemoveAllVmImagesParameters(List<DiskImage> images) { + RemoveAllVmImagesParameters params = new RemoveAllVmImagesParameters(getVmId(), images); + params.setParentCommand(getActionType()); + params.setEntityInfo(getParameters().getEntityInfo()); + params.setParentParameters(getParameters()); + return params; } @Override @@ -295,7 +292,7 @@ @Override public List<QuotaConsumptionParameter> getQuotaStorageConsumptionParameters() { - List<QuotaConsumptionParameter> list = new ArrayList<QuotaConsumptionParameter>(); + List<QuotaConsumptionParameter> list = new ArrayList<>(); for (DiskImage disk : getVm().getDiskList()){ if (disk.getQuotaId() != null && !Guid.Empty.equals(disk.getQuotaId())) { list.add(new QuotaStorageConsumptionParameter( -- To view, visit http://gerrit.ovirt.org/16708 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4079a58d39c613a55c832c62831e78767580842a 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
