diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersApiMetadata.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersApiMetadata.java index 78c4a026e1..c3af7013e7 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersApiMetadata.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersApiMetadata.java @@ -75,7 +75,7 @@ public class CloudLoadBalancersApiMetadata extends BaseRestApiMetadata { protected Builder() { super(CloudLoadBalancersApi.class, CloudLoadBalancersAsyncApi.class); - id("cloudloadbalancers") + id("rackspace-cloudloadbalancers") .name("Rackspace Cloud Load Balancers API") .identityName("Username") .credentialName("API Key") diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerApiLiveTest.java index 7b3a8a9033..3defb56bf6 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerApiLiveTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerApiLiveTest.java @@ -103,7 +103,7 @@ public class LoadBalancerApiLiveTest extends BaseCloudLoadBalancersApiLiveTest { @Test(dependsOnMethods = "testUpdateLoadBalancer") public void testListLoadBalancers() throws Exception { for (String zone: client.getConfiguredZones()) { - //TODO: FIXME + Set response = client.getLoadBalancerApiForZone(zone).list().concat().toImmutableSet(); assertNotNull(response); diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/internal/BaseCloudLoadBalancerApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/internal/BaseCloudLoadBalancerApiExpectTest.java index 518b10592b..dd7ce6ffad 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/internal/BaseCloudLoadBalancerApiExpectTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/internal/BaseCloudLoadBalancerApiExpectTest.java @@ -37,7 +37,7 @@ public class BaseCloudLoadBalancerApiExpectTest extends BaseRestApiExpectTest protected HttpResponse responseWithAccess; public BaseCloudLoadBalancerApiExpectTest() { - provider = "cloudloadbalancers"; + provider = "rackspace-cloudloadbalancers"; rackspaceAuthWithUsernameAndApiKey = RackspaceFixture.INSTANCE .initialAuthWithUsernameAndApiKey(identity, credential); diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/internal/BaseCloudLoadBalancersApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/internal/BaseCloudLoadBalancersApiLiveTest.java index f6edd93e18..f8cac795ec 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/internal/BaseCloudLoadBalancersApiLiveTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/internal/BaseCloudLoadBalancersApiLiveTest.java @@ -48,7 +48,7 @@ import com.google.inject.Injector; public class BaseCloudLoadBalancersApiLiveTest extends BaseContextLiveTest> { public BaseCloudLoadBalancersApiLiveTest() { - provider = "cloudloadbalancers"; + provider = "rackspace-cloudloadbalancers"; } protected CloudLoadBalancersApi client; diff --git a/providers/rackspace-cloudloadbalancers-uk/src/main/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKProviderMetadata.java b/providers/rackspace-cloudloadbalancers-uk/src/main/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKProviderMetadata.java index 6bec36b671..010841790a 100644 --- a/providers/rackspace-cloudloadbalancers-uk/src/main/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKProviderMetadata.java +++ b/providers/rackspace-cloudloadbalancers-uk/src/main/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKProviderMetadata.java @@ -70,7 +70,7 @@ public class CloudLoadBalancersUKProviderMetadata extends BaseProviderMetadata { public static class Builder extends BaseProviderMetadata.Builder { protected Builder(){ - id("cloudloadbalancers-uk") + id("rackspace-cloudloadbalancers-uk") .name("Rackspace Cloud Load Balancers UK") .apiMetadata(new CloudLoadBalancersApiMetadata().toBuilder() .identityName("${userName}") diff --git a/providers/rackspace-cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKLoadBalancerClientLiveTest.java b/providers/rackspace-cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKLoadBalancerClientLiveTest.java index fd659e4067..07e67e0bd2 100644 --- a/providers/rackspace-cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKLoadBalancerClientLiveTest.java +++ b/providers/rackspace-cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKLoadBalancerClientLiveTest.java @@ -28,6 +28,6 @@ import org.testng.annotations.Test; @Test(groups = "live", singleThreaded = true, testName = "CloudLoadBalancersUKLoadBalancerClientLiveTest") public class CloudLoadBalancersUKLoadBalancerClientLiveTest extends LoadBalancerApiLiveTest { public CloudLoadBalancersUKLoadBalancerClientLiveTest() { - provider = "cloudloadbalancers-uk"; + provider = "rackspace-cloudloadbalancers-uk"; } } diff --git a/providers/rackspace-cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKNodeClientLiveTest.java b/providers/rackspace-cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKNodeClientLiveTest.java index cd31ac21b1..787ca01cc9 100644 --- a/providers/rackspace-cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKNodeClientLiveTest.java +++ b/providers/rackspace-cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKNodeClientLiveTest.java @@ -28,6 +28,6 @@ import org.testng.annotations.Test; @Test(groups = "live", singleThreaded = true, testName = "CloudLoadBalancersUKNodeClientLiveTest") public class CloudLoadBalancersUKNodeClientLiveTest extends NodeApiLiveTest { public CloudLoadBalancersUKNodeClientLiveTest() { - provider = "cloudloadbalancers-uk"; + provider = "rackspace-cloudloadbalancers-uk"; } } diff --git a/providers/rackspace-cloudloadbalancers-us/src/main/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSProviderMetadata.java b/providers/rackspace-cloudloadbalancers-us/src/main/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSProviderMetadata.java index 3fd818f481..85c2388d5a 100644 --- a/providers/rackspace-cloudloadbalancers-us/src/main/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSProviderMetadata.java +++ b/providers/rackspace-cloudloadbalancers-us/src/main/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSProviderMetadata.java @@ -71,7 +71,7 @@ public class CloudLoadBalancersUSProviderMetadata extends BaseProviderMetadata { public static class Builder extends BaseProviderMetadata.Builder { protected Builder(){ - id("cloudloadbalancers-us") + id("rackspace-cloudloadbalancers-us") .name("Rackspace Cloud Load Balancers US") .apiMetadata(new CloudLoadBalancersApiMetadata().toBuilder() .identityName("${userName}") diff --git a/providers/rackspace-cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSLoadBalancerClientLiveTest.java b/providers/rackspace-cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSLoadBalancerClientLiveTest.java index 2e23ff2239..9b0f46e5d3 100644 --- a/providers/rackspace-cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSLoadBalancerClientLiveTest.java +++ b/providers/rackspace-cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSLoadBalancerClientLiveTest.java @@ -28,6 +28,6 @@ import org.testng.annotations.Test; @Test(groups = "live", singleThreaded = true, testName = "CloudLoadBalancersUSLoadBalancerClientLiveTest") public class CloudLoadBalancersUSLoadBalancerClientLiveTest extends LoadBalancerApiLiveTest { public CloudLoadBalancersUSLoadBalancerClientLiveTest() { - provider = "cloudloadbalancers-us"; + provider = "rackspace-cloudloadbalancers-us"; } } diff --git a/providers/rackspace-cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSNodeClientLiveTest.java b/providers/rackspace-cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSNodeClientLiveTest.java index 56d8ffb07a..ff8a3c017b 100644 --- a/providers/rackspace-cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSNodeClientLiveTest.java +++ b/providers/rackspace-cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSNodeClientLiveTest.java @@ -28,6 +28,6 @@ import org.testng.annotations.Test; @Test(groups = "live", singleThreaded = true, testName = "CloudLoadBalancersUSNodeClientLiveTest") public class CloudLoadBalancersUSNodeClientLiveTest extends NodeApiLiveTest { public CloudLoadBalancersUSNodeClientLiveTest() { - provider = "cloudloadbalancers-us"; + provider = "rackspace-cloudloadbalancers-us"; } }