You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by jd...@apache.org on 2014/08/13 18:59:42 UTC
[03/12] Prefer Regions to Zones in OpenStack APIs
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApi.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApi.java
index 82938f7..090c42f 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApi.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApi.java
@@ -18,12 +18,13 @@ package org.jclouds.rackspace.cloudloadbalancers.v1;
import java.io.Closeable;
import java.util.Set;
+
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
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.cloudloadbalancers.v1.features.AccessRuleApi;
import org.jclouds.rackspace.cloudloadbalancers.v1.features.ConnectionApi;
import org.jclouds.rackspace.cloudloadbalancers.v1.features.ContentCachingApi;
@@ -46,95 +47,220 @@ import com.google.inject.Provides;
*/
public interface CloudLoadBalancersApi extends Closeable {
/**
+ * @return the Region codes configured
+ */
+ @Provides
+ @Region
+ Set<String> getConfiguredRegions();
+
+ /**
+ * Provides access to Load Balancer features.
+ */
+ @Delegate
+ LoadBalancerApi getLoadBalancerApi(
+ @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+
+ /**
+ * Provides access to Node features.
+ */
+ @Delegate
+ @Path("/loadbalancers/{lbId}")
+ NodeApi getNodeApi(
+ @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, @PathParam("lbId") int lbId);
+
+ /**
+ * Provides access to Access Rule features.
+ */
+ @Delegate
+ @Path("/loadbalancers/{lbId}")
+ AccessRuleApi getAccessRuleApi(
+ @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, @PathParam("lbId") int lbId);
+
+ /**
+ * Provides access to Virtual IP features.
+ */
+ @Delegate
+ @Path("/loadbalancers/{lbId}")
+ VirtualIPApi getVirtualIPApi(
+ @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, @PathParam("lbId") int lbId);
+
+ /**
+ * Provides access to Connection features.
+ */
+ @Delegate
+ @Path("/loadbalancers/{lbId}")
+ ConnectionApi getConnectionApi(
+ @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, @PathParam("lbId") int lbId);
+
+ /**
+ * Provides access to Health Monitor features.
+ */
+ @Delegate
+ @Path("/loadbalancers/{lbId}")
+ HealthMonitorApi getHealthMonitorApi(
+ @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, @PathParam("lbId") int lbId);
+
+ /**
+ * Provides access to Session Persistence features.
+ */
+ @Delegate
+ @Path("/loadbalancers/{lbId}")
+ SessionPersistenceApi getSessionPersistenceApi(
+ @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, @PathParam("lbId") int lbId);
+
+ /**
+ * Provides access to Content Caching features.
+ */
+ @Delegate
+ @Path("/loadbalancers/{lbId}")
+ ContentCachingApi getContentCachingApi(
+ @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, @PathParam("lbId") int lbId);
+
+ /**
+ * Provides access to SSL Termination features.
+ */
+ @Delegate
+ @Path("/loadbalancers/{lbId}")
+ SSLTerminationApi getSSLTerminationApi(
+ @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, @PathParam("lbId") int lbId);
+
+ /**
+ * Provides access to Error Page features.
+ */
+ @Delegate
+ @Path("/loadbalancers/{lbId}")
+ ErrorPageApi getErrorPageApi(
+ @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, @PathParam("lbId") int lbId);
+
+ /**
+ * Provides access to Report features.
+ */
+ @Delegate
+ ReportApi getReportApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+
+ /**
* @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 Load Balancer features.
+ * @deprecated Please use {@link #getLoadBalancerApi(String region)} as this method will be removed in jclouds 3.0.
*/
+ @Deprecated
@Delegate
LoadBalancerApi getLoadBalancerApiForZone(
- @EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone);
-
+ @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone);
+
/**
* Provides access to Node features.
+ * @deprecated Please use {@link #getNodeApiForLoadBalancer(String region. int lbId)} as this method will be removed
+ * in jclouds 3.0.
*/
+ @Deprecated
@Delegate
@Path("/loadbalancers/{lbId}")
NodeApi getNodeApiForZoneAndLoadBalancer(
- @EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone, @PathParam("lbId") int lbId);
+ @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone, @PathParam("lbId") int lbId);
/**
* Provides access to Access Rule features.
+ * @deprecated Please use {@link #getAccessRuleApi(String region, int lbId)} as this method will be
+ * removed in jclouds 3.0.
*/
+ @Deprecated
@Delegate
@Path("/loadbalancers/{lbId}")
AccessRuleApi getAccessRuleApiForZoneAndLoadBalancer(
- @EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone, @PathParam("lbId") int lbId);
+ @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone, @PathParam("lbId") int lbId);
/**
* Provides access to Virtual IP features.
+ * @deprecated Please use {@link #getVirtualIPApi(String region, int lbId)} as this method will be
+ * removed in jclouds 3.0.
*/
+ @Deprecated
@Delegate
@Path("/loadbalancers/{lbId}")
VirtualIPApi getVirtualIPApiForZoneAndLoadBalancer(
- @EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone, @PathParam("lbId") int lbId);
+ @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone, @PathParam("lbId") int lbId);
/**
* Provides access to Connection features.
+ * @deprecated Please use {@link #getConnectionApi(String region, int lbId)} as this method will be
+ * removed in jclouds 3.0.
*/
+ @Deprecated
@Delegate
@Path("/loadbalancers/{lbId}")
ConnectionApi getConnectionApiForZoneAndLoadBalancer(
- @EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone, @PathParam("lbId") int lbId);
+ @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone, @PathParam("lbId") int lbId);
/**
* Provides access to Health Monitor features.
+ * @deprecated Please use {@link #getHealthMonitorApi(String region, int lbId)} as this method will be
+ * removed in jclouds 3.0.
*/
+ @Deprecated
@Delegate
@Path("/loadbalancers/{lbId}")
HealthMonitorApi getHealthMonitorApiForZoneAndLoadBalancer(
- @EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone, @PathParam("lbId") int lbId);
+ @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone, @PathParam("lbId") int lbId);
/**
* Provides access to Session Persistence features.
+ * @deprecated Please use {@link #getSessionPersistenceApi(String region, int lbId)} as this method
+ * will be removed in jclouds 3.0.
*/
+ @Deprecated
@Delegate
@Path("/loadbalancers/{lbId}")
SessionPersistenceApi getSessionPersistenceApiForZoneAndLoadBalancer(
- @EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone, @PathParam("lbId") int lbId);
+ @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone, @PathParam("lbId") int lbId);
/**
* Provides access to Content Caching features.
+ * @deprecated Please use {@link #getContentCachingApi(String region, int lbId)} as this method
+ * will be removed in jclouds 3.0.
*/
+ @Deprecated
@Delegate
@Path("/loadbalancers/{lbId}")
ContentCachingApi getContentCachingApiForZoneAndLoadBalancer(
- @EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone, @PathParam("lbId") int lbId);
+ @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone, @PathParam("lbId") int lbId);
/**
* Provides access to SSL Termination features.
+ * @deprecated Please use {@link #getSSLTerminationApi(String region, int lbId)} as this method
+ * will be removed in jclouds 3.0.
*/
+ @Deprecated
@Delegate
@Path("/loadbalancers/{lbId}")
SSLTerminationApi getSSLTerminationApiForZoneAndLoadBalancer(
- @EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone, @PathParam("lbId") int lbId);
+ @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone, @PathParam("lbId") int lbId);
/**
* Provides access to Error Page features.
+ * @deprecated Please use {@link #getErrorPageApi(String region, int lbId)} as this method
+ * will be removed in jclouds 3.0.
*/
+ @Deprecated
@Delegate
@Path("/loadbalancers/{lbId}")
ErrorPageApi getErrorPageApiForZoneAndLoadBalancer(
- @EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone, @PathParam("lbId") int lbId);
+ @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone, @PathParam("lbId") int lbId);
/**
* Provides access to Report features.
+ * @deprecated Please use {@link #getReportApi(String region)} as this method will be removed in jclouds 3.0.
*/
+ @Deprecated
@Delegate
ReportApi getReportApiForZone(
- @EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone);
+ @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApiMetadata.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApiMetadata.java
index 57d2480..16cc2e7 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApiMetadata.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApiMetadata.java
@@ -23,7 +23,7 @@ import java.net.URI;
import java.util.Properties;
import org.jclouds.loadbalancer.LoadBalancerServiceContext;
-import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.ZoneModule;
+import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.RegionModule;
import org.jclouds.rackspace.cloudidentity.v2_0.ServiceType;
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationApiModule;
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule;
@@ -35,7 +35,7 @@ import org.jclouds.rest.internal.BaseHttpApiMetadata;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
/**
- * Implementation of {@link ApiMetadata} for CloudLoadBalancers 1.0 API
+ * Implementation of {@link org.jclouds.apis.ApiMetadata} for the Rackspace Cloud Load Balancers v1.0 API.
*/
public class CloudLoadBalancersApiMetadata extends BaseHttpApiMetadata<CloudLoadBalancersApi> {
@@ -74,7 +74,7 @@ public class CloudLoadBalancersApiMetadata extends BaseHttpApiMetadata<CloudLoad
.defaultModules(ImmutableSet.<Class<? extends Module>>builder()
.add(CloudIdentityAuthenticationApiModule.class)
.add(CloudIdentityAuthenticationModule.class)
- .add(ZoneModule.class)
+ .add(RegionModule.class)
.add(CloudLoadBalancersHttpApiModule.class)
.add(CloudLoadBalancersLoadBalancerContextModule.class).build());
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancerUsages.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancerUsages.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancerUsages.java
index 5cbc338..900633f 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancerUsages.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancerUsages.java
@@ -69,9 +69,9 @@ public class ParseLoadBalancerUsages extends ParseJson<LoadBalancerUsages> {
@Override
protected Function<Object, IterableWithMarker<LoadBalancerUsage>> markerToNextForArg0(Optional<Object> arg0) {
- String zone = arg0.get().toString();
- final ReportApi reportApi = api.getReportApiForZone(zone);
-
+ String region = arg0.get().toString();
+ final ReportApi reportApi = api.getReportApi(region);
+
return new Function<Object, IterableWithMarker<LoadBalancerUsage>>() {
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancers.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancers.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancers.java
index bf10d7d..92c1087 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancers.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancers.java
@@ -60,13 +60,13 @@ public class ParseLoadBalancers implements Function<HttpResponse, IterableWithMa
@Override
public IterableWithMarker<LoadBalancer> apply(HttpResponse arg0) {
LoadBalancers lbs = json.apply(arg0);
-
+
if (lbs.size() == 0)
return IterableWithMarkers.EMPTY;
-
- Iterable<LoadBalancer> transform = Iterables.transform(lbs, convertLB);
+
+ Iterable<LoadBalancer> transform = Iterables.transform(lbs, convertLB);
IterableWithMarker<LoadBalancer> iterableWithMarker = IterableWithMarkers.from(transform);
-
+
return iterableWithMarker;
}
@@ -77,9 +77,9 @@ public class ParseLoadBalancers implements Function<HttpResponse, IterableWithMa
ParseLoadBalancers setEndpointAndRegion(URI endpoint) {
String region = endpoint.getHost().substring(0, endpoint.getHost().indexOf('.'));
-
+
this.convertLB = factory.createForEndpointAndRegion(endpoint, region);
-
+
return this;
}
@@ -103,9 +103,9 @@ public class ParseLoadBalancers implements Function<HttpResponse, IterableWithMa
@Override
protected Function<Object, IterableWithMarker<LoadBalancer>> markerToNextForArg0(Optional<Object> arg0) {
- String zone = arg0.get().toString();
- final LoadBalancerApi loadBalancerApi = api.getLoadBalancerApiForZone(zone);
-
+ String region = arg0.get().toString();
+ final LoadBalancerApi loadBalancerApi = api.getLoadBalancerApi(region);
+
return new Function<Object, IterableWithMarker<LoadBalancer>>() {
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNodes.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNodes.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNodes.java
index 16a561a..68a586b 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNodes.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNodes.java
@@ -76,17 +76,17 @@ public class ParseNodes extends ParseJson<Nodes> {
String path = request.getEndpoint().getPath();
int lastSlash = path.lastIndexOf('/');
int secondLastSlash = path.lastIndexOf('/', lastSlash - 1);
-
+
lbId = Integer.valueOf(path.substring(secondLastSlash + 1, lastSlash));
-
+
return super.setContext(request);
}
@Override
protected Function<Object, IterableWithMarker<Node>> markerToNextForArg0(Optional<Object> arg0) {
- String zone = arg0.get().toString();
- final NodeApi nodeApi = api.getNodeApiForZoneAndLoadBalancer(zone, lbId);
-
+ String region = arg0.get().toString();
+ final NodeApi nodeApi = api.getNodeApi(region, lbId);
+
return new Function<Object, IterableWithMarker<Node>>() {
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersDestroyLoadBalancerStrategy.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersDestroyLoadBalancerStrategy.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersDestroyLoadBalancerStrategy.java
index d09d57b..f795c6d 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersDestroyLoadBalancerStrategy.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersDestroyLoadBalancerStrategy.java
@@ -51,7 +51,7 @@ public class CloudLoadBalancersDestroyLoadBalancerStrategy implements DestroyLoa
String[] parts = checkNotNull(id, "id").split("/");
String region = parts[0];
int lbId = Integer.parseInt(parts[1]);
- client.getLoadBalancerApiForZone(region).delete(lbId);
+ client.getLoadBalancerApi(region).delete(lbId);
return getLoadBalancer.getLoadBalancer(id);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersGetLoadBalancerMetadataStrategy.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersGetLoadBalancerMetadataStrategy.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersGetLoadBalancerMetadataStrategy.java
index 5fd96e6..18fc18a 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersGetLoadBalancerMetadataStrategy.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersGetLoadBalancerMetadataStrategy.java
@@ -46,7 +46,7 @@ public class CloudLoadBalancersGetLoadBalancerMetadataStrategy implements GetLoa
String[] parts = checkNotNull(id, "id").split("/");
String region = parts[0];
int lbId = Integer.parseInt(parts[1]);
- return converter.apply(client.getLoadBalancerApiForZone(region).get(lbId));
+ return converter.apply(client.getLoadBalancerApi(region).get(lbId));
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersListLoadBalancersStrategy.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersListLoadBalancersStrategy.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersListLoadBalancersStrategy.java
index bc1ca36..8cc090e 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersListLoadBalancersStrategy.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersListLoadBalancersStrategy.java
@@ -25,7 +25,7 @@ import javax.inject.Singleton;
import org.jclouds.loadbalancer.domain.LoadBalancerMetadata;
import org.jclouds.loadbalancer.strategy.ListLoadBalancersStrategy;
-import org.jclouds.location.Zone;
+import org.jclouds.location.Region;
import org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApi;
import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer;
@@ -39,21 +39,21 @@ public class CloudLoadBalancersListLoadBalancersStrategy implements ListLoadBala
private final CloudLoadBalancersApi aclient;
private final Function<LoadBalancer, LoadBalancerMetadata> converter;
- private final Supplier<Set<String>> zones;
+ private final Supplier<Set<String>> regions;
@Inject
protected CloudLoadBalancersListLoadBalancersStrategy(CloudLoadBalancersApi aclient,
- Function<LoadBalancer, LoadBalancerMetadata> converter, @Zone Supplier<Set<String>> zones) {
+ Function<LoadBalancer, LoadBalancerMetadata> converter, @Region Supplier<Set<String>> regions) {
this.aclient = checkNotNull(aclient, "aclient");
- this.zones = checkNotNull(zones, "zones");
+ this.regions = checkNotNull(regions, "regions");
this.converter = checkNotNull(converter, "converter");
}
@Override
public Iterable<? extends LoadBalancerMetadata> listLoadBalancers() {
Builder<LoadBalancerMetadata> loadBalancers = ImmutableSet.<LoadBalancerMetadata> builder();
- for (String zone : zones.get()) { // TODO: parallel
- loadBalancers.addAll(aclient.getLoadBalancerApiForZone(zone).list().concat().transform(converter));
+ for (String region : regions.get()) { // TODO: parallel
+ loadBalancers.addAll(aclient.getLoadBalancerApi(region).list().concat().transform(converter));
}
return loadBalancers.build();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersLoadBalanceNodesStrategy.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersLoadBalanceNodesStrategy.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersLoadBalanceNodesStrategy.java
index 107484a..dd5e7da 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersLoadBalanceNodesStrategy.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersLoadBalanceNodesStrategy.java
@@ -60,7 +60,7 @@ public class CloudLoadBalancersLoadBalanceNodesStrategy implements LoadBalanceNo
String region = checkNotNull(location, "location").getId();
// TODO need to query and update the LB per current design.
- LoadBalancer lb = client.getLoadBalancerApiForZone(region).create(
+ LoadBalancer lb = client.getLoadBalancerApi(region).create(
CreateLoadBalancer.builder().name(name).protocol(protocol.toUpperCase()).port(loadBalancerPort)
.virtualIPType(Type.PUBLIC).nodes(
Iterables.transform(nodes, new Function<NodeMetadata, AddNode>() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/predicates/LoadBalancerPredicates.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/predicates/LoadBalancerPredicates.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/predicates/LoadBalancerPredicates.java
index 26fc01c..319c9ba 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/predicates/LoadBalancerPredicates.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/predicates/LoadBalancerPredicates.java
@@ -33,24 +33,24 @@ import com.google.common.base.Predicate;
* <pre>
* {@code
* LoadBalancer loadBalancer = loadBalancerApi.create(loadBalancerRequest);
- *
+ *
* RetryablePredicate<String> awaitAvailable = RetryablePredicate.create(
* LoadBalancerPredicates.available(loadBalancerApi), 600, 10, 10, TimeUnit.SECONDS);
- *
+ *
* if (!awaitAvailable.apply(loadBalancer)) {
- * throw new TimeoutException("Timeout on loadBalancer: " + loadBalancer);
- * }
+ * throw new TimeoutException("Timeout on loadBalancer: " + loadBalancer);
+ * }
* }
* </pre>
- *
+ *
* You can also use the static convenience methods as so.
* <br/>
* <pre>
* {@code
* LoadBalancer loadBalancer = loadBalancerApi.create(loadBalancerRequest);
- *
+ *
* if (!LoadBalancerPredicates.awaitAvailable(loadBalancerApi).apply(loadBalancer)) {
- * throw new TimeoutException("Timeout on loadBalancer: " + loadBalancer);
+ * throw new TimeoutException("Timeout on loadBalancer: " + loadBalancer);
* }
* }
* </pre>
@@ -58,33 +58,33 @@ import com.google.common.base.Predicate;
public class LoadBalancerPredicates {
/**
* Wait until a LoadBalancer is Available.
- *
- * @param loadBalancerApi The LoadBalancerApi in the zone where your LoadBalancer resides.
+ *
+ * @param loadBalancerApi The LoadBalancerApi in the region where your LoadBalancer resides.
* @return RetryablePredicate That will check the status every 3 seconds for a maxiumum of 5 minutes.
*/
public static Predicate<LoadBalancer> awaitAvailable(LoadBalancerApi loadBalancerApi) {
StatusUpdatedPredicate statusPredicate = new StatusUpdatedPredicate(loadBalancerApi, LoadBalancer.Status.ACTIVE);
return retry(statusPredicate, 300, 3, 3, SECONDS);
}
-
+
/**
* Wait until a LoadBalancer no longer exists.
- *
- * @param loadBalancerApi The LoadBalancerApi in the zone where your LoadBalancer resides.
- * @return RetryablePredicate That will check the whether the LoadBalancer exists
+ *
+ * @param loadBalancerApi The LoadBalancerApi in the region where your LoadBalancer resides.
+ * @return RetryablePredicate That will check the whether the LoadBalancer exists
* every 3 seconds for a maxiumum of 5 minutes.
*/
public static Predicate<LoadBalancer> awaitDeleted(LoadBalancerApi loadBalancerApi) {
DeletedPredicate deletedPredicate = new DeletedPredicate(loadBalancerApi);
return retry(deletedPredicate, 300, 3, 3, SECONDS);
}
-
+
public static Predicate<LoadBalancer> awaitStatus(
LoadBalancerApi loadBalancerApi, LoadBalancer.Status status, long maxWaitInSec, long periodInSec) {
StatusUpdatedPredicate statusPredicate = new StatusUpdatedPredicate(loadBalancerApi, status);
return retry(statusPredicate, maxWaitInSec, periodInSec, periodInSec, SECONDS);
}
-
+
private static class StatusUpdatedPredicate implements Predicate<LoadBalancer> {
private LoadBalancerApi loadBalancerApi;
private LoadBalancer.Status status;
@@ -100,10 +100,10 @@ public class LoadBalancerPredicates {
@Override
public boolean apply(LoadBalancer loadBalancer) {
checkNotNull(loadBalancer, "loadBalancer must be defined");
-
+
LoadBalancer loadBalancerUpdated = loadBalancerApi.get(loadBalancer.getId());
checkNotNull(loadBalancerUpdated, "LoadBalancer %s not found.", loadBalancer.getId());
-
+
return status.equals(loadBalancerUpdated.getStatus());
}
}
@@ -121,7 +121,7 @@ public class LoadBalancerPredicates {
@Override
public boolean apply(LoadBalancer loadBalancer) {
checkNotNull(loadBalancer, "loadBalancer must be defined");
- LoadBalancer loadBalancerUpdate = loadBalancerApi.get(loadBalancer.getId());
+ LoadBalancer loadBalancerUpdate = loadBalancerApi.get(loadBalancer.getId());
if (loadBalancerUpdate == null) {
return true;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApiExpectTest.java
index bce95d0..0345276 100644
--- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApiExpectTest.java
+++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApiExpectTest.java
@@ -41,10 +41,10 @@ public class AccessRuleApiExpectTest extends BaseCloudLoadBalancerApiExpectTest<
URI endpoint = URI.create("https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/123123/loadbalancers/2000/accesslist");
AccessRuleApi api = requestsSendResponses(
rackspaceAuthWithUsernameAndApiKey,
- responseWithAccess,
+ responseWithAccess,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(OK.getStatusCode()).payload(payloadFromResource("/accesslist-list.json")).build()
- ).getAccessRuleApiForZoneAndLoadBalancer("DFW", 2000);
+ ).getAccessRuleApi("DFW", 2000);
Iterable<AccessRuleWithId> accessList = api.list();
assertEquals(accessList, getAccessRules());
@@ -54,15 +54,15 @@ public class AccessRuleApiExpectTest extends BaseCloudLoadBalancerApiExpectTest<
URI endpoint = URI.create("https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/123123/loadbalancers/2000/accesslist");
AccessRuleApi api = requestsSendResponses(
rackspaceAuthWithUsernameAndApiKey,
- responseWithAccess,
+ responseWithAccess,
authenticatedGET().method(POST).endpoint(endpoint).payload(payloadFromResource("/accesslist-create.json")).build(),
HttpResponse.builder().statusCode(OK.getStatusCode()).build()
- ).getAccessRuleApiForZoneAndLoadBalancer("DFW", 2000);
-
+ ).getAccessRuleApi("DFW", 2000);
+
AccessRule accessRule1 = AccessRule.deny("206.160.163.21");
AccessRule accessRule2 = AccessRule.deny("206.160.165.11");
AccessRule accessRule3 = AccessRule.deny("206.160.163.22");
-
+
List<AccessRule> accessList = ImmutableList.<AccessRule> of(accessRule1, accessRule2, accessRule3);
api.create(accessList);
}
@@ -71,10 +71,10 @@ public class AccessRuleApiExpectTest extends BaseCloudLoadBalancerApiExpectTest<
URI endpoint = URI.create("https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/123123/loadbalancers/2000/accesslist/23");
AccessRuleApi api = requestsSendResponses(
rackspaceAuthWithUsernameAndApiKey,
- responseWithAccess,
+ responseWithAccess,
authenticatedGET().method(DELETE).endpoint(endpoint).replaceHeader(ACCEPT, WILDCARD).build(),
HttpResponse.builder().statusCode(OK.getStatusCode()).build()
- ).getAccessRuleApiForZoneAndLoadBalancer("DFW", 2000);
+ ).getAccessRuleApi("DFW", 2000);
assertTrue(api.delete(23));
}
@@ -83,10 +83,10 @@ public class AccessRuleApiExpectTest extends BaseCloudLoadBalancerApiExpectTest<
URI endpoint = URI.create("https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/123123/loadbalancers/2000/accesslist?id=23&id=24");
AccessRuleApi api = requestsSendResponses(
rackspaceAuthWithUsernameAndApiKey,
- responseWithAccess,
+ responseWithAccess,
authenticatedGET().method(DELETE).endpoint(endpoint).replaceHeader(ACCEPT, WILDCARD).build(),
HttpResponse.builder().statusCode(OK.getStatusCode()).build()
- ).getAccessRuleApiForZoneAndLoadBalancer("DFW", 2000);
+ ).getAccessRuleApi("DFW", 2000);
List<Integer> accessRuleIds = ImmutableList.<Integer> of(23, 24);
assertTrue(api.delete(accessRuleIds));
@@ -96,10 +96,10 @@ public class AccessRuleApiExpectTest extends BaseCloudLoadBalancerApiExpectTest<
URI endpoint = URI.create("https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/123123/loadbalancers/2000/accesslist");
AccessRuleApi api = requestsSendResponses(
rackspaceAuthWithUsernameAndApiKey,
- responseWithAccess,
+ responseWithAccess,
authenticatedGET().method(DELETE).endpoint(endpoint).replaceHeader(ACCEPT, WILDCARD).build(),
HttpResponse.builder().statusCode(OK.getStatusCode()).build()
- ).getAccessRuleApiForZoneAndLoadBalancer("DFW", 2000);
+ ).getAccessRuleApi("DFW", 2000);
assertTrue(api.deleteAll());
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApiLiveTest.java
index 68c79dd..76b9ed5 100644
--- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApiLiveTest.java
+++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApiLiveTest.java
@@ -42,7 +42,7 @@ import com.google.common.collect.Maps;
@Test(groups = "live", singleThreaded = true, testName = "AccessListApiLiveTest")
public class AccessRuleApiLiveTest extends BaseCloudLoadBalancersApiLiveTest {
private LoadBalancer lb;
- private String zone;
+ private String region;
private AccessRule accessRule1;
private AccessRule accessRule2;
private AccessRule accessRule3;
@@ -58,12 +58,12 @@ public class AccessRuleApiLiveTest extends BaseCloudLoadBalancersApiLiveTest {
accessRule2 = AccessRule.deny("206.160.165.11");
accessRule3 = AccessRule.deny("206.160.163.22");
accessRule4 = AccessRule.deny("206.160.168.22");
-
+
accessRules = Maps.newHashMap();
accessRules.put(accessRule1.getAddress(), accessRule1);
accessRules.put(accessRule2.getAddress(), accessRule2);
accessRules.put(accessRule3.getAddress(), accessRule3);
- accessRules.put(accessRule4.getAddress(), accessRule4);
+ accessRules.put(accessRule4.getAddress(), accessRule4);
}
public void testCreateLoadBalancer() {
@@ -71,60 +71,60 @@ public class AccessRuleApiLiveTest extends BaseCloudLoadBalancersApiLiveTest {
CreateLoadBalancer createLB = CreateLoadBalancer.builder()
.name(prefix + "-jclouds").protocol("HTTP").port(80).virtualIPType(Type.PUBLIC).node(addNode).build();
- zone = "ORD";//Iterables.getFirst(api.getConfiguredZones(), null);
- lb = api.getLoadBalancerApiForZone(zone).create(createLB);
-
- assertTrue(awaitAvailable(api.getLoadBalancerApiForZone(zone)).apply(lb));
+ region = "ORD";//Iterables.getFirst(api.getConfiguredRegions(), null);
+ lb = api.getLoadBalancerApi(region).create(createLB);
+
+ assertTrue(awaitAvailable(api.getLoadBalancerApi(region)).apply(lb));
}
@Test(dependsOnMethods = "testCreateLoadBalancer")
public void testCreateAccessList() throws Exception {
- api.getAccessRuleApiForZoneAndLoadBalancer(zone, lb.getId()).create(accessRules.values());
- assertTrue(awaitAvailable(api.getLoadBalancerApiForZone(zone)).apply(lb));
-
+ api.getAccessRuleApi(region, lb.getId()).create(accessRules.values());
+ assertTrue(awaitAvailable(api.getLoadBalancerApi(region)).apply(lb));
+
assertExpectedAccessRules(accessRules);
}
-
+
@Test(dependsOnMethods = "testCreateAccessList")
public void testRemoveSingleAccessRule() throws Exception {
- Iterable<AccessRuleWithId> actualAccessList = api.getAccessRuleApiForZoneAndLoadBalancer(zone, lb.getId()).list();
+ Iterable<AccessRuleWithId> actualAccessList = api.getAccessRuleApi(region, lb.getId()).list();
AccessRuleWithId removedAccessRule = Iterables.getFirst(actualAccessList, null);
accessRules.remove(removedAccessRule.getAddress());
-
- assertTrue(api.getAccessRuleApiForZoneAndLoadBalancer(zone, lb.getId()).delete(removedAccessRule.getId()));
- assertTrue(awaitAvailable(api.getLoadBalancerApiForZone(zone)).apply(lb));
-
+
+ assertTrue(api.getAccessRuleApi(region, lb.getId()).delete(removedAccessRule.getId()));
+ assertTrue(awaitAvailable(api.getLoadBalancerApi(region)).apply(lb));
+
assertExpectedAccessRules(accessRules);
}
-
+
@Test(dependsOnMethods = "testRemoveSingleAccessRule")
public void testRemoveManyAccessRules() throws Exception {
- Iterable<AccessRuleWithId> actualAccessList = api.getAccessRuleApiForZoneAndLoadBalancer(zone, lb.getId()).list();
+ Iterable<AccessRuleWithId> actualAccessList = api.getAccessRuleApi(region, lb.getId()).list();
AccessRuleWithId removedAccessRule1 = Iterables.getFirst(actualAccessList, null);
AccessRuleWithId removedAccessRule2 = Iterables.getLast(actualAccessList);
List<Integer> removedAccessRuleIds = ImmutableList.<Integer> of(removedAccessRule1.getId(), removedAccessRule2.getId());
accessRules.remove(removedAccessRule1.getAddress());
accessRules.remove(removedAccessRule2.getAddress());
-
- assertTrue(api.getAccessRuleApiForZoneAndLoadBalancer(zone, lb.getId()).delete(removedAccessRuleIds));
- assertTrue(awaitAvailable(api.getLoadBalancerApiForZone(zone)).apply(lb));
-
+
+ assertTrue(api.getAccessRuleApi(region, lb.getId()).delete(removedAccessRuleIds));
+ assertTrue(awaitAvailable(api.getLoadBalancerApi(region)).apply(lb));
+
assertExpectedAccessRules(accessRules);
}
-
+
@Test(dependsOnMethods = "testRemoveManyAccessRules")
public void testRemoveAllAccessRules() throws Exception {
- assertTrue(api.getAccessRuleApiForZoneAndLoadBalancer(zone, lb.getId()).deleteAll());
- assertTrue(awaitAvailable(api.getLoadBalancerApiForZone(zone)).apply(lb));
-
+ assertTrue(api.getAccessRuleApi(region, lb.getId()).deleteAll());
+ assertTrue(awaitAvailable(api.getLoadBalancerApi(region)).apply(lb));
+
assertExpectedAccessRules(Maps.<String, AccessRule>newHashMap());
}
-
+
private void assertExpectedAccessRules(Map<String, AccessRule> expectedAccessList) {
- Iterable<AccessRuleWithId> actualAccessList = api.getAccessRuleApiForZoneAndLoadBalancer(zone, lb.getId()).list();
-
+ Iterable<AccessRuleWithId> actualAccessList = api.getAccessRuleApi(region, lb.getId()).list();
+
for (AccessRule actualAccessRule : actualAccessList) {
- assertEquals(expectedAccessList.containsKey(actualAccessRule.getAddress()), true,
+ assertEquals(expectedAccessList.containsKey(actualAccessRule.getAddress()), true,
"The AccessRule " + actualAccessRule + " was not found in " + expectedAccessList);
}
}
@@ -132,9 +132,9 @@ public class AccessRuleApiLiveTest extends BaseCloudLoadBalancersApiLiveTest {
@Override
@AfterGroups(groups = "live")
protected void tearDown() {
- assertTrue(awaitAvailable(api.getLoadBalancerApiForZone(zone)).apply(lb));
- api.getLoadBalancerApiForZone(zone).delete(lb.getId());
- assertTrue(awaitDeleted(api.getLoadBalancerApiForZone(zone)).apply(lb));
+ assertTrue(awaitAvailable(api.getLoadBalancerApi(region)).apply(lb));
+ api.getLoadBalancerApi(region).delete(lb.getId());
+ assertTrue(awaitDeleted(api.getLoadBalancerApi(region)).apply(lb));
super.tearDown();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionApiExpectTest.java
index c83da33..c0e437a 100644
--- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionApiExpectTest.java
+++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionApiExpectTest.java
@@ -38,10 +38,10 @@ public class ConnectionApiExpectTest extends BaseCloudLoadBalancerApiExpectTest<
URI endpoint = URI.create("https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/123123/loadbalancers/2000/connectionthrottle");
ConnectionApi api = requestsSendResponses(
rackspaceAuthWithUsernameAndApiKey,
- responseWithAccess,
+ responseWithAccess,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(OK.getStatusCode()).payload(payloadFromResource("/connectionthrottle-get.json")).build()
- ).getConnectionApiForZoneAndLoadBalancer("DFW", 2000);
+ ).getConnectionApi("DFW", 2000);
ConnectionThrottle connectionThrottle = api.getConnectionThrottle();
assertEquals(connectionThrottle, getConnectionThrottle());
@@ -51,10 +51,10 @@ public class ConnectionApiExpectTest extends BaseCloudLoadBalancerApiExpectTest<
URI endpoint = URI.create("https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/123123/loadbalancers/2000/connectionthrottle");
ConnectionApi api = requestsSendResponses(
rackspaceAuthWithUsernameAndApiKey,
- responseWithAccess,
+ responseWithAccess,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(OK.getStatusCode()).payload(payloadFromResource("/connectionthrottle-get-deleted.json")).build()
- ).getConnectionApiForZoneAndLoadBalancer("DFW", 2000);
+ ).getConnectionApi("DFW", 2000);
ConnectionThrottle connectionThrottle = api.getConnectionThrottle();
assertNull(connectionThrottle);
@@ -64,70 +64,70 @@ public class ConnectionApiExpectTest extends BaseCloudLoadBalancerApiExpectTest<
URI endpoint = URI.create("https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/123123/loadbalancers/2000/connectionthrottle");
ConnectionApi api = requestsSendResponses(
rackspaceAuthWithUsernameAndApiKey,
- responseWithAccess,
+ responseWithAccess,
authenticatedGET().method(PUT).endpoint(endpoint).payload(payloadFromResource("/connectionthrottle-create.json")).build(),
HttpResponse.builder().statusCode(OK.getStatusCode()).build()
- ).getConnectionApiForZoneAndLoadBalancer("DFW", 2000);
-
+ ).getConnectionApi("DFW", 2000);
+
api.createOrUpdateConnectionThrottle(getConnectionThrottle());
}
-
+
public void testValidConnectionThrottle() {
assertTrue(getConnectionThrottle().isValid());
}
@Test(expectedExceptions = IllegalArgumentException.class)
public void testInvalidConnectionThrottle() {
- ConnectionThrottle.builder().build();
+ ConnectionThrottle.builder().build();
}
public void testRemoveConnectionThrottle() {
URI endpoint = URI.create("https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/123123/loadbalancers/2000/connectionthrottle");
ConnectionApi api = requestsSendResponses(
rackspaceAuthWithUsernameAndApiKey,
- responseWithAccess,
+ responseWithAccess,
authenticatedGET().method(DELETE).endpoint(endpoint).replaceHeader(ACCEPT, WILDCARD).build(),
HttpResponse.builder().statusCode(OK.getStatusCode()).build()
- ).getConnectionApiForZoneAndLoadBalancer("DFW", 2000);
+ ).getConnectionApi("DFW", 2000);
assertTrue(api.deleteConnectionThrottle());
}
-
+
public void testIsConnectionLogging() {
URI endpoint = URI.create("https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/123123/loadbalancers/2000/connectionlogging");
ConnectionApi api = requestsSendResponses(
rackspaceAuthWithUsernameAndApiKey,
- responseWithAccess,
+ responseWithAccess,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(OK.getStatusCode()).payload(payloadFromResource("/connectionlogging-enable.json")).build()
- ).getConnectionApiForZoneAndLoadBalancer("DFW", 2000);
-
+ ).getConnectionApi("DFW", 2000);
+
assertTrue(api.isConnectionLogging());
}
-
+
public void testEnableConnectionLogging() {
URI endpoint = URI.create("https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/123123/loadbalancers/2000/connectionlogging");
ConnectionApi api = requestsSendResponses(
rackspaceAuthWithUsernameAndApiKey,
- responseWithAccess,
+ responseWithAccess,
authenticatedGET().method(PUT).endpoint(endpoint).payload(payloadFromResource("/connectionlogging-enable.json")).build(),
HttpResponse.builder().statusCode(OK.getStatusCode()).build()
- ).getConnectionApiForZoneAndLoadBalancer("DFW", 2000);
-
+ ).getConnectionApi("DFW", 2000);
+
api.enableConnectionLogging();
}
-
+
public void testDisableConnectionLogging() {
URI endpoint = URI.create("https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/123123/loadbalancers/2000/connectionlogging");
ConnectionApi api = requestsSendResponses(
rackspaceAuthWithUsernameAndApiKey,
- responseWithAccess,
+ responseWithAccess,
authenticatedGET().method(PUT).endpoint(endpoint).payload(payloadFromResource("/connectionlogging-disable.json")).build(),
HttpResponse.builder().statusCode(OK.getStatusCode()).build()
- ).getConnectionApiForZoneAndLoadBalancer("DFW", 2000);
-
+ ).getConnectionApi("DFW", 2000);
+
api.disableConnectionLogging();
- }
+ }
public static ConnectionThrottle getConnectionThrottle() {
ConnectionThrottle connectionThrottle = ConnectionThrottle.builder()
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionApiLiveTest.java
index ebda905..1832b3b 100644
--- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionApiLiveTest.java
+++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionApiLiveTest.java
@@ -37,70 +37,70 @@ import com.google.common.collect.Iterables;
@Test(groups = "live", singleThreaded = true, testName = "ConnectionApiLiveTest")
public class ConnectionApiLiveTest extends BaseCloudLoadBalancersApiLiveTest {
private LoadBalancer lb;
- private String zone;
+ private String region;
public void testCreateLoadBalancer() {
AddNode addNode = AddNode.builder().address("192.168.1.1").port(8080).build();
CreateLoadBalancer createLB = CreateLoadBalancer.builder()
.name(prefix + "-jclouds").protocol("HTTP").port(80).virtualIPType(Type.PUBLIC).node(addNode).build();
- zone = Iterables.getFirst(api.getConfiguredZones(), null);
- lb = api.getLoadBalancerApiForZone(zone).create(createLB);
-
- assertTrue(awaitAvailable(api.getLoadBalancerApiForZone(zone)).apply(lb));
+ region = Iterables.getFirst(api.getConfiguredRegions(), null);
+ lb = api.getLoadBalancerApi(region).create(createLB);
+
+ assertTrue(awaitAvailable(api.getLoadBalancerApi(region)).apply(lb));
}
@Test(dependsOnMethods = "testCreateLoadBalancer")
public void testCreateAndGetConnectionThrottling() throws Exception {
- api.getConnectionApiForZoneAndLoadBalancer(zone, lb.getId()).createOrUpdateConnectionThrottle(
+ api.getConnectionApi(region, lb.getId()).createOrUpdateConnectionThrottle(
ConnectionApiExpectTest.getConnectionThrottle());
- assertTrue(awaitAvailable(api.getLoadBalancerApiForZone(zone)).apply(lb));
-
- ConnectionThrottle connectionThrottle =
- api.getConnectionApiForZoneAndLoadBalancer(zone, lb.getId()).getConnectionThrottle();
+ assertTrue(awaitAvailable(api.getLoadBalancerApi(region)).apply(lb));
+
+ ConnectionThrottle connectionThrottle =
+ api.getConnectionApi(region, lb.getId()).getConnectionThrottle();
assertEquals(connectionThrottle, ConnectionApiExpectTest.getConnectionThrottle());
}
-
+
@Test(dependsOnMethods = "testCreateAndGetConnectionThrottling")
public void testRemoveAndGetConnectionThrottle() throws Exception {
- assertTrue(api.getConnectionApiForZoneAndLoadBalancer(zone, lb.getId()).deleteConnectionThrottle());
- assertTrue(awaitAvailable(api.getLoadBalancerApiForZone(zone)).apply(lb));
-
- ConnectionThrottle connectionThrottle =
- api.getConnectionApiForZoneAndLoadBalancer(zone, lb.getId()).getConnectionThrottle();
-
+ assertTrue(api.getConnectionApi(region, lb.getId()).deleteConnectionThrottle());
+ assertTrue(awaitAvailable(api.getLoadBalancerApi(region)).apply(lb));
+
+ ConnectionThrottle connectionThrottle =
+ api.getConnectionApi(region, lb.getId()).getConnectionThrottle();
+
assertNull(connectionThrottle);
}
-
+
@Test(dependsOnMethods = "testRemoveAndGetConnectionThrottle")
public void testEnableAndIsConnectionLogging() throws Exception {
- api.getConnectionApiForZoneAndLoadBalancer(zone, lb.getId()).enableConnectionLogging();
- assertTrue(awaitAvailable(api.getLoadBalancerApiForZone(zone)).apply(lb));
-
- boolean isConnectionLogging =
- api.getConnectionApiForZoneAndLoadBalancer(zone, lb.getId()).isConnectionLogging();
-
+ api.getConnectionApi(region, lb.getId()).enableConnectionLogging();
+ assertTrue(awaitAvailable(api.getLoadBalancerApi(region)).apply(lb));
+
+ boolean isConnectionLogging =
+ api.getConnectionApi(region, lb.getId()).isConnectionLogging();
+
assertTrue(isConnectionLogging);
}
-
+
@Test(dependsOnMethods = "testEnableAndIsConnectionLogging")
public void testDisableAndIsConnectionLogging() throws Exception {
- api.getConnectionApiForZoneAndLoadBalancer(zone, lb.getId()).disableConnectionLogging();
- assertTrue(awaitAvailable(api.getLoadBalancerApiForZone(zone)).apply(lb));
-
- boolean isConnectionLogging =
- api.getConnectionApiForZoneAndLoadBalancer(zone, lb.getId()).isConnectionLogging();
-
+ api.getConnectionApi(region, lb.getId()).disableConnectionLogging();
+ assertTrue(awaitAvailable(api.getLoadBalancerApi(region)).apply(lb));
+
+ boolean isConnectionLogging =
+ api.getConnectionApi(region, lb.getId()).isConnectionLogging();
+
assertFalse(isConnectionLogging);
}
@Override
@AfterGroups(groups = "live")
protected void tearDown() {
- assertTrue(awaitAvailable(api.getLoadBalancerApiForZone(zone)).apply(lb));
- api.getLoadBalancerApiForZone(zone).delete(lb.getId());
- assertTrue(awaitDeleted(api.getLoadBalancerApiForZone(zone)).apply(lb));
+ assertTrue(awaitAvailable(api.getLoadBalancerApi(region)).apply(lb));
+ api.getLoadBalancerApi(region).delete(lb.getId());
+ assertTrue(awaitDeleted(api.getLoadBalancerApi(region)).apply(lb));
super.tearDown();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingApiExpectTest.java
index 71771ff..a7b22b0 100644
--- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingApiExpectTest.java
+++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingApiExpectTest.java
@@ -32,35 +32,35 @@ public class ContentCachingApiExpectTest extends BaseCloudLoadBalancerApiExpectT
URI endpoint = URI.create("https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/123123/loadbalancers/2000/contentcaching");
ContentCachingApi api = requestsSendResponses(
rackspaceAuthWithUsernameAndApiKey,
- responseWithAccess,
+ responseWithAccess,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(OK.getStatusCode()).payload(payloadFromResource("/contentcaching-enable.json")).build()
- ).getContentCachingApiForZoneAndLoadBalancer("DFW", 2000);
-
+ ).getContentCachingApi("DFW", 2000);
+
assertTrue(api.isContentCaching());
}
-
+
public void testEnableContentCaching() {
URI endpoint = URI.create("https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/123123/loadbalancers/2000/contentcaching");
ContentCachingApi api = requestsSendResponses(
rackspaceAuthWithUsernameAndApiKey,
- responseWithAccess,
+ responseWithAccess,
authenticatedGET().method(PUT).endpoint(endpoint).payload(payloadFromResource("/contentcaching-enable.json")).build(),
HttpResponse.builder().statusCode(OK.getStatusCode()).build()
- ).getContentCachingApiForZoneAndLoadBalancer("DFW", 2000);
-
+ ).getContentCachingApi("DFW", 2000);
+
api.enable();
}
-
+
public void testDisableContentCaching() {
URI endpoint = URI.create("https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/123123/loadbalancers/2000/contentcaching");
ContentCachingApi api = requestsSendResponses(
rackspaceAuthWithUsernameAndApiKey,
- responseWithAccess,
+ responseWithAccess,
authenticatedGET().method(PUT).endpoint(endpoint).payload(payloadFromResource("/contentcaching-disable.json")).build(),
HttpResponse.builder().statusCode(OK.getStatusCode()).build()
- ).getContentCachingApiForZoneAndLoadBalancer("DFW", 2000);
-
+ ).getContentCachingApi("DFW", 2000);
+
api.disable();
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingApiLiveTest.java
index fe8479f..97eecf2 100644
--- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingApiLiveTest.java
+++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingApiLiveTest.java
@@ -34,47 +34,47 @@ import com.google.common.collect.Iterables;
@Test(groups = "live", singleThreaded = true, testName = "ContentCachingApiLiveTest")
public class ContentCachingApiLiveTest extends BaseCloudLoadBalancersApiLiveTest {
private LoadBalancer lb;
- private String zone;
+ private String region;
public void testCreateLoadBalancer() {
AddNode addNode = AddNode.builder().address("192.168.1.1").port(8080).build();
CreateLoadBalancer createLB = CreateLoadBalancer.builder()
.name(prefix + "-jclouds").protocol("HTTP").port(80).virtualIPType(Type.PUBLIC).node(addNode).build();
- zone = Iterables.getFirst(api.getConfiguredZones(), null);
- lb = api.getLoadBalancerApiForZone(zone).create(createLB);
-
- assertTrue(awaitAvailable(api.getLoadBalancerApiForZone(zone)).apply(lb));
+ region = Iterables.getFirst(api.getConfiguredRegions(), null);
+ lb = api.getLoadBalancerApi(region).create(createLB);
+
+ assertTrue(awaitAvailable(api.getLoadBalancerApi(region)).apply(lb));
}
-
+
@Test(dependsOnMethods = "testCreateLoadBalancer")
public void testEnableAndIsContentCaching() throws Exception {
- api.getContentCachingApiForZoneAndLoadBalancer(zone, lb.getId()).enable();
- assertTrue(awaitAvailable(api.getLoadBalancerApiForZone(zone)).apply(lb));
-
- boolean isContentCaching =
- api.getContentCachingApiForZoneAndLoadBalancer(zone, lb.getId()).isContentCaching();
-
+ api.getContentCachingApi(region, lb.getId()).enable();
+ assertTrue(awaitAvailable(api.getLoadBalancerApi(region)).apply(lb));
+
+ boolean isContentCaching =
+ api.getContentCachingApi(region, lb.getId()).isContentCaching();
+
assertTrue(isContentCaching);
}
-
+
@Test(dependsOnMethods = "testEnableAndIsContentCaching")
public void testDisableAndIsContentCaching() throws Exception {
- api.getContentCachingApiForZoneAndLoadBalancer(zone, lb.getId()).disable();
- assertTrue(awaitAvailable(api.getLoadBalancerApiForZone(zone)).apply(lb));
-
- boolean isContentCaching =
- api.getContentCachingApiForZoneAndLoadBalancer(zone, lb.getId()).isContentCaching();
-
+ api.getContentCachingApi(region, lb.getId()).disable();
+ assertTrue(awaitAvailable(api.getLoadBalancerApi(region)).apply(lb));
+
+ boolean isContentCaching =
+ api.getContentCachingApi(region, lb.getId()).isContentCaching();
+
assertFalse(isContentCaching);
}
@Override
@AfterGroups(groups = "live")
protected void tearDown() {
- assertTrue(awaitAvailable(api.getLoadBalancerApiForZone(zone)).apply(lb));
- api.getLoadBalancerApiForZone(zone).delete(lb.getId());
- assertTrue(awaitDeleted(api.getLoadBalancerApiForZone(zone)).apply(lb));
+ assertTrue(awaitAvailable(api.getLoadBalancerApi(region)).apply(lb));
+ api.getLoadBalancerApi(region).delete(lb.getId());
+ assertTrue(awaitDeleted(api.getLoadBalancerApi(region)).apply(lb));
super.tearDown();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageApiExpectTest.java
index 40f4972..4c45857 100644
--- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageApiExpectTest.java
+++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageApiExpectTest.java
@@ -37,25 +37,25 @@ import org.testng.annotations.Test;
public class ErrorPageApiExpectTest extends BaseCloudLoadBalancerApiExpectTest<CloudLoadBalancersApi> {
public String contentExpected;
public String contentEscaped;
-
+
public ErrorPageApiExpectTest() {
super();
-
+
contentExpected = getContentExpected();
contentEscaped = getContentEscaped();
}
-
+
public void testGetErrorPage() {
URI endpoint = URI.create("https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/123123/loadbalancers/2000/errorpage");
ErrorPageApi api = requestsSendResponses(
rackspaceAuthWithUsernameAndApiKey,
- responseWithAccess,
+ responseWithAccess,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder()
.statusCode(OK.getStatusCode())
.payload(payloadFromStringWithContentType("{\"errorpage\":{\"content\":\"" + contentEscaped + "\"}}", APPLICATION_JSON))
.build()
- ).getErrorPageApiForZoneAndLoadBalancer("DFW", 2000);
+ ).getErrorPageApi("DFW", 2000);
String content = api.get();
assertEquals(content, contentExpected);
@@ -65,7 +65,7 @@ public class ErrorPageApiExpectTest extends BaseCloudLoadBalancerApiExpectTest<C
URI endpoint = URI.create("https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/123123/loadbalancers/2000/errorpage");
ErrorPageApi api = requestsSendResponses(
rackspaceAuthWithUsernameAndApiKey,
- responseWithAccess,
+ responseWithAccess,
authenticatedGET()
.method(PUT)
.endpoint(endpoint)
@@ -73,8 +73,8 @@ public class ErrorPageApiExpectTest extends BaseCloudLoadBalancerApiExpectTest<C
.payload(payloadFromStringWithContentType("{\"errorpage\":{\"content\":\"" + contentEscaped + "\"}}", APPLICATION_JSON))
.build(),
HttpResponse.builder().statusCode(OK.getStatusCode()).build()
- ).getErrorPageApiForZoneAndLoadBalancer("DFW", 2000);
-
+ ).getErrorPageApi("DFW", 2000);
+
api.create(contentEscaped);
}
@@ -82,31 +82,31 @@ public class ErrorPageApiExpectTest extends BaseCloudLoadBalancerApiExpectTest<C
URI endpoint = URI.create("https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/123123/loadbalancers/2000/errorpage");
ErrorPageApi api = requestsSendResponses(
rackspaceAuthWithUsernameAndApiKey,
- responseWithAccess,
+ responseWithAccess,
authenticatedGET().method(DELETE).endpoint(endpoint).replaceHeader(ACCEPT, WILDCARD).build(),
HttpResponse.builder().statusCode(OK.getStatusCode()).build()
- ).getErrorPageApiForZoneAndLoadBalancer("DFW", 2000);
+ ).getErrorPageApi("DFW", 2000);
assertTrue(api.delete());
}
-
+
public static String getContentExpected() {
String contentExpected;
-
+
try {
contentExpected = Strings2.toStringAndClose(ErrorPageApiExpectTest.class.getResourceAsStream("/errorpage.html"));
}
catch (IOException e) {
throw new RuntimeException("Could not read in /errorpage.html", e);
}
-
+
return contentExpected;
}
-
+
public static String getContentEscaped() {
- String contentEscaped = getContentExpected().replaceAll("\"", "\\\\\"");
+ String contentEscaped = getContentExpected().replaceAll("\"", "\\\\\"");
contentEscaped = contentEscaped.replaceAll("\n", "\\\\n");
-
+
return contentEscaped;
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageApiLiveTest.java
index 3e58c05..ef8d432 100644
--- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageApiLiveTest.java
+++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageApiLiveTest.java
@@ -35,7 +35,7 @@ import com.google.common.collect.Iterables;
@Test(groups = "live", singleThreaded = true, testName = "ErrorPageApiLiveTest")
public class ErrorPageApiLiveTest extends BaseCloudLoadBalancersApiLiveTest {
private LoadBalancer lb;
- private String zone;
+ private String region;
private String contentExpected;
private String contentEscaped;
@@ -53,38 +53,38 @@ public class ErrorPageApiLiveTest extends BaseCloudLoadBalancersApiLiveTest {
CreateLoadBalancer createLB = CreateLoadBalancer.builder()
.name(prefix + "-jclouds").protocol("HTTP").port(80).virtualIPType(Type.PUBLIC).node(addNode).build();
- zone = Iterables.getFirst(api.getConfiguredZones(), null);
- lb = api.getLoadBalancerApiForZone(zone).create(createLB);
-
- assertTrue(awaitAvailable(api.getLoadBalancerApiForZone(zone)).apply(lb));
+ region = Iterables.getFirst(api.getConfiguredRegions(), null);
+ lb = api.getLoadBalancerApi(region).create(createLB);
+
+ assertTrue(awaitAvailable(api.getLoadBalancerApi(region)).apply(lb));
}
@Test(dependsOnMethods = "testCreateLoadBalancer")
public void testCreateAndGetErrorPage() throws Exception {
- api.getErrorPageApiForZoneAndLoadBalancer(zone, lb.getId()).create(contentEscaped);
- assertTrue(awaitAvailable(api.getLoadBalancerApiForZone(zone)).apply(lb));
-
- String content = api.getErrorPageApiForZoneAndLoadBalancer(zone, lb.getId()).get();
+ api.getErrorPageApi(region, lb.getId()).create(contentEscaped);
+ assertTrue(awaitAvailable(api.getLoadBalancerApi(region)).apply(lb));
+
+ String content = api.getErrorPageApi(region, lb.getId()).get();
assertEquals(content, contentExpected);
}
-
+
@Test(dependsOnMethods = "testCreateAndGetErrorPage")
public void testRemoveAndGetErrorPage() throws Exception {
- assertTrue(api.getErrorPageApiForZoneAndLoadBalancer(zone, lb.getId()).delete());
- assertTrue(awaitAvailable(api.getLoadBalancerApiForZone(zone)).apply(lb));
-
- String content = api.getErrorPageApiForZoneAndLoadBalancer(zone, lb.getId()).get();
-
+ assertTrue(api.getErrorPageApi(region, lb.getId()).delete());
+ assertTrue(awaitAvailable(api.getLoadBalancerApi(region)).apply(lb));
+
+ String content = api.getErrorPageApi(region, lb.getId()).get();
+
assertTrue(content.contains("Service Unavailable"));
}
@Override
@AfterGroups(groups = "live")
protected void tearDown() {
- assertTrue(awaitAvailable(api.getLoadBalancerApiForZone(zone)).apply(lb));
- api.getLoadBalancerApiForZone(zone).delete(lb.getId());
- assertTrue(awaitDeleted(api.getLoadBalancerApiForZone(zone)).apply(lb));
+ assertTrue(awaitAvailable(api.getLoadBalancerApi(region)).apply(lb));
+ api.getLoadBalancerApi(region).delete(lb.getId());
+ assertTrue(awaitDeleted(api.getLoadBalancerApi(region)).apply(lb));
super.tearDown();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorApiExpectTest.java
index e5f9b0b..90d2b58 100644
--- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorApiExpectTest.java
+++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorApiExpectTest.java
@@ -38,10 +38,10 @@ public class HealthMonitorApiExpectTest extends BaseCloudLoadBalancerApiExpectTe
URI endpoint = URI.create("https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/123123/loadbalancers/2000/healthmonitor");
HealthMonitorApi api = requestsSendResponses(
rackspaceAuthWithUsernameAndApiKey,
- responseWithAccess,
+ responseWithAccess,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(OK.getStatusCode()).payload(payloadFromResource("/healthmonitor-get.json")).build()
- ).getHealthMonitorApiForZoneAndLoadBalancer("DFW", 2000);
+ ).getHealthMonitorApi("DFW", 2000);
HealthMonitor healthMonitor = api.get();
assertEquals(healthMonitor, getConnectHealthMonitor());
@@ -51,10 +51,10 @@ public class HealthMonitorApiExpectTest extends BaseCloudLoadBalancerApiExpectTe
URI endpoint = URI.create("https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/123123/loadbalancers/2000/healthmonitor");
HealthMonitorApi api = requestsSendResponses(
rackspaceAuthWithUsernameAndApiKey,
- responseWithAccess,
+ responseWithAccess,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(OK.getStatusCode()).payload(payloadFromResource("/healthmonitor-get-deleted.json")).build()
- ).getHealthMonitorApiForZoneAndLoadBalancer("DFW", 2000);
+ ).getHealthMonitorApi("DFW", 2000);
HealthMonitor healthMonitor = api.get();
assertNull(healthMonitor);
@@ -64,11 +64,11 @@ public class HealthMonitorApiExpectTest extends BaseCloudLoadBalancerApiExpectTe
URI endpoint = URI.create("https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/123123/loadbalancers/2000/healthmonitor");
HealthMonitorApi api = requestsSendResponses(
rackspaceAuthWithUsernameAndApiKey,
- responseWithAccess,
+ responseWithAccess,
authenticatedGET().method(PUT).endpoint(endpoint).payload(payloadFromResource("/healthmonitor-create.json")).build(),
HttpResponse.builder().statusCode(OK.getStatusCode()).build()
- ).getHealthMonitorApiForZoneAndLoadBalancer("DFW", 2000);
-
+ ).getHealthMonitorApi("DFW", 2000);
+
api.createOrUpdate(getConnectHealthMonitor());
}
@@ -76,10 +76,10 @@ public class HealthMonitorApiExpectTest extends BaseCloudLoadBalancerApiExpectTe
URI endpoint = URI.create("https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/123123/loadbalancers/2000/healthmonitor");
HealthMonitorApi api = requestsSendResponses(
rackspaceAuthWithUsernameAndApiKey,
- responseWithAccess,
+ responseWithAccess,
authenticatedGET().method(DELETE).endpoint(endpoint).replaceHeader(ACCEPT, WILDCARD).build(),
HttpResponse.builder().statusCode(OK.getStatusCode()).build()
- ).getHealthMonitorApiForZoneAndLoadBalancer("DFW", 2000);
+ ).getHealthMonitorApi("DFW", 2000);
assertTrue(api.delete());
}
@@ -87,12 +87,12 @@ public class HealthMonitorApiExpectTest extends BaseCloudLoadBalancerApiExpectTe
public void testValidConnectHealthMonitor() {
assertTrue(getConnectHealthMonitor().isValid());
}
-
+
@Test(expectedExceptions = IllegalArgumentException.class)
public void testInvalidConnectHealthMonitorWithoutRequirements() {
- HealthMonitor.builder().type(HealthMonitor.Type.CONNECT).build();
+ HealthMonitor.builder().type(HealthMonitor.Type.CONNECT).build();
}
-
+
@Test(expectedExceptions = IllegalArgumentException.class)
public void testInvalidConnectHealthMonitorWithUnrequired() {
HealthMonitor.builder()
@@ -103,14 +103,14 @@ public class HealthMonitorApiExpectTest extends BaseCloudLoadBalancerApiExpectTe
.path("/foobar")
.build();
}
-
+
public void testValidHTTPHealthMonitor() {
assertTrue(getHTTPHealthMonitor().isValid());
}
-
+
@Test(expectedExceptions = IllegalArgumentException.class)
public void testInvalidHTTPHealthMonitorWithoutRequirements() {
- HealthMonitor.builder().type(HealthMonitor.Type.HTTP).build();
+ HealthMonitor.builder().type(HealthMonitor.Type.HTTP).build();
}
@Test(expectedExceptions = IllegalArgumentException.class)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorApiLiveTest.java
index c25533f..de22804 100644
--- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorApiLiveTest.java
+++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorApiLiveTest.java
@@ -36,48 +36,48 @@ import com.google.common.collect.Iterables;
@Test(groups = "live", singleThreaded = true, testName = "HealthMonitorApiLiveTest")
public class HealthMonitorApiLiveTest extends BaseCloudLoadBalancersApiLiveTest {
private LoadBalancer lb;
- private String zone;
+ private String region;
public void testCreateLoadBalancer() {
AddNode addNode = AddNode.builder().address("192.168.1.1").port(8080).build();
CreateLoadBalancer createLB = CreateLoadBalancer.builder()
.name(prefix + "-jclouds").protocol("HTTP").port(80).virtualIPType(Type.PUBLIC).node(addNode).build();
- zone = Iterables.getFirst(api.getConfiguredZones(), null);
- lb = api.getLoadBalancerApiForZone(zone).create(createLB);
-
- assertTrue(awaitAvailable(api.getLoadBalancerApiForZone(zone)).apply(lb));
+ region = Iterables.getFirst(api.getConfiguredRegions(), null);
+ lb = api.getLoadBalancerApi(region).create(createLB);
+
+ assertTrue(awaitAvailable(api.getLoadBalancerApi(region)).apply(lb));
}
@Test(dependsOnMethods = "testCreateLoadBalancer")
public void testCreateAndGetHealthMonitor() throws Exception {
- api.getHealthMonitorApiForZoneAndLoadBalancer(zone, lb.getId()).createOrUpdate(
+ api.getHealthMonitorApi(region, lb.getId()).createOrUpdate(
HealthMonitorApiExpectTest.getConnectHealthMonitor());
- assertTrue(awaitAvailable(api.getLoadBalancerApiForZone(zone)).apply(lb));
-
- HealthMonitor healthMonitor =
- api.getHealthMonitorApiForZoneAndLoadBalancer(zone, lb.getId()).get();
+ assertTrue(awaitAvailable(api.getLoadBalancerApi(region)).apply(lb));
+
+ HealthMonitor healthMonitor =
+ api.getHealthMonitorApi(region, lb.getId()).get();
assertEquals(healthMonitor, HealthMonitorApiExpectTest.getConnectHealthMonitor());
}
-
+
@Test(dependsOnMethods = "testCreateAndGetHealthMonitor")
public void testRemoveAndGetHealthMonitor() throws Exception {
- assertTrue(api.getHealthMonitorApiForZoneAndLoadBalancer(zone, lb.getId()).delete());
- assertTrue(awaitAvailable(api.getLoadBalancerApiForZone(zone)).apply(lb));
-
- HealthMonitor healthMonitor =
- api.getHealthMonitorApiForZoneAndLoadBalancer(zone, lb.getId()).get();
-
+ assertTrue(api.getHealthMonitorApi(region, lb.getId()).delete());
+ assertTrue(awaitAvailable(api.getLoadBalancerApi(region)).apply(lb));
+
+ HealthMonitor healthMonitor =
+ api.getHealthMonitorApi(region, lb.getId()).get();
+
assertNull(healthMonitor);
}
@Override
@AfterGroups(groups = "live")
protected void tearDown() {
- assertTrue(awaitAvailable(api.getLoadBalancerApiForZone(zone)).apply(lb));
- api.getLoadBalancerApiForZone(zone).delete(lb.getId());
- assertTrue(awaitDeleted(api.getLoadBalancerApiForZone(zone)).apply(lb));
+ assertTrue(awaitAvailable(api.getLoadBalancerApi(region)).apply(lb));
+ api.getLoadBalancerApi(region).delete(lb.getId());
+ assertTrue(awaitDeleted(api.getLoadBalancerApi(region)).apply(lb));
super.tearDown();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApiExpectTest.java
index e32cbd7..b42a811 100644
--- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApiExpectTest.java
+++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApiExpectTest.java
@@ -56,7 +56,7 @@ public class LoadBalancerApiExpectTest extends BaseCloudLoadBalancerApiExpectTes
responseWithAccess,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(OK.getStatusCode()).payload(payloadFromResource("/loadbalancers-list.json")).build()
- ).getLoadBalancerApiForZone("DFW");
+ ).getLoadBalancerApi("DFW");
Set<LoadBalancer> loadBalancers = api.list().concat().toSet();
assertEquals(loadBalancers, getExpectedLoadBalancers());
@@ -69,7 +69,7 @@ public class LoadBalancerApiExpectTest extends BaseCloudLoadBalancerApiExpectTes
responseWithAccess,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(OK.getStatusCode()).payload(payloadFromResource("/loadbalancer-get.json")).build()
- ).getLoadBalancerApiForZone("DFW");
+ ).getLoadBalancerApi("DFW");
LoadBalancer loadBalancer = api.get(2000);
assertEquals(loadBalancer, getExpectedLoadBalancer());
@@ -86,7 +86,7 @@ public class LoadBalancerApiExpectTest extends BaseCloudLoadBalancerApiExpectTes
.endpoint(endpoint)
.build(),
HttpResponse.builder().statusCode(OK.getStatusCode()).payload(payloadFromResource("/loadbalancer-get.json")).build()
- ).getLoadBalancerApiForZone("DFW");
+ ).getLoadBalancerApi("DFW");
AddNode addNode1 = AddNode.builder()
.address("10.1.1.1")
@@ -123,7 +123,7 @@ public class LoadBalancerApiExpectTest extends BaseCloudLoadBalancerApiExpectTes
responseWithAccess,
authenticatedGET().method(PUT).payload(payloadFromResource("/loadbalancer-update.json")).endpoint(endpoint).build(),
HttpResponse.builder().statusCode(ACCEPTED.getStatusCode()).payload("").build()
- ).getLoadBalancerApiForZone("DFW");
+ ).getLoadBalancerApi("DFW");
UpdateLoadBalancer updateLB = UpdateLoadBalancer.builder()
.name("foo")
@@ -146,7 +146,7 @@ public class LoadBalancerApiExpectTest extends BaseCloudLoadBalancerApiExpectTes
.endpoint(endpoint)
.build(),
HttpResponse.builder().statusCode(ACCEPTED.getStatusCode()).payload("").build()
- ).getLoadBalancerApiForZone("DFW");
+ ).getLoadBalancerApi("DFW");
api.delete(2000);
}
@@ -158,7 +158,7 @@ public class LoadBalancerApiExpectTest extends BaseCloudLoadBalancerApiExpectTes
responseWithAccess,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(OK.getStatusCode()).payload(payloadFromResource("/metadata-list.json")).build()
- ).getLoadBalancerApiForZone("DFW");
+ ).getLoadBalancerApi("DFW");
Metadata metadata = api.getMetadata(2000);
assertEquals(metadata, getExpectedMetadataWithIds());
@@ -174,7 +174,7 @@ public class LoadBalancerApiExpectTest extends BaseCloudLoadBalancerApiExpectTes
.endpoint(endpoint)
.payload(payloadFromResourceWithContentType("/metadata-create.json", APPLICATION_JSON)).build(),
HttpResponse.builder().statusCode(OK.getStatusCode()).payload(payloadFromResource("/metadata-list.json")).build()
- ).getLoadBalancerApiForZone("DFW");
+ ).getLoadBalancerApi("DFW");
Metadata metadata = api.createMetadata(2000, getExpectedMetadata());
assertEquals(metadata, getExpectedMetadataWithIds());
@@ -187,7 +187,7 @@ public class LoadBalancerApiExpectTest extends BaseCloudLoadBalancerApiExpectTes
responseWithAccess,
authenticatedGET().method(DELETE).endpoint(endpoint).replaceHeader(ACCEPT, WILDCARD).build(),
HttpResponse.builder().statusCode(OK.getStatusCode()).build()
- ).getLoadBalancerApiForZone("DFW");
+ ).getLoadBalancerApi("DFW");
assertTrue(api.deleteMetadatum(2000, 23));
}
@@ -199,7 +199,7 @@ public class LoadBalancerApiExpectTest extends BaseCloudLoadBalancerApiExpectTes
responseWithAccess,
authenticatedGET().method(DELETE).endpoint(endpoint).replaceHeader(ACCEPT, WILDCARD).build(),
HttpResponse.builder().statusCode(OK.getStatusCode()).build()
- ).getLoadBalancerApiForZone("DFW");
+ ).getLoadBalancerApi("DFW");