Repository: jclouds-labs-openstack Updated Branches: refs/heads/master 0dacbce26 -> 1c3ea466d
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/rackspace-cloudbigdata-us/src/main/java/org/jclouds/rackspace/cloudbigdata/us/v1/CloudBigDataUSProviderMetadata.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudbigdata-us/src/main/java/org/jclouds/rackspace/cloudbigdata/us/v1/CloudBigDataUSProviderMetadata.java b/rackspace-cloudbigdata-us/src/main/java/org/jclouds/rackspace/cloudbigdata/us/v1/CloudBigDataUSProviderMetadata.java index 1c32968..a17f3a5 100644 --- a/rackspace-cloudbigdata-us/src/main/java/org/jclouds/rackspace/cloudbigdata/us/v1/CloudBigDataUSProviderMetadata.java +++ b/rackspace-cloudbigdata-us/src/main/java/org/jclouds/rackspace/cloudbigdata/us/v1/CloudBigDataUSProviderMetadata.java @@ -17,15 +17,15 @@ package org.jclouds.rackspace.cloudbigdata.us.v1; import static org.jclouds.location.reference.LocationConstants.ISO3166_CODES; -import static org.jclouds.location.reference.LocationConstants.PROPERTY_ZONE; -import static org.jclouds.location.reference.LocationConstants.PROPERTY_ZONES; +import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGION; +import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGIONS; import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE; import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE; import java.net.URI; import java.util.Properties; -import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.ZoneModule; +import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.RegionModule; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; import org.jclouds.rackspace.cloudbigdata.v1.CloudBigDataApiMetadata; @@ -77,12 +77,12 @@ public class CloudBigDataUSProviderMetadata extends BaseProviderMetadata { public static Properties defaultProperties() { Properties properties = new Properties(); properties.setProperty(CREDENTIAL_TYPE, CloudIdentityCredentialTypes.API_KEY_CREDENTIALS); - properties.setProperty(SERVICE_TYPE, ServiceType.BIG_DATA); - //properties.setProperty(PROPERTY_ZONES, "ORD,DFW,SYD"); - properties.setProperty(PROPERTY_ZONES, "ORD"); - properties.setProperty(PROPERTY_ZONE + ".ORD." + ISO3166_CODES, "US-IL"); - //properties.setProperty(PROPERTY_ZONE + ".DFW." + ISO3166_CODES, "US-TX"); - //properties.setProperty(PROPERTY_ZONE + ".SYD." + ISO3166_CODES, "AU-NSW"); + properties.setProperty(SERVICE_TYPE, ServiceType.BIG_DATA); + //properties.setProperty(PROPERTY_REGIONS, "ORD,DFW,SYD"); + properties.setProperty(PROPERTY_REGIONS, "ORD"); + properties.setProperty(PROPERTY_REGION + ".ORD." + ISO3166_CODES, "US-IL"); + //properties.setProperty(PROPERTY_REGION + ".DFW." + ISO3166_CODES, "US-TX"); + //properties.setProperty(PROPERTY_REGION + ".SYD." + ISO3166_CODES, "AU-NSW"); return properties; } @@ -103,7 +103,7 @@ public class CloudBigDataUSProviderMetadata extends BaseProviderMetadata { .defaultModules(ImmutableSet.<Class<? extends Module>>builder() .add(CloudIdentityAuthenticationApiModule.class) .add(CloudIdentityAuthenticationModule.class) - .add(ZoneModule.class) + .add(RegionModule.class) .add(CloudBigDataParserModule.class) .add(CloudBigDataHttpApiModule.class).build()) .build()) http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApi.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApi.java b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApi.java index 46aadda..7d52ab0 100644 --- a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApi.java +++ b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApi.java @@ -20,8 +20,8 @@ import java.io.Closeable; import java.util.Set; import org.jclouds.javax.annotation.Nullable; -import org.jclouds.location.Zone; -import org.jclouds.location.functions.ZoneToEndpoint; +import org.jclouds.location.Region; +import org.jclouds.location.functions.RegionToEndpoint; import org.jclouds.rackspace.cloudbigdata.v1.features.ClusterApi; import org.jclouds.rackspace.cloudbigdata.v1.features.ProfileApi; import org.jclouds.rest.annotations.Delegate; @@ -30,33 +30,64 @@ import org.jclouds.rest.annotations.EndpointParam; import com.google.inject.Provides; /** - * Provides access to Rackspace Cloud Big Data. - * Rackspace Cloud Big Data is an on-demand Apache Hadoop service on the Rackspace open cloud. The service supports a RESTful API and alleviates the pain associated with deploying, managing, and scaling Hadoop clusters. - * @see <a href="http://docs.rackspace.com/cbd/api/v1.0/cbd-devguide/content/overview.html";>API Doc</a> + * Provides access to the Rackspace Cloud Big Data v1 API. + * + * Rackspace Cloud Big Data is an on-demand Apache Hadoop service on the Rackspace open cloud. The service + * supports a RESTful API and alleviates the pain associated with deploying, managing, and scaling Hadoop clusters. */ -public interface CloudBigDataApi extends Closeable{ +public interface CloudBigDataApi extends Closeable { + /** + * Provides a set of all regions available. + * + * @return the Region codes configured + */ + @Provides + @Region + Set<String> getConfiguredRegions(); + + /** + * Provides access to all Profile features. + * @param region The region for the profile API. + * @return A profile API context. + */ + @Delegate + ProfileApi getProfileApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); + + /** + * Provides access to all Cluster features. + * @param region The region for the profile API. + * @return A cluster API context. + */ + @Delegate + ClusterApi getClusterApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); + /** - * Provides a set of all zones available. - * * @return the Zone codes configured + * @deprecated Please use {@link #getConfiguredRegions()} as this method will be removed in jclouds 3.0. */ + @Deprecated @Provides - @Zone + @Region Set<String> getConfiguredZones(); /** * Provides access to all Profile features. * @param zone The zone (region) for the profile API. * @return A profile API context. + * @deprecated Please use {@link #getProfileApi(String)} as this method will be removed in jclouds 3.0. */ + @Deprecated @Delegate - ProfileApi getProfileApiForZone(@EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone); + ProfileApi getProfileApiForZone(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone); /** * Provides access to all Cluster features. * @param zone The zone (region) for the profile API. * @return A cluster API context. + * @deprecated Please use {@link #getClusterApi(String)} as this method will be removed in jclouds 3.0. */ + @Deprecated @Delegate - ClusterApi getClusterApiForZone(@EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone); + ClusterApi getClusterApiForZone(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone); + } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApiMetadata.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApiMetadata.java b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApiMetadata.java index 74be554..111455d 100644 --- a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApiMetadata.java +++ b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApiMetadata.java @@ -23,7 +23,7 @@ import java.net.URI; import java.util.Properties; import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes; -import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.ZoneModule; +import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.RegionModule; import org.jclouds.rackspace.cloudbigdata.v1.config.CloudBigDataHttpApiModule; import org.jclouds.rackspace.cloudbigdata.v1.config.CloudBigDataParserModule; import org.jclouds.rackspace.cloudidentity.v2_0.ServiceType; @@ -35,8 +35,8 @@ import com.google.common.collect.ImmutableSet; import com.google.inject.Module; /** - * Implementation of {@link ApiMetadata} for the Rackspace Cloud Big Data API - * + * Implementation of {@link org.jclouds.apis.ApiMetadata} for the Rackspace Cloud Big Data API + * * @see CloudBigDataApi */ public class CloudBigDataApiMetadata extends BaseHttpApiMetadata<CloudBigDataApi> { @@ -47,7 +47,7 @@ public class CloudBigDataApiMetadata extends BaseHttpApiMetadata<CloudBigDataApi } /** - * + * */ public CloudBigDataApiMetadata() { this(new Builder()); @@ -69,7 +69,7 @@ public class CloudBigDataApiMetadata extends BaseHttpApiMetadata<CloudBigDataApi */ public static class Builder extends BaseHttpApiMetadata.Builder<CloudBigDataApi, Builder> { - protected Builder() { + protected Builder() { id("rackspace-cloudbigdata") .name("Rackspace Cloud Big Data API") .identityName("${tenantName}:${userName} or ${userName}, if your keystone supports a default tenant") @@ -82,7 +82,7 @@ public class CloudBigDataApiMetadata extends BaseHttpApiMetadata<CloudBigDataApi .defaultModules(ImmutableSet.<Class<? extends Module>>builder() .add(CloudIdentityAuthenticationApiModule.class) .add(CloudIdentityAuthenticationModule.class) - .add(ZoneModule.class) + .add(RegionModule.class) .add(CloudBigDataParserModule.class) .add(CloudBigDataHttpApiModule.class) .build()); http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/features/ClusterApi.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/features/ClusterApi.java b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/features/ClusterApi.java index 2e9a061..53242b9 100644 --- a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/features/ClusterApi.java +++ b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/features/ClusterApi.java @@ -25,11 +25,11 @@ import javax.ws.rs.GET; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest; import org.jclouds.rackspace.cloudbigdata.v1.domain.Cluster; import org.jclouds.rackspace.cloudbigdata.v1.domain.CreateCluster; @@ -47,7 +47,8 @@ import com.google.common.collect.FluentIterable; */ @RequestFilters(AuthenticateRequest.class) @Consumes(MediaType.APPLICATION_JSON) -@Produces(MediaType.APPLICATION_JSON) +//@Produces(MediaType.APPLICATION_JSON) +@Path("/clusters") public interface ClusterApi extends Closeable { /** @@ -58,51 +59,52 @@ public interface ClusterApi extends Closeable { * @see Cluster * @see CreateCluster */ - @Named("Cluster:create") + @Named("cluster:create") @POST - @Path("/clusters") - @Fallback(NullOnNotFoundOr404.class) @SelectJson("cluster") + @Fallback(NullOnNotFoundOr404.class) + @Nullable Cluster create(@WrapWith("cluster") CreateCluster cluster); - + /** * List all clusters. * @return A list containing information about all the clusters. * @see Cluster */ - @Named("Cluster:list") + @Named("cluster:list") @GET - @Path("/clusters") - @Fallback(EmptyFluentIterableOnNotFoundOr404.class) @SelectJson("clusters") + @Fallback(EmptyFluentIterableOnNotFoundOr404.class) FluentIterable<Cluster> list(); - + /** * Get information about a specific cluster. * @param clusterId The id of the cluster queried. * @return Detailed information about a specific cluster. * @see Cluster */ - @Named("Cluster:get") + @Named("cluster:get") @GET - @Path("/clusters/{clusterId}") - @Fallback(NullOnNotFoundOr404.class) + @Path("/{clusterId}") @SelectJson("cluster") + @Fallback(NullOnNotFoundOr404.class) + @Nullable Cluster get(@PathParam("clusterId") String clusterId); - + /** * Delete a cluster. * @param clusterId The id of the cluster to be deleted. * @return Detailed information about the cluster to be deleted. * @see Cluster */ - @Named("Cluster:delete") + @Named("cluster:delete") @DELETE - @Path("/clusters/{clusterId}") - @Fallback(NullOnNotFoundOr404.class) + @Path("/{clusterId}") @SelectJson("cluster") + @Fallback(NullOnNotFoundOr404.class) + @Nullable Cluster delete(@PathParam("clusterId") String clusterId); - + /** * Resize a cluster. Changes the number of nodes for this cluster. * @param clusterId The id of the cluster to be deleted. @@ -110,11 +112,12 @@ public interface ClusterApi extends Closeable { * @return Detailed information about the cluster to be resized. * @see Cluster */ - @Named("Cluster:resize") + @Named("cluster:resize") @POST - @Path("/clusters/{clusterId}/action") + @Path("/{clusterId}/action") @WrapWith("resize") - @Fallback(NullOnNotFoundOr404.class) @SelectJson("cluster") + @Fallback(NullOnNotFoundOr404.class) + @Nullable Cluster resize(@PathParam("clusterId") String clusterId, @PayloadParam("nodeCount") int nodeCount); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/features/ProfileApi.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/features/ProfileApi.java b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/features/ProfileApi.java index e0126d5..ee17930 100644 --- a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/features/ProfileApi.java +++ b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/features/ProfileApi.java @@ -23,10 +23,10 @@ import javax.ws.rs.Consumes; import javax.ws.rs.GET; import javax.ws.rs.POST; import javax.ws.rs.Path; -import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import org.jclouds.Fallbacks.NullOnNotFoundOr404; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest; import org.jclouds.rackspace.cloudbigdata.v1.domain.CreateProfile; import org.jclouds.rackspace.cloudbigdata.v1.domain.Profile; @@ -44,7 +44,8 @@ import org.jclouds.rest.annotations.WrapWith; */ @RequestFilters(AuthenticateRequest.class) @Consumes(MediaType.APPLICATION_JSON) -@Produces(MediaType.APPLICATION_JSON) +//@Produces(MediaType.APPLICATION_JSON) +@Path("/profile") public interface ProfileApi extends Closeable { /** @@ -55,13 +56,13 @@ public interface ProfileApi extends Closeable { * @see Profile * @see CreateProfile */ - @Named("Profile:create") + @Named("profile:create") @POST - @Path("/profile") - @Fallback(NullOnNotFoundOr404.class) @SelectJson("profile") + @Fallback(NullOnNotFoundOr404.class) + @Nullable Profile create(@WrapWith("profile") CreateProfile profile); - + /** * This operation returns detailed profile information for the current user. * Before creating a cluster, a profile has to be created. @@ -69,10 +70,10 @@ public interface ProfileApi extends Closeable { * @see Profile * @see CreateProfile */ - @Named("Profile:get") + @Named("profile:get") @GET - @Path("/profile") - @Fallback(NullOnNotFoundOr404.class) @SelectJson("profile") + @Fallback(NullOnNotFoundOr404.class) + @Nullable Profile get(); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/predicates/ClusterPredicates.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/predicates/ClusterPredicates.java b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/predicates/ClusterPredicates.java index 91073a3..a4476bc 100644 --- a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/predicates/ClusterPredicates.java +++ b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/predicates/ClusterPredicates.java @@ -35,24 +35,24 @@ import com.google.common.base.Predicate; * <pre> * {@code * Cluster Cluster = ClusterApi.create(100); - * + * * RetryablePredicate<String> awaitAvailable = RetryablePredicate.create( * ClusterPredicates.available(ClusterApi), 600, 10, 10, TimeUnit.SECONDS); - * + * * if (!awaitAvailable.apply(Cluster.getId())) { - * throw new TimeoutException("Timeout on Cluster: " + Cluster); - * } + * throw new TimeoutException("Timeout on Cluster: " + Cluster); + * } * } * </pre> - * + * * You can also use the static convenience methods as follows. - * + * * <pre> * {@code * Cluster Cluster = ClusterApi.create(100); - * + * * if (!ClusterPredicates.awaitAvailable(ClusterApi).apply(Cluster.getId())) { - * throw new TimeoutException("Timeout on Cluster: " + Cluster); + * throw new TimeoutException("Timeout on Cluster: " + Cluster); * } * } * </pre> @@ -60,8 +60,8 @@ import com.google.common.base.Predicate; public class ClusterPredicates { /** * Wait until an Cluster is Available. - * - * @param clusterApi The ClusterApi in the zone where your Cluster resides. + * + * @param clusterApi The ClusterApi in the region where your Cluster resides. * @return RetryablePredicate That will check the status every 5 seconds for a maxiumum of 10 minutes. */ public static Predicate<Cluster> awaitAvailable(ClusterApi clusterApi) { @@ -71,8 +71,8 @@ public class ClusterPredicates { /** * Wait until an Cluster no longer exists. - * - * @param clusterApi The ClusterApi in the zone where your Cluster resides. + * + * @param clusterApi The ClusterApi in the region where your Cluster resides. * @return RetryablePredicate That will check whether the Cluster exists. * every 5 seconds for a maximum of 10 minutes. */ @@ -80,11 +80,11 @@ public class ClusterPredicates { DeletedPredicate deletedPredicate = new DeletedPredicate(clusterApi); return retry(deletedPredicate, 600, 5, 5, SECONDS); } - + /** * Wait until Cluster is in the status specified. - * - * @param clusterApi The ClusterApi in the zone where your Cluster resides. + * + * @param clusterApi The ClusterApi in the region where your Cluster resides. * @param status Wait until Cluster in in this status. * @param maxWaitInSec Maximum time to wait. * @param periodInSec Interval between retries. @@ -95,7 +95,7 @@ public class ClusterPredicates { StatusUpdatedPredicate statusPredicate = new StatusUpdatedPredicate(clusterApi, status); return retry(statusPredicate, maxWaitInSec, periodInSec, periodInSec, SECONDS); } - + private static class StatusUpdatedPredicate implements Predicate<Cluster> { private ClusterApi clusterApi; private Status status; @@ -111,14 +111,14 @@ public class ClusterPredicates { @Override public boolean apply(Cluster cluster) { checkNotNull(cluster, "Cluster must be defined"); - + if (status.equals(cluster.getStatus())) { return true; } else { Cluster ClusterUpdated = clusterApi.get(cluster.getId()); checkNotNull(ClusterUpdated, "Cluster %s not found.", cluster.getId()); - + return status.equals(ClusterUpdated.getStatus()); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ClusterApiLiveTest.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ClusterApiLiveTest.java b/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ClusterApiLiveTest.java index ac35477..01878af 100644 --- a/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ClusterApiLiveTest.java +++ b/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ClusterApiLiveTest.java @@ -29,10 +29,10 @@ import java.util.UUID; import org.jclouds.rackspace.cloudbigdata.v1.domain.Cluster; import org.jclouds.rackspace.cloudbigdata.v1.domain.Cluster.Status; import org.jclouds.rackspace.cloudbigdata.v1.domain.CreateCluster; +import org.jclouds.rackspace.cloudbigdata.v1.domain.CreateCluster.ClusterType; import org.jclouds.rackspace.cloudbigdata.v1.domain.CreateProfile; import org.jclouds.rackspace.cloudbigdata.v1.domain.Profile; import org.jclouds.rackspace.cloudbigdata.v1.domain.ProfileSSHKey; -import org.jclouds.rackspace.cloudbigdata.v1.domain.CreateCluster.ClusterType; import org.jclouds.rackspace.cloudbigdata.v1.internal.BaseCloudBigDataApiLiveTest; import org.jclouds.rackspace.cloudbigdata.v1.predicates.ClusterPredicates; import org.jclouds.ssh.SshKeys; @@ -46,20 +46,20 @@ import com.google.common.collect.ImmutableList; * Profile live test */ @Test(groups = "live", testName = "ProfileApiLiveTest", singleThreaded = true) -public class ClusterApiLiveTest extends BaseCloudBigDataApiLiveTest { +public class ClusterApiLiveTest extends BaseCloudBigDataApiLiveTest { @Override @BeforeClass(groups = { "integration", "live" }) public void setup() { super.setup(); - for (String zone : filterZones(api.getConfiguredZones())) { - ClusterApi clusterApi = api.getClusterApiForZone(zone); + for (String region : filterRegions(api.getConfiguredRegions())) { + ClusterApi clusterApi = api.getClusterApi(region); CreateCluster createCluster = null; try { // A Profile must exist before a cluster is created. - - ProfileApi profileApi = api.getProfileApiForZone(zone); + + ProfileApi profileApi = api.getProfileApi(region); CreateProfile createProfile = CreateProfile.builder() .username("john.doe") @@ -78,7 +78,7 @@ public class ClusterApiLiveTest extends BaseCloudBigDataApiLiveTest { assertEquals(profile.getSSHKeys().get(0).getName(), "t@test"); assertEquals(profile.getCredentialsUsername(), "jdoe"); assertNull(profile.getCredentialsApiKey()); - + createCluster = CreateCluster.builder() .name("slice") .clusterType(ClusterType.HADOOP_HDP1_3.name()) @@ -94,7 +94,7 @@ public class ClusterApiLiveTest extends BaseCloudBigDataApiLiveTest { Cluster cluster = clusterApi.create(createCluster); ClusterPredicates.awaitAvailable(clusterApi).apply(cluster); cluster = clusterApi.get(cluster.getId()); // update cluster for status - + assertNotNull(cluster); assertNotNull(cluster.getId()); assertNotNull(cluster.getCreated()); @@ -107,12 +107,12 @@ public class ClusterApiLiveTest extends BaseCloudBigDataApiLiveTest { assertEquals(cluster.getStatus(), Status.ACTIVE); } } - + @Test public void getCluster() { - for (String zone : filterZones(api.getConfiguredZones())) { - ClusterApi clusterApi = api.getClusterApiForZone(zone); - + for (String region : filterRegions(api.getConfiguredRegions())) { + ClusterApi clusterApi = api.getClusterApi(region); + Cluster clusterFromList = clusterApi.list().get(0); Cluster clusterFromGet = clusterApi.get(clusterFromList.getId()); assertNotNull(clusterFromGet.getId()); @@ -120,17 +120,17 @@ public class ClusterApiLiveTest extends BaseCloudBigDataApiLiveTest { assertEquals(clusterFromGet, clusterFromList); } } - + @Test public void resizeCluster() { - for (String zone : filterZones(api.getConfiguredZones())) { - ClusterApi clusterApi = api.getClusterApiForZone(zone); - + for (String region : filterRegions(api.getConfiguredRegions())) { + ClusterApi clusterApi = api.getClusterApi(region); + Cluster cluster = clusterApi.list().get(0); Cluster clusterResized = clusterApi.resize(cluster.getId(), 2); ClusterPredicates.awaitAvailable(clusterApi).apply(cluster); cluster = clusterApi.get(cluster.getId()); // update cluster for status - + assertEquals(clusterResized.getNodeCount(), 2); } } @@ -138,8 +138,8 @@ public class ClusterApiLiveTest extends BaseCloudBigDataApiLiveTest { @Override @AfterClass(groups = { "integration", "live" }) public void tearDown() { - for (String zone : filterZones(api.getConfiguredZones())) { - ClusterApi clusterApi = api.getClusterApiForZone(zone); + for (String region : filterRegions(api.getConfiguredRegions())) { + ClusterApi clusterApi = api.getClusterApi(region); for (Cluster cluster : clusterApi.list()) { ClusterPredicates.awaitAvailable(clusterApi).apply(cluster); clusterApi.delete(cluster.getId()); http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ClusterApiMockTest.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ClusterApiMockTest.java b/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ClusterApiMockTest.java index 5ea5a48..e74c2b7 100644 --- a/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ClusterApiMockTest.java +++ b/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ClusterApiMockTest.java @@ -50,7 +50,7 @@ public class ClusterApiMockTest extends BaseCloudBigDataApiMockTest { try { CloudBigDataApi cbdApi = api(server.getUrl("/").toString(), "rackspace-cloudbigdata", overrides); - ClusterApi api = cbdApi.getClusterApiForZone("ORD"); + ClusterApi api = cbdApi.getClusterApi("ORD"); CreateCluster createCluster = CreateCluster.builder() .name("slice") @@ -96,7 +96,7 @@ public class ClusterApiMockTest extends BaseCloudBigDataApiMockTest { try { CloudBigDataApi cbdApi = api(server.getUrl("/").toString(), "rackspace-cloudbigdata", overrides); - ClusterApi api = cbdApi.getClusterApiForZone("ORD"); + ClusterApi api = cbdApi.getClusterApi("ORD"); CreateCluster createCluster = CreateCluster.builder() .name("slice") @@ -130,7 +130,7 @@ public class ClusterApiMockTest extends BaseCloudBigDataApiMockTest { try { CloudBigDataApi cbdApi = api(server.getUrl("/").toString(), "rackspace-cloudbigdata", overrides); - ClusterApi api = cbdApi.getClusterApiForZone("ORD"); + ClusterApi api = cbdApi.getClusterApi("ORD"); Cluster cluster = api.get("5"); @@ -168,7 +168,7 @@ public class ClusterApiMockTest extends BaseCloudBigDataApiMockTest { try { CloudBigDataApi cbdApi = api(server.getUrl("/").toString(), "rackspace-cloudbigdata", overrides); - ClusterApi api = cbdApi.getClusterApiForZone("ORD"); + ClusterApi api = cbdApi.getClusterApi("ORD"); Cluster cluster = api.get("5"); @@ -194,7 +194,7 @@ public class ClusterApiMockTest extends BaseCloudBigDataApiMockTest { try { CloudBigDataApi cbdApi = api(server.getUrl("/").toString(), "rackspace-cloudbigdata", overrides); - ClusterApi api = cbdApi.getClusterApiForZone("ORD"); + ClusterApi api = cbdApi.getClusterApi("ORD"); FluentIterable<Cluster> clusters = api.list(); @@ -234,7 +234,7 @@ public class ClusterApiMockTest extends BaseCloudBigDataApiMockTest { try { CloudBigDataApi cbdApi = api(server.getUrl("/").toString(), "rackspace-cloudbigdata", overrides); - ClusterApi api = cbdApi.getClusterApiForZone("ORD"); + ClusterApi api = cbdApi.getClusterApi("ORD"); FluentIterable<Cluster> clusters = api.list(); @@ -261,7 +261,7 @@ public class ClusterApiMockTest extends BaseCloudBigDataApiMockTest { try { CloudBigDataApi cbdApi = api(server.getUrl("/").toString(), "rackspace-cloudbigdata", overrides); - ClusterApi api = cbdApi.getClusterApiForZone("ORD"); + ClusterApi api = cbdApi.getClusterApi("ORD"); Cluster cluster = api.delete("5"); @@ -299,7 +299,7 @@ public class ClusterApiMockTest extends BaseCloudBigDataApiMockTest { try { CloudBigDataApi cbdApi = api(server.getUrl("/").toString(), "rackspace-cloudbigdata", overrides); - ClusterApi api = cbdApi.getClusterApiForZone("ORD"); + ClusterApi api = cbdApi.getClusterApi("ORD"); Cluster cluster = api.delete("5"); @@ -325,7 +325,7 @@ public class ClusterApiMockTest extends BaseCloudBigDataApiMockTest { try { CloudBigDataApi cbdApi = api(server.getUrl("/").toString(), "rackspace-cloudbigdata", overrides); - ClusterApi api = cbdApi.getClusterApiForZone("ORD"); + ClusterApi api = cbdApi.getClusterApi("ORD"); Cluster cluster = api.resize("5", 10); @@ -363,7 +363,7 @@ public class ClusterApiMockTest extends BaseCloudBigDataApiMockTest { try { CloudBigDataApi cbdApi = api(server.getUrl("/").toString(), "rackspace-cloudbigdata", overrides); - ClusterApi api = cbdApi.getClusterApiForZone("ORD"); + ClusterApi api = cbdApi.getClusterApi("ORD"); Cluster cluster = api.resize("5", 10); http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ProfileApiLiveTest.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ProfileApiLiveTest.java b/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ProfileApiLiveTest.java index ae5211e..0d2f325 100644 --- a/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ProfileApiLiveTest.java +++ b/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ProfileApiLiveTest.java @@ -36,14 +36,14 @@ import com.google.common.collect.ImmutableList; * Profile live test */ @Test(groups = "live", testName = "ProfileApiLiveTest", singleThreaded = true) -public class ProfileApiLiveTest extends BaseCloudBigDataApiLiveTest { +public class ProfileApiLiveTest extends BaseCloudBigDataApiLiveTest { @Override @BeforeClass(groups = { "integration", "live" }) public void setup() { super.setup(); - for (String zone : filterZones(api.getConfiguredZones())) { - ProfileApi profileApi = api.getProfileApiForZone(zone); + for (String region : filterRegions(api.getConfiguredRegions())) { + ProfileApi profileApi = api.getProfileApi(region); CreateProfile createProfile = CreateProfile.builder() .username("john.doe") @@ -67,8 +67,8 @@ public class ProfileApiLiveTest extends BaseCloudBigDataApiLiveTest { @Test public void updateProfile() { - for (String zone : filterZones(api.getConfiguredZones())) { - ProfileApi profileApi = api.getProfileApiForZone(zone); + for (String region : filterRegions(api.getConfiguredRegions())) { + ProfileApi profileApi = api.getProfileApi(region); CreateProfile createProfile = CreateProfile.builder() .username("john.doe2") @@ -88,11 +88,11 @@ public class ProfileApiLiveTest extends BaseCloudBigDataApiLiveTest { assertEquals(profile.getCredentialsUsername(), "jdoe"); } } - + @Test public void getProfile() { - for (String zone : filterZones(api.getConfiguredZones())) { - ProfileApi profileApi = api.getProfileApiForZone(zone); + for (String region : filterRegions(api.getConfiguredRegions())) { + ProfileApi profileApi = api.getProfileApi(region); Profile profile = profileApi.get(); http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ProfileApiMockTest.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ProfileApiMockTest.java b/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ProfileApiMockTest.java index 46a7e06..bbeea82 100644 --- a/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ProfileApiMockTest.java +++ b/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ProfileApiMockTest.java @@ -48,17 +48,17 @@ public class ProfileApiMockTest extends BaseCloudBigDataApiMockTest { try { CloudBigDataApi cbdApi = api(server.getUrl("/").toString(), "rackspace-cloudbigdata", overrides); - ProfileApi api = cbdApi.getProfileApiForZone("ORD"); + ProfileApi api = cbdApi.getProfileApi("ORD"); CreateProfile createProfile = CreateProfile.builder() .username("john.doe") .password("j0Hnd03") .sshKeys(ImmutableList.of(ProfileSSHKey.builder().name("t@test") - .publicKey("ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCtUFnkFrqDDCgEqW1akQkpMOX\n" + - "Owwvg73PLn5Z5QgvxjvJhRCg9ZTR/OWXpWcYqFVNagH4Zs8NOb9921TyQ+ydMnatOM\n" + - "haxMh1ZwTgaUcvndOF8fY+kcERiw1l0iT95w42F8IdUH42Z+8KihZM8gVsbMS6qYTi\n" + - "OM29WHX7y37wuJIzqf3N2TiVXrqfjwugvY/bZ+47EUn78uk6aPZYJGXdDgaFqnIXUV\n" + - "N+hRFYXgKnU0Ui0aQkuYwnAW8KmanLoNU2xodrb6/XqWnSAAmwl7aoGKFunQsT6xDW\n" + + .publicKey("ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCtUFnkFrqDDCgEqW1akQkpMOX\n" + + "Owwvg73PLn5Z5QgvxjvJhRCg9ZTR/OWXpWcYqFVNagH4Zs8NOb9921TyQ+ydMnatOM\n" + + "haxMh1ZwTgaUcvndOF8fY+kcERiw1l0iT95w42F8IdUH42Z+8KihZM8gVsbMS6qYTi\n" + + "OM29WHX7y37wuJIzqf3N2TiVXrqfjwugvY/bZ+47EUn78uk6aPZYJGXdDgaFqnIXUV\n" + + "N+hRFYXgKnU0Ui0aQkuYwnAW8KmanLoNU2xodrb6/XqWnSAAmwl7aoGKFunQsT6xDW\n" + "yQk+ncUHUcdofDUqgd3lXmHGrTmQW97vqexDEnhsJ+AwbLGD5dukr t@test") .build())) .credentialsUsername("jdoe") @@ -97,17 +97,17 @@ public class ProfileApiMockTest extends BaseCloudBigDataApiMockTest { try { CloudBigDataApi cbdApi = api(server.getUrl("/").toString(), "rackspace-cloudbigdata", overrides); - ProfileApi api = cbdApi.getProfileApiForZone("ORD"); + ProfileApi api = cbdApi.getProfileApi("ORD"); CreateProfile createProfile = CreateProfile.builder() .username("john.doe") .password("j0Hnd03") .sshKeys(ImmutableList.of(ProfileSSHKey.builder().name("t@test") - .publicKey("ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCtUFnkFrqDDCgEqW1akQkpMOX\n" + - "Owwvg73PLn5Z5QgvxjvJhRCg9ZTR/OWXpWcYqFVNagH4Zs8NOb9921TyQ+ydMnatOM\n" + - "haxMh1ZwTgaUcvndOF8fY+kcERiw1l0iT95w42F8IdUH42Z+8KihZM8gVsbMS6qYTi\n" + - "OM29WHX7y37wuJIzqf3N2TiVXrqfjwugvY/bZ+47EUn78uk6aPZYJGXdDgaFqnIXUV\n" + - "N+hRFYXgKnU0Ui0aQkuYwnAW8KmanLoNU2xodrb6/XqWnSAAmwl7aoGKFunQsT6xDW\n" + + .publicKey("ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCtUFnkFrqDDCgEqW1akQkpMOX\n" + + "Owwvg73PLn5Z5QgvxjvJhRCg9ZTR/OWXpWcYqFVNagH4Zs8NOb9921TyQ+ydMnatOM\n" + + "haxMh1ZwTgaUcvndOF8fY+kcERiw1l0iT95w42F8IdUH42Z+8KihZM8gVsbMS6qYTi\n" + + "OM29WHX7y37wuJIzqf3N2TiVXrqfjwugvY/bZ+47EUn78uk6aPZYJGXdDgaFqnIXUV\n" + + "N+hRFYXgKnU0Ui0aQkuYwnAW8KmanLoNU2xodrb6/XqWnSAAmwl7aoGKFunQsT6xDW\n" + "yQk+ncUHUcdofDUqgd3lXmHGrTmQW97vqexDEnhsJ+AwbLGD5dukr t@test") .build())) .credentialsUsername("jdoe") @@ -138,7 +138,7 @@ public class ProfileApiMockTest extends BaseCloudBigDataApiMockTest { try { CloudBigDataApi cbdApi = api(server.getUrl("/").toString(), "rackspace-cloudbigdata", overrides); - ProfileApi api = cbdApi.getProfileApiForZone("ORD"); + ProfileApi api = cbdApi.getProfileApi("ORD"); Profile profile = api.get(); /* @@ -171,7 +171,7 @@ public class ProfileApiMockTest extends BaseCloudBigDataApiMockTest { try { CloudBigDataApi cbdApi = api(server.getUrl("/").toString(), "rackspace-cloudbigdata", overrides); - ProfileApi api = cbdApi.getProfileApiForZone("ORD"); + ProfileApi api = cbdApi.getProfileApi("ORD"); Profile profile = api.get(); /* http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApi.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApi.java b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApi.java index e888725..2a0e50d 100644 --- a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApi.java +++ b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApi.java @@ -32,7 +32,7 @@ import com.google.common.annotations.Beta; * <p/> * Additionally, Cloud Files provides a simple yet powerful way to publish and distribute content * behind a Content Distribution Network. - * + * * @see CDNApi * @see SwiftApi */ @@ -41,21 +41,21 @@ public interface CloudFilesApi extends SwiftApi { /** * Provides access to Cloud Files CDN features. - * + * * @param region the region to access the CDN API. - * + * * @return the {@link CDNApi} for the specified region. */ @Delegate - CDNApi getCDNApiForRegion(@EndpointParam(parser = RegionToCDNEndpoint.class) @Nullable String region); + CDNApi getCDNApi(@EndpointParam(parser = RegionToCDNEndpoint.class) @Nullable String region); /** * Provides access to Cloud Files CDN features. - * + * * @param region the region to access the CDN API. - * + * * @return the {@link CDNApi} for the specified region. - * + * * @deprecated Please use {@link #getCDNApiForRegion(String)}. This method will be removed in jclouds 1.8. */ @Deprecated http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesAccountApiLiveTest.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesAccountApiLiveTest.java b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesAccountApiLiveTest.java index 8e57cf5..f91d2ba 100644 --- a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesAccountApiLiveTest.java +++ b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesAccountApiLiveTest.java @@ -36,8 +36,8 @@ public class CloudFilesAccountApiLiveTest extends AccountApiLiveTest { } public void testUrlKeyExists() throws Exception { - for (String regionId : regions) { - Account account = api.getAccountApiForRegion(regionId).get(); + for (String region : regions) { + Account account = api.getAccountApi(region).get(); assertTrue(account.getTemporaryUrlKey().isPresent()); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiLiveTest.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiLiveTest.java b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiLiveTest.java index 39e95cc..887033d 100644 --- a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiLiveTest.java +++ b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiLiveTest.java @@ -53,20 +53,20 @@ public class CloudFilesCDNApiLiveTest extends BaseCloudFilesApiLiveTest { } public void testEnable() throws Exception { - for (String regionId : regions) { - assertNotNull(api.getCDNApiForRegion(regionId).enable(name)); - - CDNContainer container = api.getCDNApiForRegion(regionId).get(name); + for (String region : regions) { + assertNotNull(api.getCDNApi(region).enable(name)); + + CDNContainer container = api.getCDNApi(region).get(name); assertCDNContainerNotNull(container); assertTrue(container.isEnabled()); } } public void testEnableWithTTL() throws Exception { - for (String regionId : regions) { - assertNotNull(api.getCDNApiForRegion(regionId).enable(name, 777777)); + for (String region : regions) { + assertNotNull(api.getCDNApi(region).enable(name, 777777)); - CDNContainer container = api.getCDNApiForRegion(regionId).get(name); + CDNContainer container = api.getCDNApi(region).get(name); assertCDNContainerNotNull(container); assertTrue(container.isEnabled()); assertTrue(container.getTtl() == 777777); @@ -74,19 +74,19 @@ public class CloudFilesCDNApiLiveTest extends BaseCloudFilesApiLiveTest { } public void testDisable() throws Exception { - for (String regionId : regions) { - assertTrue(api.getCDNApiForRegion(regionId).disable(name)); + for (String region : regions) { + assertTrue(api.getCDNApi(region).disable(name)); - CDNContainer container = api.getCDNApiForRegion(regionId).get(name); + CDNContainer container = api.getCDNApi(region).get(name); assertFalse(container.isEnabled()); } } public void testList() throws Exception { - for (String regionId : regions) { - List<CDNContainer> cdnResponse = api.getCDNApiForRegion(regionId).list().toList(); + for (String region : regions) { + List<CDNContainer> cdnResponse = api.getCDNApi(region).list().toList(); assertNotNull(cdnResponse); - + for (CDNContainer cdnContainer : cdnResponse) { assertCDNContainerNotNull(cdnContainer); assertTrue(cdnContainer.isEnabled()); @@ -96,35 +96,35 @@ public class CloudFilesCDNApiLiveTest extends BaseCloudFilesApiLiveTest { public void testListWithOptions() throws Exception { String lexicographicallyBeforeName = name.substring(0, name.length() - 1); - for (String regionId : regions) { + for (String region : regions) { ListCDNContainerOptions options = new ListCDNContainerOptions().marker(lexicographicallyBeforeName); - - CDNContainer cdnContainer = api.getCDNApiForRegion(regionId).list(options).get(0); + + CDNContainer cdnContainer = api.getCDNApi(region).list(options).get(0); assertCDNContainerNotNull(cdnContainer); assertTrue(cdnContainer.isEnabled()); } } public void testGet() throws Exception { - for (String regionId : regions) { - CDNContainer container = api.getCDNApiForRegion(regionId).get(name); + for (String region : regions) { + CDNContainer container = api.getCDNApi(region).get(name); assertCDNContainerNotNull(container); assertTrue(container.isEnabled()); } } public void testPurgeObject() throws Exception { - for (String regionId : regions) { + for (String region : regions) { String objectName = "testPurge"; Payload payload = Payloads.newByteSourcePayload(ByteSource.wrap(new byte[] {1, 2, 3})); - ObjectApi objectApi = api.getObjectApiForRegionAndContainer(regionId, name); - + ObjectApi objectApi = api.getObjectApiForContainer(region, name); + // create a new object objectApi.put(objectName, payload); - - CDNApi cdnApi = api.getCDNApiForRegion(regionId); + + CDNApi cdnApi = api.getCDNApi(region); assertTrue(cdnApi.purgeObject(name, "testPurge", ImmutableList.<String>of())); - + // delete the object objectApi.delete(objectName); assertNull(objectApi.get(objectName, GetOptions.NONE)); @@ -132,12 +132,12 @@ public class CloudFilesCDNApiLiveTest extends BaseCloudFilesApiLiveTest { } public void testUpdate() throws Exception { - for (String regionId : regions) { + for (String region : regions) { // enable with a ttl - assertNotNull(api.getCDNApiForRegion(regionId).enable(name, 777777)); - + assertNotNull(api.getCDNApi(region).enable(name, 777777)); + // now get the container - CDNContainer original = api.getCDNApiForRegion(regionId).get(name); + CDNContainer original = api.getCDNApi(region).get(name); assertTrue(original.isEnabled()); assertCDNContainerNotNull(original); @@ -147,13 +147,13 @@ public class CloudFilesCDNApiLiveTest extends BaseCloudFilesApiLiveTest { .logRetention(true) .enabled(false); // update the container - assertTrue(api.getCDNApiForRegion(regionId).update(name, opts)); - + assertTrue(api.getCDNApi(region).update(name, opts)); + // now get the updated container - CDNContainer updated = api.getCDNApiForRegion(regionId).get(name); + CDNContainer updated = api.getCDNApi(region).get(name); assertFalse(updated.isEnabled()); assertCDNContainerNotNull(updated); - + assertNotEquals(original.getTtl(), updated.getTtl()); assertTrue(updated.isLogRetentionEnabled()); } @@ -173,17 +173,17 @@ public class CloudFilesCDNApiLiveTest extends BaseCloudFilesApiLiveTest { @BeforeClass(groups = "live") public void setup() { super.setup(); - for (String regionId : regions) { - api.getContainerApiForRegion(regionId).create(name); + for (String region : regions) { + api.getContainerApi(region).create(name); } } @Override @AfterClass(groups = "live") public void tearDown() { - for (String regionId : regions) { - api.getCDNApiForRegion(regionId).disable(name); - api.getContainerApiForRegion(regionId).deleteIfEmpty(name); + for (String region : regions) { + api.getCDNApi(region).disable(name); + api.getContainerApi(region).deleteIfEmpty(name); } super.tearDown(); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiMockTest.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiMockTest.java b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiMockTest.java index de55058..a3fa13c 100644 --- a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiMockTest.java +++ b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiMockTest.java @@ -61,7 +61,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp try { CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); - CDNApi cdnApi = api.getCDNApiForRegion("DFW"); + CDNApi cdnApi = api.getCDNApi("DFW"); ImmutableList<CDNContainer> cdnContainers = cdnApi.list().toList(); @@ -82,7 +82,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp try { CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); - CDNApi cdnApi = api.getCDNApiForRegion("DFW"); + CDNApi cdnApi = api.getCDNApi("DFW"); List<CDNContainer> cdnContainers = cdnApi.list().toList(); @@ -104,7 +104,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp try { CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); ListCDNContainerOptions options = new ListCDNContainerOptions().marker("cdn-container-3"); - ImmutableList<CDNContainer> containers = api.getCDNApiForRegion("DFW").list(options).toList(); + ImmutableList<CDNContainer> containers = api.getCDNApi("DFW").list(options).toList(); for (CDNContainer container : containers) { assertCDNContainerNotNull(container); @@ -128,7 +128,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp try { CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); ListCDNContainerOptions options = ListCDNContainerOptions.Builder.marker("cdn-container-3"); - FluentIterable<CDNContainer> containers = api.getCDNApiForRegion("DFW").list(options); + FluentIterable<CDNContainer> containers = api.getCDNApi("DFW").list(options); assertEquals(server.getRequestCount(), 2); assertAuthentication(server); @@ -150,7 +150,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); // enable a CDN Container - URI enabledContainer = api.getCDNApiForRegion("DFW").enable("container-1"); + URI enabledContainer = api.getCDNApi("DFW").enable("container-1"); assertNotNull(enabledContainer); assertEquals(server.getRequestCount(), 2); @@ -165,11 +165,11 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); server.enqueue(addCommonHeaders(enabledResponse().setResponseCode(404))); - + try { CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); // enable a CDN Container - assertNull(api.getCDNApiForRegion("DFW").enable("container-1")); + assertNull(api.getCDNApi("DFW").enable("container-1")); assertEquals(server.getRequestCount(), 2); assertAuthentication(server); @@ -188,7 +188,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); // enable a CDN Container with a TTL - URI enabledContainer = api.getCDNApiForRegion("DFW").enable("container-1", 777777); + URI enabledContainer = api.getCDNApi("DFW").enable("container-1", 777777); assertNotNull(enabledContainer); assertEquals(server.getRequestCount(), 2); @@ -208,7 +208,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); // enable a CDN Container with a TTL - URI enabledContainer = api.getCDNApiForRegion("DFW").enable("container-1", 777777); + URI enabledContainer = api.getCDNApi("DFW").enable("container-1", 777777); assertNull(enabledContainer); assertEquals(server.getRequestCount(), 2); @@ -228,7 +228,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); // disable a CDN Container - assertTrue(api.getCDNApiForRegion("DFW").disable("container-1")); + assertTrue(api.getCDNApi("DFW").disable("container-1")); assertEquals(server.getRequestCount(), 2); assertAuthentication(server); @@ -247,7 +247,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); // disable a CDN Container - boolean disbledContainer = api.getCDNApiForRegion("DFW").disable("container-1"); + boolean disbledContainer = api.getCDNApi("DFW").disable("container-1"); assertFalse(disbledContainer); assertEquals(server.getRequestCount(), 2); @@ -262,11 +262,11 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); server.enqueue(addCommonHeaders(enabledResponse().setResponseCode(201))); - + try { CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); - CDNContainer cdnContainer = api.getCDNApiForRegion("DFW").get("container-1"); + CDNContainer cdnContainer = api.getCDNApi("DFW").get("container-1"); assertCDNContainerNotNull(cdnContainer); assertEquals(mockCDNContainer, cdnContainer); @@ -286,7 +286,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp try { CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); - CDNContainer cdnContainer = api.getCDNApiForRegion("DFW").get("cdn-container with spaces"); + CDNContainer cdnContainer = api.getCDNApi("DFW").get("cdn-container with spaces"); assertCDNContainerNotNull(cdnContainer); assertEquals(mockCDNContainerWithSpaces, cdnContainer); @@ -306,7 +306,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp try { CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); - CDNContainer cdnContainer = api.getCDNApiForRegion("DFW").get("container-1"); + CDNContainer cdnContainer = api.getCDNApi("DFW").get("container-1"); assertAuthentication(server); assertRequest(server.takeRequest(), "HEAD", "/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/container-1"); @@ -325,7 +325,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); // purge the object - assertTrue(api.getCDNApiForRegion("DFW").purgeObject("myContainer", "myObject", emails)); + assertTrue(api.getCDNApi("DFW").purgeObject("myContainer", "myObject", emails)); assertEquals(server.getRequestCount(), 2); assertAuthentication(server); @@ -344,7 +344,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); // purge the object - assertFalse(api.getCDNApiForRegion("DFW").purgeObject("myContainer", "myObject", emails)); + assertFalse(api.getCDNApi("DFW").purgeObject("myContainer", "myObject", emails)); assertEquals(server.getRequestCount(), 2); assertAuthentication(server); @@ -364,13 +364,13 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp try { CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); - CDNContainer cdnContainer = api.getCDNApiForRegion("DFW").get("container-1"); + CDNContainer cdnContainer = api.getCDNApi("DFW").get("container-1"); assertCDNContainerNotNull(cdnContainer); // update the CDN Container - assertTrue(api.getCDNApiForRegion("DFW").update("container-1", enabled(false).logRetention(true).ttl(7654321))); + assertTrue(api.getCDNApi("DFW").update("container-1", enabled(false).logRetention(true).ttl(7654321))); - cdnContainer = api.getCDNApiForRegion("DFW").get("container-1"); + cdnContainer = api.getCDNApi("DFW").get("container-1"); assertCDNContainerNotNull(cdnContainer); CDNContainer updatedContainer = CDNContainer.builder() @@ -405,11 +405,11 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp try { CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); - CDNContainer cdnContainer = api.getCDNApiForRegion("DFW").get("container-1"); + CDNContainer cdnContainer = api.getCDNApi("DFW").get("container-1"); assertCDNContainerNotNull(cdnContainer); // update the CDN Container - assertFalse(api.getCDNApiForRegion("DFW").update("container-1", enabled(false).logRetention(true).ttl(7654321))); + assertFalse(api.getCDNApi("DFW").update("container-1", enabled(false).logRetention(true).ttl(7654321))); assertEquals(server.getRequestCount(), 3); assertAuthentication(server); http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/rackspace-cloudqueues-uk/src/main/java/org/jclouds/rackspace/cloudqueues/uk/CloudQueuesUKProviderMetadata.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudqueues-uk/src/main/java/org/jclouds/rackspace/cloudqueues/uk/CloudQueuesUKProviderMetadata.java b/rackspace-cloudqueues-uk/src/main/java/org/jclouds/rackspace/cloudqueues/uk/CloudQueuesUKProviderMetadata.java index cd4f446..35fad47 100644 --- a/rackspace-cloudqueues-uk/src/main/java/org/jclouds/rackspace/cloudqueues/uk/CloudQueuesUKProviderMetadata.java +++ b/rackspace-cloudqueues-uk/src/main/java/org/jclouds/rackspace/cloudqueues/uk/CloudQueuesUKProviderMetadata.java @@ -16,9 +16,16 @@ */ package org.jclouds.rackspace.cloudqueues.uk; -import com.google.common.collect.ImmutableSet; -import com.google.inject.Module; -import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.ZoneModule; +import static org.jclouds.location.reference.LocationConstants.ISO3166_CODES; +import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGION; +import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGIONS; +import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE; +import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE; + +import java.net.URI; +import java.util.Properties; + +import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.RegionModule; import org.jclouds.openstack.marconi.v1.MarconiApiMetadata; import org.jclouds.openstack.marconi.v1.config.MarconiHttpApiModule; import org.jclouds.openstack.marconi.v1.config.MarconiTypeAdapters; @@ -29,14 +36,8 @@ import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticati import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule; import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes; -import java.net.URI; -import java.util.Properties; - -import static org.jclouds.location.reference.LocationConstants.ISO3166_CODES; -import static org.jclouds.location.reference.LocationConstants.PROPERTY_ZONE; -import static org.jclouds.location.reference.LocationConstants.PROPERTY_ZONES; -import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE; -import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE; +import com.google.common.collect.ImmutableSet; +import com.google.inject.Module; /** * Implementation of Rackspace Cloud Queues. @@ -64,12 +65,12 @@ public class CloudQueuesUKProviderMetadata extends BaseProviderMetadata { Properties properties = new Properties(); properties.setProperty(CREDENTIAL_TYPE, CloudIdentityCredentialTypes.API_KEY_CREDENTIALS); properties.setProperty(SERVICE_TYPE, ServiceType.QUEUES); - properties.setProperty(PROPERTY_ZONES, "LON"); - properties.setProperty(PROPERTY_ZONE + ".LON." + ISO3166_CODES, "GB-SLG"); + properties.setProperty(PROPERTY_REGIONS, "LON"); + properties.setProperty(PROPERTY_REGION + ".LON." + ISO3166_CODES, "GB-SLG"); return properties; } - + public static class Builder extends BaseProviderMetadata.Builder { protected Builder(){ @@ -84,7 +85,7 @@ public class CloudQueuesUKProviderMetadata extends BaseProviderMetadata { .defaultModules(ImmutableSet.<Class<? extends Module>>builder() .add(CloudIdentityAuthenticationApiModule.class) .add(CloudIdentityAuthenticationModule.class) - .add(ZoneModule.class) + .add(RegionModule.class) .add(MarconiTypeAdapters.class) .add(MarconiHttpApiModule.class).build()) .build()) http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/rackspace-cloudqueues-us/src/main/java/org/jclouds/rackspace/cloudqueues/us/CloudQueuesUSProviderMetadata.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudqueues-us/src/main/java/org/jclouds/rackspace/cloudqueues/us/CloudQueuesUSProviderMetadata.java b/rackspace-cloudqueues-us/src/main/java/org/jclouds/rackspace/cloudqueues/us/CloudQueuesUSProviderMetadata.java index 00aa0aa..f50fbd5 100644 --- a/rackspace-cloudqueues-us/src/main/java/org/jclouds/rackspace/cloudqueues/us/CloudQueuesUSProviderMetadata.java +++ b/rackspace-cloudqueues-us/src/main/java/org/jclouds/rackspace/cloudqueues/us/CloudQueuesUSProviderMetadata.java @@ -16,9 +16,16 @@ */ package org.jclouds.rackspace.cloudqueues.us; -import com.google.common.collect.ImmutableSet; -import com.google.inject.Module; -import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.ZoneModule; +import static org.jclouds.location.reference.LocationConstants.ISO3166_CODES; +import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGION; +import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGIONS; +import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE; +import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE; + +import java.net.URI; +import java.util.Properties; + +import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.RegionModule; import org.jclouds.openstack.marconi.v1.MarconiApiMetadata; import org.jclouds.openstack.marconi.v1.config.MarconiHttpApiModule; import org.jclouds.openstack.marconi.v1.config.MarconiTypeAdapters; @@ -29,14 +36,8 @@ import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticati import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule; import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes; -import java.net.URI; -import java.util.Properties; - -import static org.jclouds.location.reference.LocationConstants.ISO3166_CODES; -import static org.jclouds.location.reference.LocationConstants.PROPERTY_ZONE; -import static org.jclouds.location.reference.LocationConstants.PROPERTY_ZONES; -import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE; -import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE; +import com.google.common.collect.ImmutableSet; +import com.google.inject.Module; /** * Implementation of Rackspace Cloud Queues. @@ -65,16 +66,16 @@ public class CloudQueuesUSProviderMetadata extends BaseProviderMetadata { properties.setProperty(CREDENTIAL_TYPE, CloudIdentityCredentialTypes.API_KEY_CREDENTIALS); properties.setProperty(SERVICE_TYPE, ServiceType.QUEUES); - properties.setProperty(PROPERTY_ZONES, "ORD,DFW,IAD,SYD,HKG"); - properties.setProperty(PROPERTY_ZONE + ".ORD." + ISO3166_CODES, "US-IL"); - properties.setProperty(PROPERTY_ZONE + ".DFW." + ISO3166_CODES, "US-TX"); - properties.setProperty(PROPERTY_ZONE + ".IAD." + ISO3166_CODES, "US-VA"); - properties.setProperty(PROPERTY_ZONE + ".SYD." + ISO3166_CODES, "AU-NSW"); - properties.setProperty(PROPERTY_ZONE + ".HKG." + ISO3166_CODES, "HK"); + properties.setProperty(PROPERTY_REGIONS, "ORD,DFW,IAD,SYD,HKG"); + properties.setProperty(PROPERTY_REGION + ".ORD." + ISO3166_CODES, "US-IL"); + properties.setProperty(PROPERTY_REGION + ".DFW." + ISO3166_CODES, "US-TX"); + properties.setProperty(PROPERTY_REGION + ".IAD." + ISO3166_CODES, "US-VA"); + properties.setProperty(PROPERTY_REGION + ".SYD." + ISO3166_CODES, "AU-NSW"); + properties.setProperty(PROPERTY_REGION + ".HKG." + ISO3166_CODES, "HK"); return properties; } - + public static class Builder extends BaseProviderMetadata.Builder { protected Builder(){ @@ -89,7 +90,7 @@ public class CloudQueuesUSProviderMetadata extends BaseProviderMetadata { .defaultModules(ImmutableSet.<Class<? extends Module>>builder() .add(CloudIdentityAuthenticationApiModule.class) .add(CloudIdentityAuthenticationModule.class) - .add(ZoneModule.class) + .add(RegionModule.class) .add(MarconiTypeAdapters.class) .add(MarconiHttpApiModule.class).build()) .build())
