Allon Mureinik has uploaded a new change for review. Change subject: core: ImportVm cleanup: saveDiskImageDynamic ......................................................................
core: ImportVm cleanup: saveDiskImageDynamic Extracted the saveDiskImageDynamic(DiskImage) method instead of multiple blocks of the same code. Change-Id: Iba9d746c239e627b0db403fa1e1028a775e0d2ab Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java 1 file changed, 13 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/15/9615/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 3bea4cc..834059d 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 @@ -615,10 +615,7 @@ BaseImagesCommand.saveImage(disk); ImagesHandler.setDiskAlias(disk, getVm()); getBaseDiskDao().save(disk); - DiskImageDynamic diskDynamic = new DiskImageDynamic(); - diskDynamic.setId(disk.getImageId()); - diskDynamic.setactual_size(disk.getactual_size()); - getDiskImageDynamicDAO().save(diskDynamic); + saveDiskImageDynamic(disk); } Snapshot snapshot = new SnapshotsManager().addActiveSnapshot(snapshotId, getVm(), getCompensationContext()); @@ -644,10 +641,7 @@ disk.getappList())); } - DiskImageDynamic diskDynamic = new DiskImageDynamic(); - diskDynamic.setId(disk.getImageId()); - diskDynamic.setactual_size(disk.getactual_size()); - getDiskImageDynamicDAO().save(diskDynamic); + saveDiskImageDynamic(disk); } for (Guid id : images.keySet()) { @@ -673,6 +667,17 @@ } /** + * Generates and saves a {@link DiskImageDynamic} for the given {@link #disk}. + * @param disk The imported disk + **/ + private void saveDiskImageDynamic(DiskImage disk) { + DiskImageDynamic diskDynamic = new DiskImageDynamic(); + diskDynamic.setId(disk.getImageId()); + diskDynamic.setactual_size(disk.getactual_size()); + getDiskImageDynamicDAO().save(diskDynamic); + } + + /** * Go over the snapshots that were read from the export data. If the snapshot exists (since it was added for the * images), it will be updated. If it doesn't exist, it will be saved. */ -- To view, visit http://gerrit.ovirt.org/9615 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iba9d746c239e627b0db403fa1e1028a775e0d2ab Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
