Allon Mureinik has uploaded a new change for review. Change subject: core: HibernateVmCommand's ConcreteCreateTask ......................................................................
core: HibernateVmCommand's ConcreteCreateTask Removed ConcreteCreateTask from HibernateVmCommand., and used the new getTaskType() mechanism introduced to CommandBase. Change-Id: I813d7a7b8933cdcdedb343322359756b345d3765 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/BackwardCompatibilityTaskCreationTest.java 2 files changed, 14 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/02/7802/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java index 0dd1e13..832a087 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java @@ -9,19 +9,14 @@ import org.ovirt.engine.core.common.action.HibernateVmParameters; import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; -import org.ovirt.engine.core.common.asynctasks.AsyncTaskCreationInfo; -import org.ovirt.engine.core.common.asynctasks.AsyncTaskParameters; import org.ovirt.engine.core.common.asynctasks.AsyncTaskType; -import org.ovirt.engine.core.common.businessentities.AsyncTaskResultEnum; -import org.ovirt.engine.core.common.businessentities.AsyncTaskStatusEnum; -import org.ovirt.engine.core.common.businessentities.Snapshot.SnapshotType; import org.ovirt.engine.core.common.businessentities.DiskImage; +import org.ovirt.engine.core.common.businessentities.Snapshot.SnapshotType; import org.ovirt.engine.core.common.businessentities.StorageDomainType; import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.businessentities.VMStatus; import org.ovirt.engine.core.common.businessentities.VolumeFormat; import org.ovirt.engine.core.common.businessentities.VolumeType; -import org.ovirt.engine.core.common.businessentities.async_tasks; import org.ovirt.engine.core.common.businessentities.storage_domain_static; import org.ovirt.engine.core.common.businessentities.storage_domains; import org.ovirt.engine.core.common.errors.VdcBLLException; @@ -187,12 +182,8 @@ } @Override - protected SPMAsyncTask ConcreteCreateTask(AsyncTaskCreationInfo asyncTaskCreationInfo, VdcActionType parentCommand) { - AsyncTaskParameters p = new AsyncTaskParameters(asyncTaskCreationInfo, new async_tasks(parentCommand, - AsyncTaskResultEnum.success, AsyncTaskStatusEnum.running, asyncTaskCreationInfo.getTaskID(), - getParameters(), asyncTaskCreationInfo.getStepId(), getCommandId())); - p.setEntityId(getParameters().getEntityId()); - return AsyncTaskManager.getInstance().CreateTask(AsyncTaskType.createVolume, p); + protected AsyncTaskType getTaskType() { + return AsyncTaskType.createVolume; } protected HibernateVmParameters getHibernateVmParams() { diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/BackwardCompatibilityTaskCreationTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/BackwardCompatibilityTaskCreationTest.java index 1fc5e63..87c77ca 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/BackwardCompatibilityTaskCreationTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/BackwardCompatibilityTaskCreationTest.java @@ -17,6 +17,7 @@ import org.ovirt.engine.core.common.action.AddImageFromScratchParameters; import org.ovirt.engine.core.common.action.CreateCloneOfTemplateParameters; import org.ovirt.engine.core.common.action.CreateImageTemplateParameters; +import org.ovirt.engine.core.common.action.HibernateVmParameters; import org.ovirt.engine.core.common.action.ImagesActionsParametersBase; import org.ovirt.engine.core.common.action.ImagesContainterParametersBase; import org.ovirt.engine.core.common.action.MoveOrCopyImageGroupParameters; @@ -30,6 +31,7 @@ import org.ovirt.engine.core.common.asynctasks.AsyncTaskType; import org.ovirt.engine.core.common.businessentities.AsyncTaskResultEnum; import org.ovirt.engine.core.common.businessentities.AsyncTaskStatusEnum; +import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.utils.MockConfigRule; @@ -68,6 +70,15 @@ new CreateImageTemplateCommand(new CreateImageTemplateParameters()), new CreateCloneOfTemplateCommand(new CreateCloneOfTemplateParameters()), new RemoveVmCommand(new RemoveVmParameters()), + new HibernateVmCommand(new HibernateVmParameters()) { + @Override + public VM getVm() { + VM vm = new VM(); + vm.setId(Guid.NewGuid()); + vm.setstorage_pool_id(Guid.NewGuid()); + return vm; + } + }, new MoveOrCopyImageGroupCommand(new MoveOrCopyImageGroupParameters()) { @Override protected void initContainerDetails(ImagesContainterParametersBase parameters) { -- To view, visit http://gerrit.ovirt.org/7802 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I813d7a7b8933cdcdedb343322359756b345d3765 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
