[Engine-patches] Change in ovirt-engine[master]: core: MoveOrCopyImageGroup's ConcreteCreateTask

[amureini]

Allon Mureinik has uploaded a new change for review.

Change subject: core: MoveOrCopyImageGroup's ConcreteCreateTask
......................................................................

core: MoveOrCopyImageGroup's ConcreteCreateTask

Removed ConcreteCreateTask from MoveOrCopyImageGroupCommand,
and used the new getTaskType() mechanism introduced to CommandBase.

Change-Id: I2a281b117b4445ac84831f4dc0db87a217a0ab9d
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyImageGroupCommand.java
M 
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/BackwardCompatibilityTaskCreationTest.java
2 files changed, 12 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/96/7796/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyImageGroupCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyImageGroupCommand.java
index 48eaba4..2d8f8cc 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyImageGroupCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyImageGroupCommand.java
@@ -9,13 +9,9 @@
 import org.ovirt.engine.core.common.action.VdcActionType;
 import org.ovirt.engine.core.common.action.VdcReturnValueBase;
 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.DiskImage;
 import org.ovirt.engine.core.common.businessentities.ImageOperation;
-import org.ovirt.engine.core.common.businessentities.async_tasks;
 import org.ovirt.engine.core.common.businessentities.image_storage_domain_map;
 import 
org.ovirt.engine.core.common.businessentities.image_storage_domain_map_id;
 import org.ovirt.engine.core.common.vdscommands.CopyImageVDSCommandParameters;
@@ -158,13 +154,8 @@
     }
 
     @Override
-    protected SPMAsyncTask ConcreteCreateTask(AsyncTaskCreationInfo 
asyncTaskCreationInfo, VdcActionType parentCommand) {
-        VdcActionParametersBase commandParams = 
getParametersForTask(parentCommand, getParameters());
-        AsyncTaskParameters p = new AsyncTaskParameters(asyncTaskCreationInfo, 
new async_tasks(parentCommand,
-                AsyncTaskResultEnum.success, AsyncTaskStatusEnum.running, 
asyncTaskCreationInfo.getTaskID(),
-                commandParams, asyncTaskCreationInfo.getStepId(), 
getCommandId()));
-        p.setEntityId(getParameters().getEntityId());
-        return 
AsyncTaskManager.getInstance().CreateTask(AsyncTaskType.moveImage, p);
+    protected AsyncTaskType getTaskType() {
+        return AsyncTaskType.moveImage;
     }
 
     @Override
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 4742f6d..6bd4316 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
@@ -18,6 +18,8 @@
 import org.ovirt.engine.core.common.action.CreateCloneOfTemplateParameters;
 import org.ovirt.engine.core.common.action.CreateImageTemplateParameters;
 import org.ovirt.engine.core.common.action.ImagesActionsParametersBase;
+import org.ovirt.engine.core.common.action.ImagesContainterParametersBase;
+import org.ovirt.engine.core.common.action.MoveOrCopyImageGroupParameters;
 import org.ovirt.engine.core.common.action.PermissionsOperationsParametes;
 import org.ovirt.engine.core.common.action.VdcActionParametersBase;
 import org.ovirt.engine.core.common.action.VdcActionType;
@@ -54,14 +56,20 @@
             mockConfig(ConfigValues.AsyncTaskStatusCachingTimeInMinutes, 10)
             );
 
-    @SuppressWarnings({ "unchecked", "rawtypes" })
+    @SuppressWarnings({ "unchecked", "rawtypes", "serial" })
     @DataPoints
     public static CommandBase<? extends VdcActionParametersBase>[] data() {
         return new CommandBase<?>[] {
                 new CreateSnapshotCommand(new ImagesActionsParametersBase()),
                 new AddImageFromScratchCommand(new 
AddImageFromScratchParameters()),
                 new CreateImageTemplateCommand(new 
CreateImageTemplateParameters()),
-                new CreateCloneOfTemplateCommand(new 
CreateCloneOfTemplateParameters())
+                new CreateCloneOfTemplateCommand(new 
CreateCloneOfTemplateParameters()),
+                new MoveOrCopyImageGroupCommand(new 
MoveOrCopyImageGroupParameters()) {
+                    @Override
+                    protected void 
initContainerDetails(ImagesContainterParametersBase parameters) {
+                        // No op for test
+                    }
+                }
         };
     }
 


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

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