[Engine-patches] Change in ovirt-engine[master]: core: extract method to imagesUtils

[mlipchuk]

Maor Lipchuk has uploaded a new change for review.

Change subject: core: extract method to imagesUtils
......................................................................

core: extract method to imagesUtils

Add new util class for images.
Add a method which returns the activated volume from the image volumes

Change-Id: I15106ed4dca597d5245e266c51eb7a1042c227e9
Signed-off-by: Maor Lipchuk <mlipc...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateImageTemplateCommand.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java
2 files changed, 6 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/53/17153/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateImageTemplateCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateImageTemplateCommand.java
index ac066e8..78674b2 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateImageTemplateCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateImageTemplateCommand.java
@@ -19,6 +19,7 @@
 import org.ovirt.engine.core.common.vdscommands.VDSReturnValue;
 import org.ovirt.engine.core.compat.Guid;
 import org.ovirt.engine.core.dal.dbbroker.DbFacade;
+import org.ovirt.engine.core.utils.ImageUtils;
 
 /**
  * This command responsible to create new Image Template from image.
@@ -48,8 +49,7 @@
         setDestinationImageId(Guid.newGuid());
         getDiskImage().getSnapshots().addAll(
                 
ImagesHandler.getAllImageSnapshots(getDiskImage().getImageId(), 
getDiskImage().getImageTemplateId()));
-
-        
setDiskImage(getDiskImage().getSnapshots().get(getDiskImage().getSnapshots().size()
 - 1));
+        
setDiskImage(ImageUtils.getActiveVolumeDisk(getDiskImage().getSnapshots()));
         DiskImage newImage = cloneDiskImage(getDestinationImageId());
         fillVolumeInformation(newImage);
 
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 636dc3c..9ac6e8f 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
@@ -80,6 +80,7 @@
 import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector;
 import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBase;
 import org.ovirt.engine.core.utils.GuidUtils;
+import org.ovirt.engine.core.utils.ImageUtils;
 import org.ovirt.engine.core.utils.linq.Function;
 import org.ovirt.engine.core.utils.linq.LinqUtils;
 import org.ovirt.engine.core.utils.linq.Predicate;
@@ -296,7 +297,7 @@
             for (Map.Entry<Guid, List<DiskImage>> entry : images.entrySet()) {
                 Guid id = entry.getKey();
                 List<DiskImage> diskList = entry.getValue();
-                getVm().getDiskMap().put(id, getActiveVolumeDisk(diskList));
+                getVm().getDiskMap().put(id, 
ImageUtils.getActiveVolumeDisk(diskList));
             }
         }
 
@@ -774,7 +775,7 @@
             Guid snapshotId = Guid.newGuid();
             int aliasCounter = 0;
             for (List<DiskImage> diskList : images.values()) {
-                DiskImage disk = getActiveVolumeDisk(diskList);
+                DiskImage disk = ImageUtils.getActiveVolumeDisk(diskList);
                 disk.setParentId(VmTemplateHandler.BlankVmTemplateId);
                 disk.setImageTemplateId(VmTemplateHandler.BlankVmTemplateId);
                 disk.setVmSnapshotId(snapshotId);
@@ -817,7 +818,7 @@
 
             int aliasCounter = 0;
             for (List<DiskImage> diskList : images.values()) {
-                DiskImage disk = getActiveVolumeDisk(diskList);
+                DiskImage disk = ImageUtils.getActiveVolumeDisk(diskList);
                 newDiskIdForDisk.put(disk.getId(), disk);
                 snapshotId = disk.getVmSnapshotId();
                 disk.setActive(true);
@@ -851,10 +852,6 @@
         for (int i = 0; i < diskList.size() - 1; i++) {
              diskList.get(i).setId(disk.getId());
         }
-    }
-
-    private static DiskImage getActiveVolumeDisk(List<DiskImage> diskList) {
-        return diskList.get(diskList.size() - 1);
     }
 
     private void setDiskStorageDomainInfo(DiskImage disk) {


-- 
To view, visit http://gerrit.ovirt.org/17153
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I15106ed4dca597d5245e266c51eb7a1042c227e9
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Maor Lipchuk <mlipc...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches