Ori Liel has uploaded a new change for review. Change subject: restapi: Attach Disk To VM - Return Disk In Response ......................................................................
restapi: Attach Disk To VM - Return Disk In Response Change-Id: I1a50077886734f73842141262f5c338979dcae5c Signed-off-by: Ori Liel <[email protected]> --- M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResourceTest.java 2 files changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/35/8335/1 diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResource.java index ec060f7..9a2cc30 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResource.java @@ -53,7 +53,7 @@ public Response add(Disk disk) { validateEnums(Disk.class, disk); if (disk.isSetId()) { - return attachDiskToVm(disk); + return Response.fromResponse(attachDiskToVm(disk)).entity(getDeviceSubResource(disk.getId()).get()).build(); }else { return super.add(disk); } diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResourceTest.java index c8ead9c..696f830 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResourceTest.java @@ -1,5 +1,7 @@ package org.ovirt.engine.api.restapi.resource; +import static org.ovirt.engine.api.restapi.resource.AbstractBackendDisksResourceTest.PARENT_ID; + import java.util.LinkedList; import java.util.List; @@ -119,6 +121,11 @@ @Test public void testAttachDisk() throws Exception { setUriInfo(setUpBasicUriExpectations()); + setUpEntityQueryExpectations(VdcQueryType.GetAllDisksByVmId, + GetAllDisksByVmIdParameters.class, + new String[] { "VmId" }, + new Object[] { PARENT_ID }, + getEntityList()); setUpActionExpectations (VdcActionType.AttachDiskToVm, AttachDettachVmDiskParameters.class, new String[] { "VmId", "EntityId" }, -- To view, visit http://gerrit.ovirt.org/8335 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1a50077886734f73842141262f5c338979dcae5c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ori Liel <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
