Arik Hadas has uploaded a new change for review. Change subject: core: remove MigrateVmCommand#canMigrateVm ......................................................................
core: remove MigrateVmCommand#canMigrateVm All that MigrateVmCommand#canDoAction was doing was to delegate to canMigrateVm method and canMigrateVm method was not called from anywhere else. Thus, this patch removes the canMigrateVm method and put its body in the canDoAction method instead. InternalMigrateVmCommand is also changed accordingly. Change-Id: If88012b8bdbc7d23ad9350acf207431727e1d51e Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InternalMigrateVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java 2 files changed, 12 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/68/18468/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InternalMigrateVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InternalMigrateVmCommand.java index 11803bf..0fc952f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InternalMigrateVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InternalMigrateVmCommand.java @@ -3,7 +3,6 @@ import org.ovirt.engine.core.common.action.InternalMigrateVmParameters; import org.ovirt.engine.core.common.action.MigrateVmParameters; import org.ovirt.engine.core.common.businessentities.MigrationSupport; -import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.errors.VdcBllMessages; @InternalCommandAttribute @@ -30,10 +29,11 @@ * the internal migration command should fail */ @Override - protected boolean canMigrateVm(VM vm) { - if (vm.getMigrationSupport() == MigrationSupport.MIGRATABLE) { - return super.canMigrateVm(vm); + protected boolean canDoAction() { + if (getVm().getMigrationSupport() != MigrationSupport.MIGRATABLE) { + return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_VM_IS_NON_MIGRTABLE); } - return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_VM_IS_NON_MIGRTABLE); + + return super.canDoAction(); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java index 685f0a2..c004baf 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java @@ -231,16 +231,8 @@ @Override protected boolean canDoAction() { - return canMigrateVm(getVm()); - } + final VM vm = getVm(); - @Override - protected void setActionMessageParameters() { - addCanDoActionMessage(VdcBllMessages.VAR__ACTION__MIGRATE); - addCanDoActionMessage(VdcBllMessages.VAR__TYPE__VM); - } - - protected boolean canMigrateVm(VM vm) { if (vm == null) { return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_VM_NOT_FOUND); } @@ -293,6 +285,12 @@ } @Override + protected void setActionMessageParameters() { + addCanDoActionMessage(VdcBllMessages.VAR__ACTION__MIGRATE); + addCanDoActionMessage(VdcBllMessages.VAR__TYPE__VM); + } + + @Override public void rerun() { // make Vm property to null in order to refresh it from db setVm(null); -- To view, visit http://gerrit.ovirt.org/18468 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If88012b8bdbc7d23ad9350acf207431727e1d51e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
