Merge pull request #1068 from rackspace/rax-clb-rename

Renamed internal ID from cloudloadbalancers to rackspace-cloudloadbalancers.
This commit is contained in:
Andrew Gaul 2012-12-13 11:20:32 -08:00
commit 5b49b65bcd
10 changed files with 10 additions and 10 deletions

View File

@ -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")

View File

@ -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<LoadBalancer> response = client.getLoadBalancerApiForZone(zone).list().concat().toImmutableSet();
assertNotNull(response);

View File

@ -37,7 +37,7 @@ public class BaseCloudLoadBalancerApiExpectTest<T> extends BaseRestApiExpectTest
protected HttpResponse responseWithAccess;
public BaseCloudLoadBalancerApiExpectTest() {
provider = "cloudloadbalancers";
provider = "rackspace-cloudloadbalancers";
rackspaceAuthWithUsernameAndApiKey = RackspaceFixture.INSTANCE
.initialAuthWithUsernameAndApiKey(identity, credential);

View File

@ -48,7 +48,7 @@ import com.google.inject.Injector;
public class BaseCloudLoadBalancersApiLiveTest extends BaseContextLiveTest<RestContext<CloudLoadBalancersApi, CloudLoadBalancersAsyncApi>> {
public BaseCloudLoadBalancersApiLiveTest() {
provider = "cloudloadbalancers";
provider = "rackspace-cloudloadbalancers";
}
protected CloudLoadBalancersApi client;

View File

@ -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}")

View File

@ -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";
}
}

View File

@ -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";
}
}

View File

@ -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}")

View File

@ -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";
}
}

View File

@ -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";
}
}