[Engine-patches] Change in ovirt-engine[master]: core: configurable parent for create image template

[ahadas]

Arik Hadas has uploaded a new change for review.

Change subject: core: configurable parent for create image template
......................................................................

core: configurable parent for create image template

We used to assume that CreateImageTemplateCommand is called from
AddVmTemplateCommand, so the parent command was hard-coded in
CreateImageTemplateCommand.

This patch modifies CreateImageTemplateCommand such that it will take
the parent command from the parameters instead. This change is needed
for adding commands that extend AddVmTemplateCommand such as add
template from snapshot.

Change-Id: If81b0e84e32674c094a2fbeaf1a2e26f2296a7f3
Signed-off-by: Arik Hadas <aha...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateImageTemplateCommand.java
2 files changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/12/41412/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
index d324f7f..dede690 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
@@ -226,6 +226,7 @@
         
createParams.setDestinationStorageDomainId(imageFromParams.getStorageIds().get(0));
         createParams.setDiskAlias(imageFromParams.getDiskAlias());
         createParams.setDescription(imageFromParams.getDiskDescription());
+        createParams.setParentCommand(getActionType());
         createParams.setParentParameters(getParameters());
         createParams.setQuotaId(getQuotaIdForDisk(diskImage));
         createParams.setDiskProfileId(imageFromParams.getDiskProfileId());
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateImageTemplateCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateImageTemplateCommand.java
index b61d663..566e888 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateImageTemplateCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateImageTemplateCommand.java
@@ -56,7 +56,7 @@
             newImage.setVolumeType(getParameters().getVolumeType());
         }
 
-        Guid taskId = persistAsyncTaskPlaceHolder(VdcActionType.AddVmTemplate);
+        Guid taskId = 
persistAsyncTaskPlaceHolder(getParameters().getParentCommand());
 
         VolumeFormat targetFormat = 
getTargetVolumeFormat(newImage.getVolumeFormat(), newImage.getVolumeType(),
                 getParameters().getDestinationStorageDomainId());
@@ -74,7 +74,7 @@
         getReturnValue().getInternalVdsmTaskIdList().add(
                 createTask(taskId,
                         vdsReturnValue.getCreationInfo(),
-                        VdcActionType.AddVmTemplate,
+                        getParameters().getParentCommand(),
                         VdcObjectType.Storage,
                         getParameters().getStorageDomainId(),
                         getParameters().getDestinationStorageDomainId()));


-- 
To view, visit https://gerrit.ovirt.org/41412
To unsubscribe, visit https://gerrit.ovirt.org/settings

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