Arik Hadas has uploaded a new change for review.
Change subject: core: change cancel-migration command to be non transactive
......................................................................
core: change cancel-migration command to be non transactive
Change-Id: Icec037c56f4681462cf53ead2dd7224b3621b237
Signed-off-by: Arik Hadas <aha...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CancelMigrateVmCommand.java
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/18/31618/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CancelMigrateVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CancelMigrateVmCommand.java
index 59807ba..5df131b 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CancelMigrateVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CancelMigrateVmCommand.java
@@ -8,6 +8,7 @@
import org.ovirt.engine.core.common.vdscommands.VDSReturnValue;
import org.ovirt.engine.core.vdsbroker.vdsbroker.CancelMigrationVDSParameters;
+@NonTransactiveCommandAttribute
public class CancelMigrateVmCommand<T extends VmOperationParameterBase>
extends VmCommand<T> {
public CancelMigrateVmCommand(T param) {
@@ -33,8 +34,7 @@
@Override
protected boolean canDoAction() {
if (getVm() == null) {
-
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_VM_NOT_EXIST);
- return false;
+ return
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_VM_NOT_EXIST);
}
if (!canRunActionOnNonManagedVm()) {
@@ -42,9 +42,9 @@
}
if (getVm().getStatus() != VMStatus.MigratingFrom) {
-
addCanDoActionMessage(VdcBllMessages.VM_CANNOT_CANCEL_MIGRATION_WHEN_VM_IS_NOT_MIGRATING);
- return false;
+ return
failCanDoAction(VdcBllMessages.VM_CANNOT_CANCEL_MIGRATION_WHEN_VM_IS_NOT_MIGRATING);
}
+
return true;
}
--
To view, visit http://gerrit.ovirt.org/31618
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icec037c56f4681462cf53ead2dd7224b3621b237
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
