[Engine-patches] Change in ovirt-engine[master]: core: change return value of AddDisk

[ahadas]

Arik Hadas has uploaded a new change for review.

Change subject: core: change return value of AddDisk
......................................................................

core: change return value of AddDisk

Currently AddDiskCommand returns only the ID of the created disk.
However, when invoking this command as internal command, it is sometimes
useful to get additional information such as the image (volume) ID.

Thus, the return value of AddDiskCommand is changed: when called as
internal command the created DiskImage instance is returned, otherwise
only the ID of the created disk is returned (as before).

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


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/25/36425/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java
index 5e09652..5a84105 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java
@@ -453,7 +453,7 @@
         if (tmpRetValue.getActionReturnValue() != null) {
             DiskImage diskImage = (DiskImage) 
tmpRetValue.getActionReturnValue();
             addDiskPermissions(diskImage);
-            getReturnValue().setActionReturnValue(diskImage.getId());
+            getReturnValue().setActionReturnValue(isExecutedAsChildCommand() ? 
diskImage : diskImage.getId());
         }
         getReturnValue().setFault(tmpRetValue.getFault());
         setSucceeded(tmpRetValue.getSucceeded());
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateOvfVolumeForStorageDomainCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateOvfVolumeForStorageDomainCommand.java
index 639cec5..7c8a4c7 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateOvfVolumeForStorageDomainCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateOvfVolumeForStorageDomainCommand.java
@@ -38,7 +38,6 @@
     }
 
     @Override
-
     protected void executeCommand() {
         AddDiskParameters diskParameters = new AddDiskParameters(null, 
createDisk(getStorageDomainId()));
         diskParameters.setStorageDomainId(getStorageDomainId());
@@ -48,7 +47,8 @@
         
diskParameters.setSkipDomainCheck(getParameters().isSkipDomainChecks());
         VdcReturnValueBase vdcReturnValueBase =
                 runInternalActionWithTasksContext(VdcActionType.AddDisk, 
diskParameters);
-        Guid createdId = (Guid)vdcReturnValueBase.getActionReturnValue();
+        DiskImage diskImage = vdcReturnValueBase.getActionReturnValue();
+        Guid createdId = diskImage.getId();
 
         if (createdId != null) {
             addStorageDomainOvfInfoToDb(createdId);


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

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