Maor Lipchuk has uploaded a new change for review.

Change subject: core: Set json description for new template disk
......................................................................

core: Set json description for new template disk

Set the disk alias and the description also for Template disk

Change-Id: I7747c9119819b9810584151f9b6271afd01761f7
Bug-Url: https://bugzilla.redhat.com/??????
Signed-off-by: Maor Lipchuk <[email protected]>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateImageTemplateCommand.java
1 file changed, 4 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/83/40483/1

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 bd306e4..d533805 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
@@ -54,11 +54,13 @@
         VolumeFormat targetFormat = 
getTargetVolumeFormat(newImage.getVolumeFormat(), newImage.getVolumeType(),
                 getParameters().getDestinationStorageDomainId());
 
+        String diskAlias =
+                getParameters().getDiskAlias() != null ? 
getParameters().getDiskAlias() : getDiskImage().getDiskAlias();
         VDSReturnValue vdsReturnValue = runVdsCommand(VDSCommandType.CopyImage,
                 PostZeroHandler.fixParametersWithPostZero(
                         new CopyImageVDSCommandParameters(storagePoolId, 
getParameters().getStorageDomainId(),
                                 getParameters().getVmId(), imageGroupId, 
snapshotId, destinationImageGroupID,
-                                getDestinationImageId(), 
StringUtils.defaultString(newImage.getDescription()),
+                                getDestinationImageId(), 
getJsonDiskDescription(diskAlias, 
StringUtils.defaultString(newImage.getDescription())),
                                 
getParameters().getDestinationStorageDomainId(), CopyVolumeType.SharedVol,
                                 targetFormat, newImage.getVolumeType(), 
getDiskImage().isWipeAfterDelete(), false)));
 
@@ -71,8 +73,7 @@
                         getParameters().getDestinationStorageDomainId()));
 
         newImage.setId(destinationImageGroupID);
-        newImage.setDiskAlias(getParameters().getDiskAlias() != null ?
-                getParameters().getDiskAlias() : 
getDiskImage().getDiskAlias());
+        newImage.setDiskAlias(diskAlias);
         newImage.setDiskDescription(getParameters().getDescription() != null ?
                 getParameters().getDescription() : 
getDiskImage().getDiskDescription());
         newImage.setVmSnapshotId(getParameters().getVmSnapshotId());


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7747c9119819b9810584151f9b6271afd01761f7
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Maor Lipchuk <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to