[Engine-patches] Change in ovirt-engine[master]: core: VmRunHandler: correct check for disk images

[amureini]

Allon Mureinik has uploaded a new change for review.

Change subject: core: VmRunHandler: correct check for disk images
......................................................................

core: VmRunHandler: correct check for disk images

VmRunHandler has a series of checks on VM images - these checks should
only be performed if the VM has image based disks, not disks in general
(which could be LUN disks).

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


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/47/12247/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmRunHandler.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmRunHandler.java
index d094abd..38f372c 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmRunHandler.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmRunHandler.java
@@ -121,7 +121,8 @@
                         }
                     }
 
-                    if (retValue && vmDisks.size() > 0) {
+                    List<DiskImage> vmImages = 
ImagesHandler.filterImageDisks(vmDisks, true, false);
+                    if (retValue && !vmImages.isEmpty()) {
                         storage_pool sp = 
getStoragePoolDAO().get(vm.getStoragePoolId());
                         ValidationResult spUpResult = new 
StoragePoolValidator(sp).isUp();
                         if (!spUpResult.isValid()) {
@@ -129,7 +130,7 @@
                             retValue = false;
                         }
 
-                        if (retValue && !performImageChecksForRunningVm(vm, 
message, runParams, vmDisks)) {
+                        if (retValue && !performImageChecksForRunningVm(vm, 
message, runParams, vmImages)) {
                             retValue = false;
                         }
 
@@ -249,7 +250,7 @@
      * Check isValid, storageDomain and diskSpace only if VM is not HA VM
      */
     protected boolean performImageChecksForRunningVm
-            (VM vm, List<String> message, RunVmParams runParams, List<Disk> 
vmDisks) {
+            (VM vm, List<String> message, RunVmParams runParams, 
List<DiskImage> vmDisks) {
         return ImagesHandler.PerformImagesChecks(message,
                 vm.getStoragePoolId(), Guid.Empty, !vm.isAutoStartup(),
                 true, false, false,


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib47cf77154a5e46af23a10550884bbd6cdeecb30
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