[Engine-patches] Change in ovirt-engine[master]: core: RunVmCommand.canDoAction clean-up (4)

[gchaplik]

Gilad Chaplik has uploaded a new change for review.

Change subject: core: RunVmCommand.canDoAction clean-up (4)
......................................................................

core: RunVmCommand.canDoAction clean-up (4)

extract vmNotLocked()

Change-Id: Iec2b8e21253feb718b297f0dd12b963b53b2fb88
Signed-off-by: Gilad Chaplik <gchap...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmRunHandler.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java
3 files changed, 11 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/00/13400/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
index 3ed10b9..06a5659 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
@@ -22,6 +22,7 @@
 import org.ovirt.engine.core.bll.utils.PermissionSubject;
 import org.ovirt.engine.core.bll.utils.VmDeviceUtils;
 import org.ovirt.engine.core.bll.validator.RunVmValidator;
+import org.ovirt.engine.core.bll.validator.VmValidator;
 import org.ovirt.engine.core.common.AuditLogType;
 import org.ovirt.engine.core.common.FeatureSupported;
 import org.ovirt.engine.core.common.VdcObjectType;
@@ -685,6 +686,7 @@
                             
validate(getRunVmValidator().validateBootSequence(vm,
                                     getParameters().getBootSequence(),
                                     vmDisks)) &&
+                            validate(getVmValidator(vm).vmNotLocked()) &&
                             canRunVm(vm) &&
                             validateNetworkInterfaces();
             if (!canDoAction) {
@@ -710,6 +712,10 @@
         }
     }
 
+    protected VmValidator getVmValidator(VM vm) {
+        return new VmValidator(vm);
+    }
+
     protected RunVmValidator getRunVmValidator() {
         return runVmValidator;
     }
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 9ccb6e8..01499b8 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
@@ -12,7 +12,6 @@
 import org.ovirt.engine.core.bll.snapshots.SnapshotsValidator;
 import org.ovirt.engine.core.bll.storage.StoragePoolValidator;
 import org.ovirt.engine.core.bll.validator.StorageDomainValidator;
-import org.ovirt.engine.core.bll.validator.VmValidator;
 import org.ovirt.engine.core.common.VdcActionUtils;
 import org.ovirt.engine.core.common.action.RunVmParams;
 import org.ovirt.engine.core.common.action.VdcActionType;
@@ -66,14 +65,6 @@
         boolean retValue = true;
 
         List<Disk> vmDisks = getDiskDao().getAllForVm(vm.getId(), true);
-        if (retValue) {
-            ValidationResult vmNotLockedResult = new 
VmValidator(vm).vmNotLocked();
-            if (!vmNotLockedResult.isValid()) {
-                message.add(vmNotLockedResult.getMessage().name());
-                retValue = false;
-            }
-        }
-
         if (retValue) {
             ValidationResult vmDuringSnapshotResult =
                     snapshotsValidator.vmNotDuringSnapshot(vm.getId());
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 95b9900..79c957a 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
@@ -83,6 +83,11 @@
             messages.add(result.getMessage().toString());
             return false;
         }
+        result = new VmValidator(vm).vmNotLocked();
+        if (!result.isValid()) {
+            messages.add(result.getMessage().toString());
+            return false;
+        }
         return true;
     }
 


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

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