Amit Aviram has uploaded a new change for review.

Change subject: restapi: Enabling disk's description edit when adding a new 
template.
......................................................................

restapi: Enabling disk's description edit when adding a new template.

Currently when adding a new template the user is able to change the
template's disk's alias.
Editing the disk's description looks natural to edit to the user along
editing the alias, and also seems to be a relevant use case when adding
a new template.
This patch adds the possibility to also edit the disk's description.

Change-Id: Ic68114c072565ad2d0938fc0256448da9bce0910
Signed-off-by: Amit Aviram <[email protected]>
---
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
M 
backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml
3 files changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/90/38290/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 824b134..6d3cb0f 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
@@ -219,6 +219,7 @@
                 .getStorageIds()
                 .get(0));
         
createParams.setDiskAlias(diskInfoDestinationMap.get(diskImage.getId()).getDiskAlias());
+        
createParams.setDescription(diskInfoDestinationMap.get(diskImage.getId()).getDiskDescription());
         createParams.setParentParameters(getParameters());
         createParams.setQuotaId(getQuotaIdForDisk(diskImage));
         
createParams.setDiskProfileId(diskInfoDestinationMap.get(diskImage.getId()).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 90a0d0f..87ce8c1 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
@@ -78,6 +78,8 @@
         newImage.setId(destinationImageGroupID);
         newImage.setDiskAlias(getParameters().getDiskAlias() != null ?
                 getParameters().getDiskAlias() : 
getDiskImage().getDiskAlias());
+        newImage.setDiskDescription(getParameters().getDescription() != null ?
+                getParameters().getDescription() : 
getDiskImage().getDiskDescription());
         newImage.setVmSnapshotId(getParameters().getVmSnapshotId());
         newImage.setQuotaId(getParameters().getQuotaId());
         newImage.setDiskProfileId(getParameters().getDiskProfileId());
diff --git 
a/backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml
 
b/backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml
index 2798685..1d9f032 100644
--- 
a/backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml
+++ 
b/backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml
@@ -4033,7 +4033,7 @@
           template.soundcard_enabled: xs:boolean
           template.custom_emulated_machine: xs:string
           template.custom_cpu_model: xs:string
-          template.vm.disks.disk--COLLECTION: {disk.id: 'xs:string', 
disk.alias: 'xs:string', storage_domains.storage_domain--COLLECTION: 
{storage_domain.id: 'xs:string'}}
+          template.vm.disks.disk--COLLECTION: {disk.id: 'xs:string', 
disk.alias: 'xs:string', disk.description: 'xs:string', 
storage_domains.storage_domain--COLLECTION: {storage_domain.id: 'xs:string'}}
           template.permissions.clone: xs:boolean
           template.version.version_name: xs:string
           template.version.base_template.id: xs:string


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

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

Reply via email to