Maor Lipchuk has uploaded a new change for review. Change subject: core: Extract method to be with meaningful name. ......................................................................
core: Extract method to be with meaningful name. Use meaningful method name to increase readability of the code in importVmCommand. Change-Id: I610c04760f12c69100814985b201780dfe87c548 Signed-off-by: Maor Lipchuk <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java 1 file changed, 9 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/41/17041/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java index 057ca9c..a365120 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java @@ -276,7 +276,7 @@ for (Map.Entry<Guid, List<DiskImage>> entry : images.entrySet()) { Guid id = entry.getKey(); List<DiskImage> diskList = entry.getValue(); - getVm().getDiskMap().put(id, diskList.get(diskList.size() - 1)); + getVm().getDiskMap().put(id, getActiveVolumeDisk(diskList)); } } @@ -754,13 +754,11 @@ Guid snapshotId = Guid.newGuid(); int aliasCounter = 0; for (List<DiskImage> diskList : images.values()) { - DiskImage disk = diskList.get(diskList.size() - 1); - + DiskImage disk = getActiveVolumeDisk(diskList); disk.setParentId(VmTemplateHandler.BlankVmTemplateId); disk.setImageTemplateId(VmTemplateHandler.BlankVmTemplateId); disk.setVmSnapshotId(snapshotId); disk.setActive(true); - if (getParameters().getVm().getDiskMap() != null && getParameters().getVm().getDiskMap().containsKey(disk.getId())) { DiskImageBase diskImageBase = @@ -770,8 +768,6 @@ } setDiskStorageDomainInfo(disk); - diskGuidList.add(disk.getId()); - imageGuidList.add(disk.getImageId()); if (getParameters().isImportAsNewEntity()) { disk.setId(Guid.newGuid()); disk.setImageId(Guid.newGuid()); @@ -794,6 +790,8 @@ disk.setActive(false); setDiskStorageDomainInfo(disk); + diskGuidList.add(disk.getId()); + imageGuidList.add(disk.getImageId()); saveImage(disk); snapshotId = disk.getVmSnapshotId(); saveSnapshotIfNotExists(snapshotId, disk); @@ -802,7 +800,7 @@ int aliasCounter = 0; for (List<DiskImage> diskList : images.values()) { - DiskImage disk = diskList.get(diskList.size() - 1); + DiskImage disk = getActiveVolumeDisk(diskList); diskGuidList.add(disk.getId()); imageGuidList.add(disk.getImageId()); snapshotId = disk.getVmSnapshotId(); @@ -817,6 +815,10 @@ } } + private static DiskImage getActiveVolumeDisk(List<DiskImage> diskList) { + return diskList.get(diskList.size() - 1); + } + private void setDiskStorageDomainInfo(DiskImage disk) { ArrayList<Guid> storageDomain = new ArrayList<Guid>(); storageDomain.add(imageToDestinationDomainMap.get(disk.getId())); -- To view, visit http://gerrit.ovirt.org/17041 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I610c04760f12c69100814985b201780dfe87c548 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
