[Engine-patches] Change in ovirt-engine[master]: core: auto start handling

[ahadas]

Arik Hadas has uploaded a new change for review.

Change subject: core: auto start handling
......................................................................

core: auto start handling

Longer description using lines' length under 72 chars.

With multiple paragraphs if necessary.

Change-Id: I9db34952306bbd62e93501399ddfcf1548cfc4ed
Signed-off-by: Arik Hadas <aha...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java
1 file changed, 10 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/39/17939/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java
index c924ac1..d47f513 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java
@@ -127,8 +127,9 @@
     /**
      * Check isValid only if VM is not HA VM
      */
-    public ValidationResult validateImagesForRunVm(List<DiskImage> vmDisks) {
-        return new DiskImagesValidator(vmDisks).diskImagesNotLocked();
+    public ValidationResult validateImagesForRunVm(VM vm, List<DiskImage> 
vmDisks) {
+        return !vm.isAutoStartup() ?
+                new DiskImagesValidator(vmDisks).diskImagesNotLocked() : 
ValidationResult.VALID;
     }
 
     public ValidationResult validateIsoPath(VM vm, String diskPath, String 
floppyPath) {
@@ -263,6 +264,11 @@
         return ValidationResult.VALID;
     }
 
+    public ValidationResult validateStoragePoolUp(VM vm, StoragePool 
storagePool) {
+        return !vm.isAutoStartup() ?
+                new StoragePoolValidator(storagePool).isUp() : 
ValidationResult.VALID;
+    }
+
     /**
      * map the VM number of pluggable and snapable disks from their domain.
      * @param vm
@@ -350,7 +356,7 @@
                 !validate(new VmValidator(vm).vmNotLocked(), messages) ||
                 
!validate(getSnapshotValidator().vmNotDuringSnapshot(vm.getId()), messages) ||
                 !validate(validateVmStatusUsingMatrix(vm), messages) ||
-                !validate(new StoragePoolValidator(storagePool).isUp(), 
messages) ||
+                !validate(validateStoragePoolUp(vm, storagePool), messages) ||
                 !validate(validateIsoPath(vm, diskPath, floppyPath), messages) 
 ||
                 !validate(vmDuringInitialization(vm), messages) ||
                 !validate(validateVdsStatus(vm), messages) ||
@@ -361,7 +367,7 @@
         List<DiskImage> images = ImagesHandler.filterImageDisks(vmDisks, true, 
false);
         if (!images.isEmpty() && (
                 !validate(validateStorageDomains(vm, isInternalExecution, 
images), messages) ||
-                !validate(validateImagesForRunVm(images), messages))) {
+                !validate(validateImagesForRunVm(vm, images), messages))) {
             return false;
         }
 


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

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