[Engine-patches] Change in ovirt-engine[master]: core: TrybackToAllSnapshots vmDown validation

[amureini]

Allon Mureinik has uploaded a new change for review.

Change subject: core: TrybackToAllSnapshots vmDown validation
......................................................................

core: TrybackToAllSnapshots vmDown validation

Added an explicit test for VM.isDown in
TrybackToAllSnapshotsOfVmCommand.canDoAction() instead of using
ImagesHandler.PerformImagesChecks to do it.

Note: This patch is part of a series intended to remove the VM status
check from ImagesHandler.

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


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/15/11015/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java
index ec56250..7fea020 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java
@@ -8,6 +8,7 @@
 import org.ovirt.engine.core.bll.job.ExecutionHandler;
 import org.ovirt.engine.core.bll.snapshots.SnapshotsManager;
 import org.ovirt.engine.core.bll.snapshots.SnapshotsValidator;
+import org.ovirt.engine.core.bll.validator.VmValidator;
 import org.ovirt.engine.core.common.AuditLogType;
 import org.ovirt.engine.core.common.VdcObjectType;
 import org.ovirt.engine.core.common.action.ImagesContainterParametersBase;
@@ -206,9 +207,11 @@
 
         Snapshot snapshot = 
getSnapshotDao().get(getParameters().getDstSnapshotId());
         SnapshotsValidator snapshotsValidator = new SnapshotsValidator();
+        VmValidator vmValidator = new VmValidator(getVm());
         result = result && 
validate(snapshotsValidator.vmNotDuringSnapshot(getVmId()))
                 && validate(snapshotsValidator.snapshotExists(snapshot))
-                && validate(snapshotsValidator.snapshotNotBroken(snapshot));
+                && validate(snapshotsValidator.snapshotNotBroken(snapshot))
+                && validate(vmValidator.vmDown());
 
         if (vmDisk != null) {
             result =
@@ -222,7 +225,7 @@
                                     false,
                                     false,
                                     true,
-                                    true,
+                                    false,
                                     true, true, getVm().getDiskMap().values());
         }
         if (result && LinqUtils.foreach(diskImages, new Function<DiskImage, 
Guid>() {


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

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