[Engine-patches] Change in ovirt-engine[master]: core: PerformImagesChecks no check for no disks

[amureini]

Allon Mureinik has uploaded a new change for review.

Change subject: core: PerformImagesChecks no check for no disks
......................................................................

core: PerformImagesChecks no check for no disks

Removed the check for no image disks from PerfomImagesChecks: creating a
template, creating a snapshot and removing a snapshot should also work
on diskless VMs, however useless it may be.

Move VM has this check explicitly defined in its canDoAction, and is
deprecated, regardless.

After this change, there is no difference between PerformImagesChecks
and checkDiskImages, so the later (which was private) was removed,
and the code inlined into PerformImagesChecks.

Change-Id: Ib4638c8dc5ba6990cdf0b335c76645ee9dedbeee
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java
1 file changed, 2 insertions(+), 21 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/13/14113/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java
index 774471c..d08abe4 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java
@@ -454,36 +454,17 @@
             List<DiskImage> diskImageList) {
 
         boolean returnValue = true;
-        if (diskImageList.size() > 0) {
-            returnValue = checkDiskImages(messages,
-                            storagePoolId,
-                            checkImagesIllegalInVdsm,
-                            checkImagesExist,
-                            diskImageList);
-        } else if (checkImagesExist) {
-            returnValue = false;
-            ListUtils.nullSafeAdd(messages, 
VdcBllMessages.ACTION_TYPE_FAILED_VM_HAS_NO_DISKS.toString());
-        }
-        return returnValue;
-    }
-
-    private static boolean checkDiskImages(List<String> messages,
-            Guid storagePoolId,
-            boolean checkImagesIllegalInVdsm,
-            boolean checkImagesExist,
-            List<DiskImage> images) {
-        boolean returnValue = true;
         ArrayList<DiskImage> irsImages = new ArrayList<DiskImage>();
 
         if (returnValue && checkImagesExist) {
-            boolean isImagesExist = isImagesExists(images, storagePoolId, 
irsImages);
+            boolean isImagesExist = isImagesExists(diskImageList, 
storagePoolId, irsImages);
             if (!isImagesExist) {
                 returnValue = false;
                 ListUtils.nullSafeAdd(messages, 
VdcBllMessages.ACTION_TYPE_FAILED_VM_IMAGE_DOES_NOT_EXIST.toString());
             }
         }
         if (returnValue && checkImagesIllegalInVdsm) {
-            returnValue = checkImagesLegalityInVdsm(messages, images, 
irsImages);
+            returnValue = checkImagesLegalityInVdsm(messages, diskImageList, 
irsImages);
         }
         return returnValue;
     }


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

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