Arik Hadas has uploaded a new change for review. Change subject: core: minor cleanup in ImportVmTemplate ......................................................................
core: minor cleanup in ImportVmTemplate Extract the parameters construction to separate method in order to make the code more readable. Change-Id: I5ce36a44189b7c48ae4f2b13d7a56ca2e63221d6 Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java 1 file changed, 35 insertions(+), 32 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/77/32377/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java index f299fb7..3e04333 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java @@ -355,40 +355,9 @@ @Override public Void runInTransaction() { for (DiskImage disk : disks) { - Guid originalDiskId = newDiskIdForDisk.get(disk.getId()).getId(); - Guid destinationDomain = imageToDestinationDomainMap.get(originalDiskId); - MoveOrCopyImageGroupParameters tempVar = - new MoveOrCopyImageGroupParameters(containerID, - originalDiskId, - newDiskIdForDisk.get(disk.getId()).getImageId(), - disk.getId(), - disk.getImageId(), - destinationDomain, - getMoveOrCopyImageOperation()); - - tempVar.setParentCommand(getActionType()); - tempVar.setUseCopyCollapse(true); - tempVar.setVolumeType(disk.getVolumeType()); - tempVar.setVolumeFormat(disk.getVolumeFormat()); - tempVar.setCopyVolumeType(CopyVolumeType.SharedVol); - tempVar.setSourceDomainId(getParameters().getSourceDomainId()); - tempVar.setForceOverride(getParameters().getForceOverride()); - tempVar.setImportEntity(true); - tempVar.setEntityInfo(new EntityInfo(VdcObjectType.VmTemplate, containerID)); - tempVar.setRevertDbOperationScope(ImageDbOperationScope.IMAGE); - for (DiskImage diskImage : getParameters().getVmTemplate().getDiskList()) { - if (originalDiskId.equals(diskImage.getId())) { - tempVar.setQuotaId(diskImage.getQuotaId()); - tempVar.setDiskProfileId(diskImage.getDiskProfileId()); - break; - } - } - - MoveOrCopyImageGroupParameters p = tempVar; - p.setParentParameters(getParameters()); VdcReturnValueBase vdcRetValue = runInternalActionWithTasksContext( VdcActionType.CopyImageGroup, - p); + buildMoveOrCopyImageGroupParameters(containerID, disk)); if (!vdcRetValue.getSucceeded()) { throw ((vdcRetValue.getFault() != null) ? new VdcBLLException(vdcRetValue.getFault().getError()) @@ -402,6 +371,40 @@ }); } + private MoveOrCopyImageGroupParameters buildMoveOrCopyImageGroupParameters(Guid containerID, DiskImage disk) { + Guid originalDiskId = newDiskIdForDisk.get(disk.getId()).getId(); + Guid destinationDomainId = imageToDestinationDomainMap.get(originalDiskId); + + MoveOrCopyImageGroupParameters result = + new MoveOrCopyImageGroupParameters(containerID, + originalDiskId, + newDiskIdForDisk.get(disk.getId()).getImageId(), + disk.getId(), + disk.getImageId(), + destinationDomainId, + getMoveOrCopyImageOperation()); + result.setParentCommand(getActionType()); + result.setUseCopyCollapse(true); + result.setVolumeType(disk.getVolumeType()); + result.setVolumeFormat(disk.getVolumeFormat()); + result.setCopyVolumeType(CopyVolumeType.SharedVol); + result.setSourceDomainId(getParameters().getSourceDomainId()); + result.setForceOverride(getParameters().getForceOverride()); + result.setImportEntity(true); + result.setEntityInfo(new EntityInfo(VdcObjectType.VmTemplate, containerID)); + result.setRevertDbOperationScope(ImageDbOperationScope.IMAGE); + for (DiskImage diskImage : getParameters().getVmTemplate().getDiskList()) { + if (originalDiskId.equals(diskImage.getId())) { + result.setQuotaId(diskImage.getQuotaId()); + result.setDiskProfileId(diskImage.getDiskProfileId()); + break; + } + } + result.setParentParameters(getParameters()); + + return result; + } + protected void addVmTemplateToDb() { getVmTemplate().setVdsGroupId(getParameters().getVdsGroupId()); getVmTemplate().setStatus(VmTemplateStatus.Locked); -- To view, visit http://gerrit.ovirt.org/32377 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5ce36a44189b7c48ae4f2b13d7a56ca2e63221d6 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
