From 0e14d32e73c82a16c816c73786dafb1094514a6d Mon Sep 17 00:00:00 2001 From: Everett Toews Date: Wed, 12 Dec 2012 15:49:56 -0600 Subject: [PATCH] Deprecated nova project in jclouds 1.6, to be removed in jclouds 1.7. --- .../openstack/nova/NovaApiMetadata.java | 9 ++ .../openstack/nova/NovaAsyncClient.java | 98 +++++++++++++++++++ .../jclouds/openstack/nova/NovaClient.java | 83 +++++++++++++++- 3 files changed, 189 insertions(+), 1 deletion(-) diff --git a/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaApiMetadata.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaApiMetadata.java index 1038fe3059..071c62e711 100644 --- a/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaApiMetadata.java +++ b/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaApiMetadata.java @@ -36,30 +36,39 @@ import com.google.inject.Module; * Implementation of {@link ApiMetadata} for Nova 1.0 API * * @author Adrian Cole + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.NovaApiMetadata} in openstack-nova. */ +@Deprecated public class NovaApiMetadata extends BaseRestApiMetadata { + @Deprecated public static final TypeToken> CONTEXT_TOKEN = new TypeToken>() { }; @Override + @Deprecated public Builder toBuilder() { return new Builder().fromApiMetadata(this); } + @Deprecated public NovaApiMetadata() { this(new Builder()); } + @Deprecated protected NovaApiMetadata(Builder builder) { super(builder); } + @Deprecated public static Properties defaultProperties() { Properties properties = BaseRestApiMetadata.defaultProperties(); return properties; } + @Deprecated public static class Builder extends BaseRestApiMetadata.Builder { protected Builder() { diff --git a/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaAsyncClient.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaAsyncClient.java index 751ee5fb88..47db15c721 100644 --- a/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaAsyncClient.java +++ b/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaAsyncClient.java @@ -67,14 +67,19 @@ import com.google.common.util.concurrent.ListenableFuture; * @author Adrian Cole * @see NovaClient * @see + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See NovaAsyncApi. */ @SkipEncoding({'/', '='}) @RequestFilters({AuthenticateRequest.class, AddTimestampQuery.class}) @Endpoint(ServerManagement.class) +@Deprecated public interface NovaAsyncClient { /** * @see NovaClient#listServers + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#list()} in openstack-nova. */ @GET @Unwrap @@ -82,10 +87,13 @@ public interface NovaAsyncClient { @QueryParams(keys = "format", values = "json") @Path("/servers") @ExceptionParser(ReturnEmptySetOnNotFoundOr404.class) + @Deprecated ListenableFuture> listServers(ListOptions... options); /** * @see NovaClient#getServer + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#get(String)} in openstack-nova. */ @GET @Unwrap @@ -93,10 +101,13 @@ public interface NovaAsyncClient { @QueryParams(keys = "format", values = "json") @ExceptionParser(ReturnNullOnNotFoundOr404.class) @Path("/servers/{id}") + @Deprecated ListenableFuture getServer(@PathParam("id") int id); /** * @see NovaClient#getServer + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#get(String)} in openstack-nova. */ @GET @Unwrap @@ -104,28 +115,37 @@ public interface NovaAsyncClient { @QueryParams(keys = "format", values = "json") @ExceptionParser(ReturnNullOnNotFoundOr404.class) @Path("/servers/{uuid}") + @Deprecated ListenableFuture getServer(@PathParam("uuid") String uuid); /** * @see NovaClient#deleteServer + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#delete(String)} in openstack-nova. */ @DELETE @Consumes @ExceptionParser(ReturnFalseOnNotFoundOr404.class) @Path("/servers/{id}") + @Deprecated ListenableFuture deleteServer(@PathParam("id") int id); /** * @see NovaClient#deleteServer + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#delete(String)} in openstack-nova. */ @DELETE @Consumes @ExceptionParser(ReturnFalseOnNotFoundOr404.class) @Path("/servers/{uuid}") + @Deprecated ListenableFuture deleteServer(@PathParam("uuid") String uuid); /** * @see NovaClient#rebootServer + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#reboot(String, RebootType)} in openstack-nova. */ @POST @QueryParams(keys = "format", values = "json") @@ -133,10 +153,13 @@ public interface NovaAsyncClient { @Consumes @Produces(MediaType.APPLICATION_JSON) @Payload("%7B\"reboot\":%7B\"type\":\"{type}\"%7D%7D") + @Deprecated ListenableFuture rebootServer(@PathParam("id") int id, @PayloadParam("type") RebootType rebootType); /** * @see NovaClient#resizeServer + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#resize(String, String)} in openstack-nova. */ @POST @QueryParams(keys = "format", values = "json") @@ -144,10 +167,13 @@ public interface NovaAsyncClient { @Consumes @Produces(MediaType.APPLICATION_JSON) @Payload("%7B\"resize\":%7B\"flavorId\":{flavorId}%7D%7D") + @Deprecated ListenableFuture resizeServer(@PathParam("id") int id, @PayloadParam("flavorId") int flavorId); /** * @see NovaClient#confirmResizeServer + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#confirmResize(String)} in openstack-nova. */ @POST @QueryParams(keys = "format", values = "json") @@ -155,10 +181,13 @@ public interface NovaAsyncClient { @Consumes @Produces(MediaType.APPLICATION_JSON) @Payload("{\"confirmResize\":null}") + @Deprecated ListenableFuture confirmResizeServer(@PathParam("id") int id); /** * @see NovaClient#revertResizeServer + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#revertResize(String)} in openstack-nova. */ @POST @QueryParams(keys = "format", values = "json") @@ -166,10 +195,13 @@ public interface NovaAsyncClient { @Consumes @Produces(MediaType.APPLICATION_JSON) @Payload("{\"revertResize\":null}") + @Deprecated ListenableFuture revertResizeServer(@PathParam("id") int id); /** * @see NovaClient#createServer + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#create(String, String, String, CreateServerOptions)} in openstack-nova. */ @POST @Unwrap @@ -177,42 +209,54 @@ public interface NovaAsyncClient { @QueryParams(keys = "format", values = "json") @Path("/servers") @MapBinder(CreateServerOptions.class) + @Deprecated ListenableFuture createServer(@PayloadParam("name") String name, @PayloadParam("imageRef") String imageRef, @PayloadParam("flavorRef") String flavorRef, CreateServerOptions... options); /** * @see NovaClient#rebuildServer + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#rebuild(String, RebuildServerOptions)} in openstack-nova. */ @POST @QueryParams(keys = "format", values = "json") @Path("/servers/{id}/action") @Consumes @MapBinder(RebuildServerOptions.class) + @Deprecated ListenableFuture rebuildServer(@PathParam("id") int id, RebuildServerOptions... options); /** * @see NovaClient#changeAdminPass + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#changeAdminPass(String, String)} in openstack-nova. */ @POST @Path("/servers/{id}/action") @Consumes @Produces(MediaType.APPLICATION_JSON) @Payload("%7B\"changePassword\":%7B\"adminPass\":\"{adminPass}\"%7D%7D") + @Deprecated ListenableFuture changeAdminPass(@PathParam("id") int id, @PayloadParam("adminPass") String adminPass); /** * @see NovaClient#renameServer + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#rename(String, String)} in openstack-nova. */ @PUT @Path("/servers/{id}") @Consumes @Produces(MediaType.APPLICATION_JSON) @Payload("%7B\"server\":%7B\"name\":\"{name}\"%7D%7D") + @Deprecated ListenableFuture renameServer(@PathParam("id") int id, @PayloadParam("name") String newName); /** * @see NovaClient#listFlavors + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.FlavorAsyncApi#list()} in openstack-nova. */ @GET @Unwrap @@ -220,10 +264,13 @@ public interface NovaAsyncClient { @QueryParams(keys = "format", values = "json") @Path("/flavors") @ExceptionParser(ReturnEmptySetOnNotFoundOr404.class) + @Deprecated ListenableFuture> listFlavors(ListOptions... options); /** * @see NovaClient#getFlavor + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.FlavorAsyncApi#get(String)} in openstack-nova. */ @GET @Unwrap @@ -231,10 +278,13 @@ public interface NovaAsyncClient { @QueryParams(keys = "format", values = "json") @Path("/flavors/{id}") @ExceptionParser(ReturnNullOnNotFoundOr404.class) + @Deprecated ListenableFuture getFlavor(@PathParam("id") int id); /** * @see NovaClient#getFlavor + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.FlavorAsyncApi#get(String)} in openstack-nova. */ @GET @Unwrap @@ -242,10 +292,13 @@ public interface NovaAsyncClient { @QueryParams(keys = "format", values = "json") @Path("/flavors/{uuid}") @ExceptionParser(ReturnNullOnNotFoundOr404.class) + @Deprecated ListenableFuture getFlavor(@PathParam("uuid") String uuid); /** * @see NovaClient#listImages + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ImageAsyncApi#list()} in openstack-nova. */ @GET @Unwrap @@ -253,10 +306,13 @@ public interface NovaAsyncClient { @QueryParams(keys = "format", values = "json") @Path("/images") @ExceptionParser(ReturnEmptySetOnNotFoundOr404.class) + @Deprecated ListenableFuture> listImages(ListOptions... options); /** * @see NovaClient#getImage + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ImageAsyncApi#get(String)} in openstack-nova. */ @GET @Unwrap @@ -264,10 +320,13 @@ public interface NovaAsyncClient { @ExceptionParser(ReturnNullOnNotFoundOr404.class) @QueryParams(keys = "format", values = "json") @Path("/images/{id}") + @Deprecated ListenableFuture getImage(@PathParam("id") int id); /** * @see NovaClient#getImage + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ImageAsyncApi#get(String)} in openstack-nova. */ @GET @Unwrap @@ -275,28 +334,37 @@ public interface NovaAsyncClient { @ExceptionParser(ReturnNullOnNotFoundOr404.class) @QueryParams(keys = "format", values = "json") @Path("/images/{uuid}") + @Deprecated ListenableFuture getImage(@PathParam("uuid") String uuid); /** * @see NovaClient#deleteImage + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ImageAsyncApi#delete(String)} in openstack-nova. */ @DELETE @ExceptionParser(ReturnFalseOnNotFoundOr404.class) @Consumes @Path("/images/{id}") + @Deprecated ListenableFuture deleteImage(@PathParam("id") int id); /** * @see NovaClient#deleteImage + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ImageAsyncApi#delete(String)} in openstack-nova. */ @DELETE @ExceptionParser(ReturnFalseOnNotFoundOr404.class) @Consumes @Path("/images/{id}") + @Deprecated ListenableFuture deleteImage(@PathParam("id") String id); /** * @see NovaClient#createImageFromServer + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#createImageFromServer(String, String)} in openstack-nova. */ @POST @Unwrap @@ -305,21 +373,27 @@ public interface NovaAsyncClient { @Path("/images") @Produces(MediaType.APPLICATION_JSON) @Payload("%7B\"image\":%7B\"serverId\":{serverId},\"name\":\"{name}\"%7D%7D") + @Deprecated ListenableFuture createImageFromServer(@PayloadParam("name") String imageName, @PayloadParam("serverId") int serverId); /** * @see NovaClient#getAddresses + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#get(String)} in openstack-nova. */ @GET @Unwrap @Consumes(MediaType.APPLICATION_JSON) @QueryParams(keys = "format", values = "json") @Path("/servers/{id}/ips") + @Deprecated ListenableFuture getAddresses(@PathParam("id") int serverId); /** * @see NovaClient#listPublicAddresses + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#get(String)} in openstack-nova. */ @GET @Unwrap @@ -327,10 +401,13 @@ public interface NovaAsyncClient { @QueryParams(keys = "format", values = "json") @Path("/servers/{id}/ips/public") @ExceptionParser(ReturnEmptySetOnNotFoundOr404.class) + @Deprecated ListenableFuture> listPublicAddresses(@PathParam("id") int serverId); /** * @see NovaClient#listPrivateAddresses + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#get(String)} in openstack-nova. */ @GET @Unwrap @@ -338,45 +415,66 @@ public interface NovaAsyncClient { @QueryParams(keys = "format", values = "json") @Path("/servers/{id}/ips/private") @ExceptionParser(ReturnEmptySetOnNotFoundOr404.class) + @Deprecated ListenableFuture> listPrivateAddresses(@PathParam("id") int serverId); + /** + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.extensions.FloatingIPAsyncApi#addToServer(String, String)} in openstack-nova. + */ @POST @Path("/servers/{id}/action") @Consumes @Produces(MediaType.APPLICATION_JSON) @Payload("%7B\"addFloatingIp\":%7B\"address\":\"{address}\"%7D%7D") + @Deprecated ListenableFuture addFloatingIP(@PathParam("id") int serverId, @PayloadParam("address") String ip); + /** + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.extensions.FloatingIPAsyncApi#list()} in openstack-nova. + */ @GET @Unwrap @Consumes(MediaType.APPLICATION_JSON) @QueryParams(keys = "format", values = "json") @Path("/os-floating-ips") @ExceptionParser(ReturnEmptySetOnNotFoundOr404.class) + @Deprecated ListenableFuture> listFloatingIPs(); + /** + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.extensions.FloatingIPAsyncApi#get(String)} in openstack-nova. + */ @GET @Unwrap @Consumes(MediaType.APPLICATION_JSON) @QueryParams(keys = "format", values = "json") @Path("/os-floating-ips/{id}") @ExceptionParser(ReturnNullOnNotFoundOr404.class) + @Deprecated ListenableFuture getFloatingIP(@PathParam("id") int id); + /** + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.extensions.SecurityGroupAsyncApi#list()} in openstack-nova. + */ @GET @Unwrap @Consumes(MediaType.APPLICATION_JSON) @QueryParams(keys = "format", values = "json") @Path("/os-security-groups") @ExceptionParser(ReturnEmptySetOnNotFoundOr404.class) + @Deprecated ListenableFuture> listSecurityGroups(); + /** + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.extensions.SecurityGroupAsyncApi#get(String)} in openstack-nova. + */ @GET @Unwrap @Consumes(MediaType.APPLICATION_JSON) @QueryParams(keys = "format", values = "json") @Path("/os-security-groups/{id}") @ExceptionParser(ReturnNullOnNotFoundOr404.class) + @Deprecated ListenableFuture getSecurityGroup(@PathParam("id") int id); } diff --git a/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaClient.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaClient.java index 678fc3ce5b..4ad36ac2ab 100644 --- a/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaClient.java +++ b/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaClient.java @@ -43,8 +43,11 @@ import org.jclouds.openstack.nova.options.RebuildServerOptions; * @see NovaAsyncClient * @see * @author Adrian Cole + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi} in openstack-nova. */ @Timeout(duration = 60, timeUnit = TimeUnit.SECONDS) +@Deprecated public interface NovaClient { /** @@ -56,7 +59,10 @@ public interface NovaClient { *

* in order to retrieve all details, pass the option {@link ListOptions#withDetails() * withDetails()} + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#list()} in openstack-nova. */ + @Deprecated Set listServers(ListOptions... options); /** @@ -65,8 +71,12 @@ public interface NovaClient { * * @return null, if the server is not found * @see Server + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#get(String)} in openstack-nova. */ + @Deprecated Server getServer(int id); + @Deprecated Server getServer(String uuid); /** @@ -77,8 +87,12 @@ public interface NovaClient { * * @return false if the server is not found * @see Server + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#delete(String)} in openstack-nova. */ + @Deprecated boolean deleteServer(int id); + @Deprecated boolean deleteServer(String id); /** @@ -94,7 +108,10 @@ public interface NovaClient { * With a soft reboot, the operating system is signaled to restart, which allows for a * graceful shutdown of all processes. A hard reboot is the equivalent of power cycling * the server. + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#reboot(String, RebootType)} in openstack-nova. */ + @Deprecated void rebootServer(int id, RebootType rebootType); /** @@ -109,7 +126,10 @@ public interface NovaClient { * ACTIVE - QUEUE_RESIZE - PREP_RESIZE - VERIFY_RESIZE *

* ACTIVE - QUEUE_RESIZE - ACTIVE (on error) + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#resize(String, String)} in openstack-nova. */ + @Deprecated void resizeServer(int id, int flavorId); /** @@ -122,7 +142,10 @@ public interface NovaClient { * Status Transition: *

* VERIFY_RESIZE - ACTIVE + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#confirmResize(String)} in openstack-nova. */ + @Deprecated void confirmResizeServer(int id); /** @@ -135,7 +158,10 @@ public interface NovaClient { * Status Transition: *

* VERIFY_RESIZE - ACTIVE + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#revertResize(String)} in openstack-nova. */ + @Deprecated void revertResizeServer(int id); /** @@ -148,7 +174,10 @@ public interface NovaClient { * * @param options * - used to specify extra files, metadata, or ip parameters during server creation. + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#create(String, String, String, CreateServerOptions)} in openstack-nova. */ + @Deprecated Server createServer(String name, String imageRef, String flavorRef, CreateServerOptions... options); /** @@ -165,7 +194,10 @@ public interface NovaClient { * @param options * - imageId is an optional argument. If it is not specified, the server is rebuilt * with the original imageId. + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#rebuild(String, RebuildServerOptions)} in openstack-nova. */ + @Deprecated void rebuildServer(int id, RebuildServerOptions... options); /** @@ -173,7 +205,9 @@ public interface NovaClient { *

* Status Transition: ACTIVE - PASSWORD - ACTIVE * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#changeAdminPass(String, String)} in openstack-nova. */ + @Deprecated void changeAdminPass(int id, String adminPass); /** @@ -182,7 +216,9 @@ public interface NovaClient { *

* Status Transition: ACTIVE - PASSWORD - ACTIVE * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#rename(String, String)} in openstack-nova. */ + @Deprecated void renameServer(int id, String newName); /** @@ -191,7 +227,10 @@ public interface NovaClient { * * in order to retrieve all details, pass the option {@link ListOptions#withDetails() * withDetails()} + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.FlavorApi#list()} in openstack-nova. */ + @Deprecated Set listFlavors(ListOptions... options); /** @@ -200,8 +239,12 @@ public interface NovaClient { * * @return null, if the flavor is not found * @see Flavor + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.FlavorApi#get(String)} in openstack-nova. */ + @Deprecated Flavor getFlavor(int id); + @Deprecated Flavor getFlavor(String uuid); /** @@ -210,7 +253,10 @@ public interface NovaClient { * * in order to retrieve all details, pass the option {@link ListOptions#withDetails() * withDetails()} + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ImageApi#list()} in openstack-nova. */ + @Deprecated Set listImages(ListOptions... options); /** @@ -220,8 +266,12 @@ public interface NovaClient { * @return null, if the image is not found * * @see Image + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ImageApi#get(String)} in openstack-nova. */ + @Deprecated Image getImage(int id); + @Deprecated Image getImage(String id); /** @@ -233,8 +283,12 @@ public interface NovaClient { * * @return false if the image is not found * @see Image + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ImageApi#delete(String)} in openstack-nova. */ + @Deprecated boolean deleteImage(int id); + @Deprecated boolean deleteImage(String id); /** @@ -256,28 +310,40 @@ public interface NovaClient { * @throws ResourceNotFoundException * if the server is not found * @see Image + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#createImageFromServer(String, String)} in openstack-nova. */ + @Deprecated Image createImageFromServer(String imageName, int serverId); /** * List all server addresses * * returns empty set if the server doesn't exist + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#get(String)} in openstack-nova. */ + @Deprecated Addresses getAddresses(int serverId); /** * List all public server addresses * * returns empty set if the server doesn't exist + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#get(String)} in openstack-nova. */ + @Deprecated Set listPublicAddresses(int serverId); /** * List all private server addresses * * returns empty set if the server doesn't exist + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#get(String)} in openstack-nova. */ + @Deprecated Set listPrivateAddresses(int serverId); /** @@ -290,16 +356,22 @@ public interface NovaClient { * @since 2011.3 "Diablo" release, OpenStack API 1.1 * @param serverId * @param ip + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.extensions.FloatingIPApi#addToServer(String, String)} in openstack-nova. */ + @Deprecated void addFloatingIP(int serverId, String ip); /** * Get all the defined floating IPs in nova * * @see http://wiki.openstack.org/os_api_floating_ip - * @since 2011.3 "Diablo" release, OpenStack API 1.1 + * @since 2011.3 "Diablo" release, OpenStack API 1.1 * @return all the available floating IP for the current tenant + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.extensions.FloatingIPApi#list()} in openstack-nova. */ + @Deprecated Set listFloatingIPs(); /** @@ -309,7 +381,10 @@ public interface NovaClient { * @since 2011.3 "Diablo" release, OpenStack API 1.1 * @param id the floating IP id * @return the floating IP or null if not found + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.extensions.FloatingIPApi#get(String)} in openstack-nova. */ + @Deprecated FloatingIP getFloatingIP(int id); /** @@ -318,7 +393,10 @@ public interface NovaClient { * @see http://wiki.openstack.org/os-security-groups * @since OpenStack API v1.1 * @return all the security groups for the current tenant + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.extensions.SecurityGroupApi#list()} in openstack-nova. */ + @Deprecated Set listSecurityGroups(); /** @@ -328,7 +406,10 @@ public interface NovaClient { * @since OpenStack API v1.1 * @param id the ID of the security group to get details from * @return the security group or null if not found + * + * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.extensions.SecurityGroupApi#get(String)} in openstack-nova. */ + @Deprecated SecurityGroup getSecurityGroup(int id); }