Repository: jclouds Updated Branches: refs/heads/master 9009bb526 -> 744cd5d7e
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/providers/rackspace-cloudblockstorage-us/src/main/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadata.java ---------------------------------------------------------------------- diff --git a/providers/rackspace-cloudblockstorage-us/src/main/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadata.java b/providers/rackspace-cloudblockstorage-us/src/main/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadata.java index 2a711f5..5741b15 100644 --- a/providers/rackspace-cloudblockstorage-us/src/main/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadata.java +++ b/providers/rackspace-cloudblockstorage-us/src/main/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadata.java @@ -17,8 +17,8 @@ package org.jclouds.rackspace.cloudblockstorage.us; 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 java.net.URI; @@ -27,7 +27,7 @@ import java.util.Properties; import org.jclouds.openstack.cinder.v1.CinderApiMetadata; import org.jclouds.openstack.cinder.v1.config.CinderHttpApiModule; import org.jclouds.openstack.cinder.v1.config.CinderParserModule; -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.cloudidentity.v2_0.config.CloudIdentityAuthenticationApiModule; @@ -62,15 +62,15 @@ public class CloudBlockStorageUSProviderMetadata extends BaseProviderMetadata { public static Properties defaultProperties() { Properties properties = new Properties(); properties.setProperty(CREDENTIAL_TYPE, CloudIdentityCredentialTypes.API_KEY_CREDENTIALS); - 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() { @@ -85,7 +85,7 @@ public class CloudBlockStorageUSProviderMetadata extends BaseProviderMetadata { .defaultModules(ImmutableSet.<Class<? extends Module>>builder() .add(CloudIdentityAuthenticationApiModule.class) .add(CloudIdentityAuthenticationModule.class) - .add(ZoneModule.class) + .add(RegionModule.class) .add(CinderParserModule.class) .add(CinderHttpApiModule.class).build()) .build()) http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/providers/rackspace-cloudblockstorage-us/src/test/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadataExpectTest.java ---------------------------------------------------------------------- diff --git a/providers/rackspace-cloudblockstorage-us/src/test/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadataExpectTest.java b/providers/rackspace-cloudblockstorage-us/src/test/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadataExpectTest.java index 04f63ae..0ffbdcb 100644 --- a/providers/rackspace-cloudblockstorage-us/src/test/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadataExpectTest.java +++ b/providers/rackspace-cloudblockstorage-us/src/test/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadataExpectTest.java @@ -38,15 +38,15 @@ public class CloudBlockStorageUSProviderMetadataExpectTest extends BaseCinderApi this.credential = "myApiKey"; } - public void testCanGetConfiguredZones() { - + public void testCanGetConfiguredRegions() { + HttpRequest authenticate = HttpRequest.builder().method("POST") .endpoint("https://identity.api.rackspacecloud.com/v2.0/tokens";) .addHeader("Accept", "application/json") .payload(payloadFromStringWithContentType( "{\"auth\":{\"RAX-KSKEY:apiKeyCredentials\":{\"username\":\"myUsername\",\"apiKey\":\"myApiKey\"}}}" , "application/json")).build(); - + HttpResponse authenticationResponse = HttpResponse.builder() .statusCode(200) @@ -55,7 +55,7 @@ public class CloudBlockStorageUSProviderMetadataExpectTest extends BaseCinderApi CinderApi whenNovaRegionExists = requestSendsResponse(authenticate, authenticationResponse); - assertEquals(whenNovaRegionExists.getConfiguredZones(), ImmutableSet.of("ORD", "DFW")); + assertEquals(whenNovaRegionExists.getConfiguredRegions(), ImmutableSet.of("ORD", "DFW")); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/providers/rackspace-clouddatabases-uk/src/main/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadata.java ---------------------------------------------------------------------- diff --git a/providers/rackspace-clouddatabases-uk/src/main/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadata.java b/providers/rackspace-clouddatabases-uk/src/main/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadata.java index 08de510..fa146d6 100644 --- a/providers/rackspace-clouddatabases-uk/src/main/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadata.java +++ b/providers/rackspace-clouddatabases-uk/src/main/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadata.java @@ -17,15 +17,15 @@ package org.jclouds.rackspace.clouddatabases.uk; 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.openstack.trove.v1.TroveApiMetadata; import org.jclouds.openstack.trove.v1.config.TroveHttpApiModule; import org.jclouds.openstack.trove.v1.config.TroveParserModule; @@ -65,8 +65,8 @@ public class CloudDatabasesUKProviderMetadata extends BaseProviderMetadata { Properties properties = new Properties(); properties.setProperty(CREDENTIAL_TYPE, CloudIdentityCredentialTypes.API_KEY_CREDENTIALS); properties.setProperty(SERVICE_TYPE, ServiceType.DATABASES); - 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; } @@ -84,7 +84,7 @@ public class CloudDatabasesUKProviderMetadata extends BaseProviderMetadata { .defaultModules(ImmutableSet.<Class<? extends Module>>builder() .add(CloudIdentityAuthenticationApiModule.class) .add(CloudIdentityAuthenticationModule.class) - .add(ZoneModule.class) + .add(RegionModule.class) .add(TroveParserModule.class) .add(TroveHttpApiModule.class).build()) .build()) http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/providers/rackspace-clouddatabases-uk/src/test/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadataExpectTest.java ---------------------------------------------------------------------- diff --git a/providers/rackspace-clouddatabases-uk/src/test/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadataExpectTest.java b/providers/rackspace-clouddatabases-uk/src/test/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadataExpectTest.java index d1065dc..5cf11b8 100644 --- a/providers/rackspace-clouddatabases-uk/src/test/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadataExpectTest.java +++ b/providers/rackspace-clouddatabases-uk/src/test/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadataExpectTest.java @@ -38,15 +38,15 @@ public class CloudDatabasesUKProviderMetadataExpectTest extends BaseTroveApiExpe this.credential = "myApiKey"; } - public void testCanGetConfiguredZones() { - + public void testCanGetConfiguredRegions() { + HttpRequest authenticate = HttpRequest.builder().method("POST") .endpoint("https://lon.identity.api.rackspacecloud.com/v2.0/tokens";) .addHeader("Accept", "application/json") .payload(payloadFromStringWithContentType( "{\"auth\":{\"RAX-KSKEY:apiKeyCredentials\":{\"username\":\"myUsername\",\"apiKey\":\"myApiKey\"}}}" , "application/json")).build(); - + HttpResponse authenticationResponse = HttpResponse.builder() .statusCode(200) @@ -55,7 +55,7 @@ public class CloudDatabasesUKProviderMetadataExpectTest extends BaseTroveApiExpe TroveApi whenNovaRegionExists = requestSendsResponse(authenticate, authenticationResponse); - assertEquals(whenNovaRegionExists.getConfiguredZones(), ImmutableSet.of("LON")); + assertEquals(whenNovaRegionExists.getConfiguredRegions(), ImmutableSet.of("LON")); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/providers/rackspace-clouddatabases-us/src/main/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadata.java ---------------------------------------------------------------------- diff --git a/providers/rackspace-clouddatabases-us/src/main/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadata.java b/providers/rackspace-clouddatabases-us/src/main/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadata.java index f9d720e..f72e4fa 100644 --- a/providers/rackspace-clouddatabases-us/src/main/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadata.java +++ b/providers/rackspace-clouddatabases-us/src/main/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadata.java @@ -17,15 +17,15 @@ package org.jclouds.rackspace.clouddatabases.us; 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.openstack.trove.v1.TroveApiMetadata; import org.jclouds.openstack.trove.v1.config.TroveHttpApiModule; import org.jclouds.openstack.trove.v1.config.TroveParserModule; @@ -65,12 +65,12 @@ public class CloudDatabasesUSProviderMetadata extends BaseProviderMetadata { Properties properties = new Properties(); properties.setProperty(CREDENTIAL_TYPE, CloudIdentityCredentialTypes.API_KEY_CREDENTIALS); properties.setProperty(SERVICE_TYPE, ServiceType.DATABASES); - 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; } @@ -88,7 +88,7 @@ public class CloudDatabasesUSProviderMetadata extends BaseProviderMetadata { .defaultModules(ImmutableSet.<Class<? extends Module>>builder() .add(CloudIdentityAuthenticationApiModule.class) .add(CloudIdentityAuthenticationModule.class) - .add(ZoneModule.class) + .add(RegionModule.class) .add(TroveParserModule.class) .add(TroveHttpApiModule.class).build()) .build()) http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/providers/rackspace-clouddatabases-us/src/test/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadataExpectTest.java ---------------------------------------------------------------------- diff --git a/providers/rackspace-clouddatabases-us/src/test/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadataExpectTest.java b/providers/rackspace-clouddatabases-us/src/test/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadataExpectTest.java index 40190fe..eeeccc7 100644 --- a/providers/rackspace-clouddatabases-us/src/test/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadataExpectTest.java +++ b/providers/rackspace-clouddatabases-us/src/test/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadataExpectTest.java @@ -38,15 +38,15 @@ public class CloudDatabasesUSProviderMetadataExpectTest extends BaseTroveApiExpe this.credential = "myApiKey"; } - public void testCanGetConfiguredZones() { - + public void testCanGetConfiguredRegions() { + HttpRequest authenticate = HttpRequest.builder().method("POST") .endpoint("https://identity.api.rackspacecloud.com/v2.0/tokens";) .addHeader("Accept", "application/json") .payload(payloadFromStringWithContentType( "{\"auth\":{\"RAX-KSKEY:apiKeyCredentials\":{\"username\":\"myUsername\",\"apiKey\":\"myApiKey\"}}}" , "application/json")).build(); - + HttpResponse authenticationResponse = HttpResponse.builder() .statusCode(200) @@ -55,7 +55,7 @@ public class CloudDatabasesUSProviderMetadataExpectTest extends BaseTroveApiExpe TroveApi whenRegionExists = requestSendsResponse(authenticate, authenticationResponse); - assertEquals(whenRegionExists.getConfiguredZones(), ImmutableSet.of("ORD", "DFW", "SYD")); + assertEquals(whenRegionExists.getConfiguredRegions(), ImmutableSet.of("ORD", "DFW", "SYD")); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/providers/rackspace-cloudloadbalancers-uk/src/main/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKProviderMetadata.java ---------------------------------------------------------------------- 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 f5b2fa5..ffd4111 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 @@ -17,8 +17,8 @@ package org.jclouds.rackspace.cloudloadbalancers.uk; 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 java.net.URI; import java.util.Properties; @@ -31,7 +31,7 @@ import org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApiMetadata * Implementation of {@link org.jclouds.types.ProviderMetadata} for Rackspace Cloud LoadBalancers UK. */ public class CloudLoadBalancersUKProviderMetadata extends BaseProviderMetadata { - + public static Builder builder() { return new Builder(); } @@ -40,7 +40,7 @@ public class CloudLoadBalancersUKProviderMetadata extends BaseProviderMetadata { public Builder toBuilder() { return builder().fromProviderMetadata(this); } - + public CloudLoadBalancersUKProviderMetadata() { super(builder()); } @@ -51,8 +51,8 @@ public class CloudLoadBalancersUKProviderMetadata extends BaseProviderMetadata { public static Properties defaultProperties() { Properties properties = new Properties(); - 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 { @@ -75,7 +75,7 @@ public class CloudLoadBalancersUKProviderMetadata extends BaseProviderMetadata { public CloudLoadBalancersUKProviderMetadata build() { return new CloudLoadBalancersUKProviderMetadata(this); } - + @Override public Builder fromProviderMetadata( ProviderMetadata in) { http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/providers/rackspace-cloudloadbalancers-us/src/main/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSProviderMetadata.java ---------------------------------------------------------------------- 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 d388d51..3aeb55c 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 @@ -17,8 +17,8 @@ package org.jclouds.rackspace.cloudloadbalancers.us; 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 java.net.URI; import java.util.Properties; @@ -40,7 +40,7 @@ public class CloudLoadBalancersUSProviderMetadata extends BaseProviderMetadata { public Builder toBuilder() { return builder().fromProviderMetadata(this); } - + public CloudLoadBalancersUSProviderMetadata() { super(builder()); } @@ -51,15 +51,15 @@ public class CloudLoadBalancersUSProviderMetadata extends BaseProviderMetadata { public static Properties defaultProperties() { Properties properties = new Properties(); - 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() { @@ -80,7 +80,7 @@ public class CloudLoadBalancersUSProviderMetadata extends BaseProviderMetadata { public CloudLoadBalancersUSProviderMetadata build() { return new CloudLoadBalancersUSProviderMetadata(this); } - + @Override public Builder fromProviderMetadata( ProviderMetadata in) { http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/providers/rackspace-cloudservers-uk/src/main/java/org/jclouds/rackspace/cloudservers/uk/CloudServersUKProviderMetadata.java ---------------------------------------------------------------------- diff --git a/providers/rackspace-cloudservers-uk/src/main/java/org/jclouds/rackspace/cloudservers/uk/CloudServersUKProviderMetadata.java b/providers/rackspace-cloudservers-uk/src/main/java/org/jclouds/rackspace/cloudservers/uk/CloudServersUKProviderMetadata.java index 945bd3e..80c94ea 100644 --- a/providers/rackspace-cloudservers-uk/src/main/java/org/jclouds/rackspace/cloudservers/uk/CloudServersUKProviderMetadata.java +++ b/providers/rackspace-cloudservers-uk/src/main/java/org/jclouds/rackspace/cloudservers/uk/CloudServersUKProviderMetadata.java @@ -17,14 +17,14 @@ package org.jclouds.rackspace.cloudservers.uk; 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 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.openstack.nova.v2_0.NovaApiMetadata; import org.jclouds.openstack.nova.v2_0.config.NovaHttpApiModule; import org.jclouds.openstack.nova.v2_0.config.NovaParserModule; @@ -51,7 +51,7 @@ public class CloudServersUKProviderMetadata extends BaseProviderMetadata { public Builder toBuilder() { return builder().fromProviderMetadata(this); } - + public CloudServersUKProviderMetadata() { super(builder()); } @@ -63,11 +63,11 @@ public class CloudServersUKProviderMetadata extends BaseProviderMetadata { public static Properties defaultProperties() { Properties properties = new Properties(); properties.setProperty(CREDENTIAL_TYPE, CloudIdentityCredentialTypes.API_KEY_CREDENTIALS); - 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() { @@ -83,7 +83,7 @@ public class CloudServersUKProviderMetadata extends BaseProviderMetadata { .defaultModules(ImmutableSet.<Class<? extends Module>>builder() .add(CloudIdentityAuthenticationApiModule.class) .add(CloudIdentityAuthenticationModule.class) - .add(ZoneModule.class) + .add(RegionModule.class) .add(NovaParserModule.class) .add(NovaHttpApiModule.class) .add(CloudServersUKComputeServiceContextModule.class).build()) http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/providers/rackspace-cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/uk/CloudServersUKProviderMetadataExpectTest.java ---------------------------------------------------------------------- diff --git a/providers/rackspace-cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/uk/CloudServersUKProviderMetadataExpectTest.java b/providers/rackspace-cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/uk/CloudServersUKProviderMetadataExpectTest.java index 51ff85c..aaadc20 100644 --- a/providers/rackspace-cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/uk/CloudServersUKProviderMetadataExpectTest.java +++ b/providers/rackspace-cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/uk/CloudServersUKProviderMetadataExpectTest.java @@ -38,22 +38,22 @@ public class CloudServersUKProviderMetadataExpectTest extends BaseNovaApiExpectT this.credential = "myApiKey"; } - public void testCanGetConfiguredZones() { - + public void testCanGetConfiguredRegions() { + HttpRequest authenticate = HttpRequest.builder().method("POST") .endpoint("https://lon.identity.api.rackspacecloud.com/v2.0/tokens";) .addHeader("Accept", "application/json") .payload(payloadFromStringWithContentType( "{\"auth\":{\"RAX-KSKEY:apiKeyCredentials\":{\"username\":\"myUsername\",\"apiKey\":\"myApiKey\"}}}" , "application/json")).build(); - + HttpResponse authenticationResponse = HttpResponse.builder().statusCode(200) .payload(payloadFromResourceWithContentType("/access_rax_uk.json", "application/json")).build(); NovaApi whenNovaRegionExists = requestSendsResponse(authenticate, authenticationResponse); - assertEquals(whenNovaRegionExists.getConfiguredZones(), ImmutableSet.of("LON")); + assertEquals(whenNovaRegionExists.getConfiguredRegions(), ImmutableSet.of("LON")); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/providers/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java ---------------------------------------------------------------------- diff --git a/providers/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java b/providers/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java index 87b2d98..9502934 100644 --- a/providers/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java +++ b/providers/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java @@ -17,14 +17,14 @@ package org.jclouds.rackspace.cloudservers.us; 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 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.openstack.nova.v2_0.NovaApiMetadata; import org.jclouds.openstack.nova.v2_0.config.NovaHttpApiModule; import org.jclouds.openstack.nova.v2_0.config.NovaParserModule; @@ -51,7 +51,7 @@ public class CloudServersUSProviderMetadata extends BaseProviderMetadata { public Builder toBuilder() { return builder().fromProviderMetadata(this); } - + public CloudServersUSProviderMetadata() { super(builder()); } @@ -63,15 +63,15 @@ public class CloudServersUSProviderMetadata extends BaseProviderMetadata { public static Properties defaultProperties() { Properties properties = new Properties(); properties.setProperty(CREDENTIAL_TYPE, CloudIdentityCredentialTypes.API_KEY_CREDENTIALS); - 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() { @@ -87,7 +87,7 @@ public class CloudServersUSProviderMetadata extends BaseProviderMetadata { .defaultModules(ImmutableSet.<Class<? extends Module>>builder() .add(CloudIdentityAuthenticationApiModule.class) .add(CloudIdentityAuthenticationModule.class) - .add(ZoneModule.class) + .add(RegionModule.class) .add(NovaParserModule.class) .add(NovaHttpApiModule.class) .add(CloudServersUSComputeServiceContextModule.class).build()) http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/providers/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadataExpectTest.java ---------------------------------------------------------------------- diff --git a/providers/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadataExpectTest.java b/providers/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadataExpectTest.java index 6e10043..5f49924 100644 --- a/providers/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadataExpectTest.java +++ b/providers/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadataExpectTest.java @@ -38,22 +38,22 @@ public class CloudServersUSProviderMetadataExpectTest extends BaseNovaApiExpectT this.credential = "myApiKey"; } - public void testCanGetConfiguredZones() { - + public void testCanGetConfiguredRegions() { + HttpRequest authenticate = HttpRequest.builder().method("POST") .endpoint("https://identity.api.rackspacecloud.com/v2.0/tokens";) .addHeader("Accept", "application/json") .payload(payloadFromStringWithContentType( "{\"auth\":{\"RAX-KSKEY:apiKeyCredentials\":{\"username\":\"myUsername\",\"apiKey\":\"myApiKey\"}}}" , "application/json")).build(); - + HttpResponse authenticationResponse = HttpResponse.builder().statusCode(200) .payload(payloadFromResourceWithContentType("/access_rax_us.json", "application/json")).build(); NovaApi whenNovaRegionExists = requestSendsResponse(authenticate, authenticationResponse); - assertEquals(whenNovaRegionExists.getConfiguredZones(), ImmutableSet.of("ORD", "DFW")); + assertEquals(whenNovaRegionExists.getConfiguredRegions(), ImmutableSet.of("ORD", "DFW")); }
