Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add SnapshotClient.getSnapshot(long id) et al to Cloudstack

This commit is contained in:
Richard Downer 2011-11-09 11:50:25 +02:00
parent 16771961e1
commit 48f05f3aed
3 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotAsyncClient.java
View File

@ -25,10 +25,13 @@ import org.jclouds.cloudstack.filters.QuerySigner;
import org.jclouds.cloudstack.options.CreateSnapshotOptions;
import org.jclouds.cloudstack.options.ListSnapshotsOptions;
import org.jclouds.rest.annotations.ExceptionParser;
import org.jclouds.rest.annotations.OnlyElement;
import org.jclouds.rest.annotations.QueryParams;
import org.jclouds.rest.annotations.RequestFilters;
import org.jclouds.rest.annotations.SelectJson;
import org.jclouds.rest.annotations.Unwrap;
import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404;
import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404;
import org.jclouds.rest.functions.ReturnVoidOnNotFoundOr404;
import javax.ws.rs.Consumes;
@ -75,6 +78,20 @@ public interface SnapshotAsyncClient {
@ExceptionParser(ReturnEmptySetOnNotFoundOr404.class)
ListenableFuture<Set<Snapshot>> listSnapshots(ListSnapshotsOptions... options);
/**
* Gets a snapshot by its ID.
*
* @param id the snapshot ID
* @return the snapshot with the requested ID
*/
@GET
@Consumes(MediaType.APPLICATION_JSON)
@QueryParams(keys = "command", values = "listSnapshots")
@SelectJson("snapshot")
@OnlyElement
@ExceptionParser(ReturnNullOnNotFoundOr404.class)
ListenableFuture<Snapshot> getSnapshot(@QueryParam("id") long id);
/**
* Deletes a snapshot of a disk volume.
*

8
sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotClient.java
View File

@ -55,6 +55,14 @@ public interface SnapshotClient {
*/
Set<Snapshot> listSnapshots(ListSnapshotsOptions... options);
/**
* Gets a snapshot by its ID.
*
* @param id the snapshot ID
* @return the snapshot with the requested ID
*/
Snapshot getSnapshot(long id);
/**
* Deletes a snapshot of a disk volume.
*

20
sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SnapshotAsyncClientTest.java
View File

@ -18,15 +18,18 @@
*/
package org.jclouds.cloudstack.features;
import com.google.common.base.Functions;
import com.google.inject.TypeLiteral;
import org.jclouds.cloudstack.domain.Snapshot;
import org.jclouds.cloudstack.options.CreateSnapshotOptions;
import org.jclouds.cloudstack.options.ListSnapshotsOptions;
import org.jclouds.functions.IdentityFunction;
import org.jclouds.http.HttpRequest;
import org.jclouds.http.functions.ReleasePayloadAndReturn;
import org.jclouds.http.functions.UnwrapOnlyJsonValue;
import org.jclouds.rest.functions.MapHttp4xxCodesToExceptions;
import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404;
import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404;
import org.jclouds.rest.functions.ReturnVoidOnNotFoundOr404;
import org.jclouds.rest.internal.RestAnnotationProcessor;
import org.testng.annotations.Test;
@ -92,6 +95,23 @@ public class SnapshotAsyncClientTest extends BaseCloudStackAsyncClientTest<Snaps
checkFilters(httpRequest);
}
public void testGetSnapshot() throws NoSuchMethodException {
Method method = SnapshotAsyncClient.class.getMethod("getSnapshot", long.class);
HttpRequest httpRequest = processor.createRequest(method, 5);
assertRequestLineEquals(httpRequest,
"GET http://localhost:8080/client/api?response=json&command=listSnapshots&id=5 HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
assertPayloadEquals(httpRequest, null, null, false);
assertResponseParserClassEquals(method, httpRequest,
Functions.compose(IdentityFunction.INSTANCE, IdentityFunction.INSTANCE).getClass());
assertSaxResponseParserClassEquals(method, null);
assertExceptionParserClassEquals(method, ReturnNullOnNotFoundOr404.class);
checkFilters(httpRequest);
}
public void testListSnapshotsOptions() throws NoSuchMethodException {
Method method = SnapshotAsyncClient.class.getMethod("listSnapshots", ListSnapshotsOptions[].class);
HttpRequest httpRequest = processor.createRequest(method, ListSnapshotsOptions.Builder.accountInDomain("acc", 7).id(5).intervalType(Snapshot.SnapshotIntervalType.MONTHLY).isRecursive(true).keyword("fred").name("fred's snapshot").snapshotType(Snapshot.SnapshotType.RECURRING).volumeId(11));