From f0913ee6b49acf1796ea890d09a8ece9314d8eeb Mon Sep 17 00:00:00 2001 From: danikov Date: Tue, 20 Mar 2012 23:55:27 +0000 Subject: [PATCH] fix cloneMedia (bad path) and deleteMedia (wrong ID) --- .../vcloud/director/v1_5/features/MediaAsyncClient.java | 3 ++- .../vcloud/director/v1_5/features/MediaClientLiveTest.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MediaAsyncClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MediaAsyncClient.java index 3d6b9ef570..40b698d5f6 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MediaAsyncClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MediaAsyncClient.java @@ -78,11 +78,12 @@ public interface MediaAsyncClient { * @see MediaClient#cloneMedia(URI, CloneMediaParams) */ @POST + @Path("/action/cloneMedia") @Consumes(VCloudDirectorMediaType.MEDIA) @Produces(VCloudDirectorMediaType.CLONE_MEDIA_PARAMS) @JAXBResponseParser @ExceptionParser(ThrowVCloudErrorOn4xx.class) - ListenableFuture cloneMedia(@EndpointParam URI cloneLink, + ListenableFuture cloneMedia(@EndpointParam URI vdcRef, @BinderParam(BindToXMLPayload.class) CloneMediaParams params); /** diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaClientLiveTest.java index 1cbc2de29e..49a140ac12 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaClientLiveTest.java @@ -398,7 +398,7 @@ public class MediaClientLiveTest extends BaseVCloudDirectorClientLiveTest { Error expected = Error.builder() .message(String.format( "No access to entity \"(com.vmware.vcloud.entity.media:%s)\".", - media.getId())) + media.getId().substring("urn:vcloud:media:".length()))) .majorErrorCode(403) .minorErrorCode("ACCESS_TO_RESOURCE_IS_FORBIDDEN") .build();