Repository: jclouds-labs-openstack Updated Branches: refs/heads/keystonev3 d939ead58 -> d3afa6eea (forced update)
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/d3afa6ee/rackspace-cloudbigdata-us/src/main/java/org/jclouds/rackspace/cloudbigdata/us/v1/CloudBigDataUSProviderMetadata.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudbigdata-us/src/main/java/org/jclouds/rackspace/cloudbigdata/us/v1/CloudBigDataUSProviderMetadata.java b/rackspace-cloudbigdata-us/src/main/java/org/jclouds/rackspace/cloudbigdata/us/v1/CloudBigDataUSProviderMetadata.java index a8860c5..5960f66 100644 --- a/rackspace-cloudbigdata-us/src/main/java/org/jclouds/rackspace/cloudbigdata/us/v1/CloudBigDataUSProviderMetadata.java +++ b/rackspace-cloudbigdata-us/src/main/java/org/jclouds/rackspace/cloudbigdata/us/v1/CloudBigDataUSProviderMetadata.java @@ -19,20 +19,21 @@ package org.jclouds.rackspace.cloudbigdata.us.v1; import static org.jclouds.location.reference.LocationConstants.ISO3166_CODES; import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGION; import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGIONS; -import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE; -import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE; +import static org.jclouds.openstack.keystone.config.KeystoneProperties.CREDENTIAL_TYPE; +import static org.jclouds.openstack.keystone.config.KeystoneProperties.KEYSTONE_VERSION; +import static org.jclouds.openstack.keystone.config.KeystoneProperties.SERVICE_TYPE; import java.net.URI; import java.util.Properties; -import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.RegionModule; +import org.jclouds.openstack.keystone.catalog.config.ServiceCatalogModule; +import org.jclouds.openstack.keystone.catalog.config.ServiceCatalogModule.RegionModule; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; import org.jclouds.rackspace.cloudbigdata.v1.CloudBigDataApiMetadata; import org.jclouds.rackspace.cloudbigdata.v1.config.CloudBigDataHttpApiModule; import org.jclouds.rackspace.cloudbigdata.v1.config.CloudBigDataParserModule; 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; import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes; @@ -80,6 +81,7 @@ public class CloudBigDataUSProviderMetadata extends BaseProviderMetadata { Properties properties = new Properties(); properties.setProperty(CREDENTIAL_TYPE, CloudIdentityCredentialTypes.API_KEY_CREDENTIALS); properties.setProperty(SERVICE_TYPE, ServiceType.BIG_DATA); + properties.setProperty(KEYSTONE_VERSION, "2"); //properties.setProperty(PROPERTY_REGIONS, "ORD,DFW,SYD"); properties.setProperty(PROPERTY_REGIONS, "ORD"); properties.setProperty(PROPERTY_REGION + ".ORD." + ISO3166_CODES, "US-IL"); @@ -103,8 +105,8 @@ public class CloudBigDataUSProviderMetadata extends BaseProviderMetadata { .endpointName("identity service url ending in /v2.0/") .documentation(URI.create("http://docs.rackspace.com/cbs/api/v1.0/cbs-devguide/content/overview.html";)) .defaultModules(ImmutableSet.<Class<? extends Module>>builder() - .add(CloudIdentityAuthenticationApiModule.class) .add(CloudIdentityAuthenticationModule.class) + .add(ServiceCatalogModule.class) .add(RegionModule.class) .add(CloudBigDataParserModule.class) .add(CloudBigDataHttpApiModule.class).build()) http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/d3afa6ee/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApiMetadata.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApiMetadata.java b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApiMetadata.java index d426764..9d325a5 100644 --- a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApiMetadata.java +++ b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApiMetadata.java @@ -16,20 +16,21 @@ */ package org.jclouds.rackspace.cloudbigdata.v1; -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 static org.jclouds.openstack.keystone.config.KeystoneProperties.CREDENTIAL_TYPE; +import static org.jclouds.openstack.keystone.config.KeystoneProperties.KEYSTONE_VERSION; +import static org.jclouds.openstack.keystone.config.KeystoneProperties.SERVICE_TYPE; import java.net.URI; import java.util.Properties; import org.jclouds.apis.ApiMetadata; -import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes; -import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.RegionModule; +import org.jclouds.openstack.keystone.catalog.config.ServiceCatalogModule; +import org.jclouds.openstack.keystone.catalog.config.ServiceCatalogModule.RegionModule; import org.jclouds.rackspace.cloudbigdata.v1.config.CloudBigDataHttpApiModule; import org.jclouds.rackspace.cloudbigdata.v1.config.CloudBigDataParserModule; import org.jclouds.rackspace.cloudidentity.v2_0.ServiceType; -import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationApiModule; import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule; +import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes; import org.jclouds.rest.internal.BaseHttpApiMetadata; import com.google.auto.service.AutoService; @@ -63,7 +64,8 @@ public class CloudBigDataApiMetadata extends BaseHttpApiMetadata<CloudBigDataApi public static Properties defaultProperties() { Properties properties = BaseHttpApiMetadata.defaultProperties(); properties.setProperty(SERVICE_TYPE, ServiceType.BIG_DATA); - properties.setProperty(CREDENTIAL_TYPE, CredentialTypes.PASSWORD_CREDENTIALS); + properties.setProperty(CREDENTIAL_TYPE, CloudIdentityCredentialTypes.API_KEY_CREDENTIALS); + properties.setProperty(KEYSTONE_VERSION, "2"); return properties; } @@ -83,8 +85,8 @@ public class CloudBigDataApiMetadata extends BaseHttpApiMetadata<CloudBigDataApi .defaultEndpoint("http://localhost:5000/v2.0/";) .defaultProperties(CloudBigDataApiMetadata.defaultProperties()) .defaultModules(ImmutableSet.<Class<? extends Module>>builder() - .add(CloudIdentityAuthenticationApiModule.class) .add(CloudIdentityAuthenticationModule.class) + .add(ServiceCatalogModule.class) .add(RegionModule.class) .add(CloudBigDataParserModule.class) .add(CloudBigDataHttpApiModule.class) http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/d3afa6ee/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/config/CloudBigDataHttpApiModule.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/config/CloudBigDataHttpApiModule.java b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/config/CloudBigDataHttpApiModule.java index 011a5f4..5fa1d5e 100644 --- a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/config/CloudBigDataHttpApiModule.java +++ b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/config/CloudBigDataHttpApiModule.java @@ -24,8 +24,10 @@ import org.jclouds.http.HttpErrorHandler; import org.jclouds.http.annotation.ClientError; import org.jclouds.http.annotation.Redirection; import org.jclouds.http.annotation.ServerError; +import org.jclouds.openstack.keystone.auth.domain.AuthInfo; import org.jclouds.openstack.keystone.v2_0.domain.Access; import org.jclouds.openstack.keystone.v2_0.domain.Tenant; +import org.jclouds.openstack.keystone.v3.domain.Token; import org.jclouds.rackspace.cloudbigdata.v1.CloudBigDataApi; import org.jclouds.rackspace.cloudbigdata.v1.handlers.CloudBigDataErrorHandler; import org.jclouds.rest.ConfiguresHttpApi; @@ -67,14 +69,25 @@ public class CloudBigDataHttpApiModule extends HttpApiModule<CloudBigDataApi> { } @Provides - Supplier<Optional<Tenant>> supplyTenant(Supplier<Access> access) { + Supplier<Optional<String>> supplyTenant(Supplier<AuthInfo> access) { return Suppliers.compose(GetTenant.INSTANCE, access); } - private static enum GetTenant implements Function<Access, Optional<Tenant>> { + private static enum GetTenant implements Function<AuthInfo, Optional<String>> { INSTANCE; - public Optional<Tenant> apply(Access in){ - return in.getToken().getTenant(); + public Optional<String> apply(AuthInfo in) { + if (in instanceof Access) { + return Access.class.cast(in).getToken().getTenant().transform(new Function<Tenant, String>() { + @Override + public String apply(Tenant input) { + return input.getId(); + } + }); + } else if (in instanceof Token) { + // FIXME: What if user authenticated scoped to another project? + return Optional.of(Token.class.cast(in).user().defaultProjectId()); + } + return Optional.absent(); } } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/d3afa6ee/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/features/ClusterApi.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/features/ClusterApi.java b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/features/ClusterApi.java index 53242b9..541dd6f 100644 --- a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/features/ClusterApi.java +++ b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/features/ClusterApi.java @@ -30,7 +30,7 @@ import javax.ws.rs.core.MediaType; import org.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.javax.annotation.Nullable; -import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest; +import org.jclouds.openstack.keystone.auth.filters.AuthenticateRequest; import org.jclouds.rackspace.cloudbigdata.v1.domain.Cluster; import org.jclouds.rackspace.cloudbigdata.v1.domain.CreateCluster; import org.jclouds.rest.annotations.Fallback; http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/d3afa6ee/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/features/ProfileApi.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/features/ProfileApi.java b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/features/ProfileApi.java index ee17930..a60c164 100644 --- a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/features/ProfileApi.java +++ b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/features/ProfileApi.java @@ -27,7 +27,7 @@ import javax.ws.rs.core.MediaType; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.javax.annotation.Nullable; -import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest; +import org.jclouds.openstack.keystone.auth.filters.AuthenticateRequest; import org.jclouds.rackspace.cloudbigdata.v1.domain.CreateProfile; import org.jclouds.rackspace.cloudbigdata.v1.domain.Profile; import org.jclouds.rest.annotations.Fallback; http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/d3afa6ee/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/internal/BaseCloudBigDataApiLiveTest.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/internal/BaseCloudBigDataApiLiveTest.java b/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/internal/BaseCloudBigDataApiLiveTest.java index 3145c34..b528278 100644 --- a/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/internal/BaseCloudBigDataApiLiveTest.java +++ b/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/internal/BaseCloudBigDataApiLiveTest.java @@ -19,7 +19,7 @@ package org.jclouds.rackspace.cloudbigdata.v1.internal; import java.util.Properties; import org.jclouds.apis.BaseApiLiveTest; -import org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties; +import org.jclouds.openstack.keystone.config.KeystoneProperties; import org.jclouds.rackspace.cloudbigdata.v1.CloudBigDataApi; /** http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/d3afa6ee/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/internal/BaseCloudBigDataApiMockTest.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/internal/BaseCloudBigDataApiMockTest.java b/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/internal/BaseCloudBigDataApiMockTest.java index 792b89c..b2e8f9f 100644 --- a/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/internal/BaseCloudBigDataApiMockTest.java +++ b/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/internal/BaseCloudBigDataApiMockTest.java @@ -16,15 +16,15 @@ */ package org.jclouds.rackspace.cloudbigdata.v1.internal; -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 static org.jclouds.openstack.keystone.config.KeystoneProperties.CREDENTIAL_TYPE; +import static org.jclouds.openstack.keystone.config.KeystoneProperties.SERVICE_TYPE; import java.util.Properties; -import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes; import org.jclouds.openstack.v2_0.internal.BaseOpenStackMockTest; import org.jclouds.rackspace.cloudbigdata.v1.CloudBigDataApi; import org.jclouds.rackspace.cloudidentity.v2_0.ServiceType; +import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes; /** * Base class for writing Cloud Big Data Expect tests @@ -36,7 +36,7 @@ public class BaseCloudBigDataApiMockTest extends BaseOpenStackMockTest<CloudBigD */ public BaseCloudBigDataApiMockTest() { overrides = new Properties(); - overrides.setProperty(CREDENTIAL_TYPE, CredentialTypes.PASSWORD_CREDENTIALS); + overrides.setProperty(CREDENTIAL_TYPE, CloudIdentityCredentialTypes.API_KEY_CREDENTIALS); overrides.setProperty(SERVICE_TYPE, ServiceType.BIG_DATA); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/d3afa6ee/rackspace-cloudnetworks-uk/src/main/java/org/jclouds/rackspace/cloudnetworks/uk/CloudNetworksUKProviderMetadata.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudnetworks-uk/src/main/java/org/jclouds/rackspace/cloudnetworks/uk/CloudNetworksUKProviderMetadata.java b/rackspace-cloudnetworks-uk/src/main/java/org/jclouds/rackspace/cloudnetworks/uk/CloudNetworksUKProviderMetadata.java index 4cc4c16..620ad52 100644 --- a/rackspace-cloudnetworks-uk/src/main/java/org/jclouds/rackspace/cloudnetworks/uk/CloudNetworksUKProviderMetadata.java +++ b/rackspace-cloudnetworks-uk/src/main/java/org/jclouds/rackspace/cloudnetworks/uk/CloudNetworksUKProviderMetadata.java @@ -19,19 +19,20 @@ package org.jclouds.rackspace.cloudnetworks.uk; import static org.jclouds.location.reference.LocationConstants.ISO3166_CODES; import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGION; import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGIONS; -import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE; -import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE; +import static org.jclouds.openstack.keystone.config.KeystoneProperties.CREDENTIAL_TYPE; +import static org.jclouds.openstack.keystone.config.KeystoneProperties.KEYSTONE_VERSION; +import static org.jclouds.openstack.keystone.config.KeystoneProperties.SERVICE_TYPE; import java.net.URI; import java.util.Properties; -import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.RegionModule; +import org.jclouds.openstack.keystone.catalog.config.ServiceCatalogModule; +import org.jclouds.openstack.keystone.catalog.config.ServiceCatalogModule.RegionModule; import org.jclouds.openstack.neutron.v2.NeutronApiMetadata; import org.jclouds.openstack.neutron.v2.config.NeutronHttpApiModule; import org.jclouds.openstack.v2_0.ServiceType; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; -import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationApiModule; import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule; import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes; @@ -67,6 +68,7 @@ public class CloudNetworksUKProviderMetadata extends BaseProviderMetadata { Properties properties = new Properties(); properties.setProperty(CREDENTIAL_TYPE, CloudIdentityCredentialTypes.API_KEY_CREDENTIALS); properties.setProperty(SERVICE_TYPE, ServiceType.NETWORK); + properties.setProperty(KEYSTONE_VERSION, "2"); properties.setProperty(PROPERTY_REGIONS, "LON"); properties.setProperty(PROPERTY_REGION + ".LON." + ISO3166_CODES, "GB-SLG"); @@ -87,8 +89,8 @@ public class CloudNetworksUKProviderMetadata extends BaseProviderMetadata { .endpointName("Rackspace Cloud Identity service URL ending in /v2.0/") .version("2.0") .defaultModules(ImmutableSet.<Class<? extends Module>>builder() - .add(CloudIdentityAuthenticationApiModule.class) .add(CloudIdentityAuthenticationModule.class) + .add(ServiceCatalogModule.class) .add(RegionModule.class) .add(NeutronHttpApiModule.class) .build()) http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/d3afa6ee/rackspace-cloudnetworks-us/src/main/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSProviderMetadata.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudnetworks-us/src/main/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSProviderMetadata.java b/rackspace-cloudnetworks-us/src/main/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSProviderMetadata.java index 3920c20..60bff94 100644 --- a/rackspace-cloudnetworks-us/src/main/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSProviderMetadata.java +++ b/rackspace-cloudnetworks-us/src/main/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSProviderMetadata.java @@ -19,19 +19,20 @@ package org.jclouds.rackspace.cloudnetworks.us; import static org.jclouds.location.reference.LocationConstants.ISO3166_CODES; import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGION; import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGIONS; -import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE; -import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE; +import static org.jclouds.openstack.keystone.config.KeystoneProperties.CREDENTIAL_TYPE; +import static org.jclouds.openstack.keystone.config.KeystoneProperties.KEYSTONE_VERSION; +import static org.jclouds.openstack.keystone.config.KeystoneProperties.SERVICE_TYPE; import java.net.URI; import java.util.Properties; -import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.RegionModule; +import org.jclouds.openstack.keystone.catalog.config.ServiceCatalogModule; +import org.jclouds.openstack.keystone.catalog.config.ServiceCatalogModule.RegionModule; import org.jclouds.openstack.neutron.v2.NeutronApiMetadata; import org.jclouds.openstack.neutron.v2.config.NeutronHttpApiModule; import org.jclouds.openstack.v2_0.ServiceType; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; -import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationApiModule; import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule; import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes; @@ -67,6 +68,7 @@ public class CloudNetworksUSProviderMetadata extends BaseProviderMetadata { Properties properties = new Properties(); properties.setProperty(CREDENTIAL_TYPE, CloudIdentityCredentialTypes.API_KEY_CREDENTIALS); properties.setProperty(SERVICE_TYPE, ServiceType.NETWORK); + properties.setProperty(KEYSTONE_VERSION, "2"); properties.setProperty(PROPERTY_REGIONS, "ORD,DFW,IAD,SYD,HKG"); properties.setProperty(PROPERTY_REGION + ".ORD." + ISO3166_CODES, "US-IL"); @@ -91,8 +93,8 @@ public class CloudNetworksUSProviderMetadata extends BaseProviderMetadata { .endpointName("Rackspace Cloud Identity service URL ending in /v2.0/") .version("2.0") .defaultModules(ImmutableSet.<Class<? extends Module>>builder() - .add(CloudIdentityAuthenticationApiModule.class) .add(CloudIdentityAuthenticationModule.class) + .add(ServiceCatalogModule.class) .add(RegionModule.class) .add(NeutronHttpApiModule.class) .build()) http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/d3afa6ee/rackspace-cloudqueues-uk/src/main/java/org/jclouds/rackspace/cloudqueues/uk/CloudQueuesUKProviderMetadata.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudqueues-uk/src/main/java/org/jclouds/rackspace/cloudqueues/uk/CloudQueuesUKProviderMetadata.java b/rackspace-cloudqueues-uk/src/main/java/org/jclouds/rackspace/cloudqueues/uk/CloudQueuesUKProviderMetadata.java index 1810ba4..064f699 100644 --- a/rackspace-cloudqueues-uk/src/main/java/org/jclouds/rackspace/cloudqueues/uk/CloudQueuesUKProviderMetadata.java +++ b/rackspace-cloudqueues-uk/src/main/java/org/jclouds/rackspace/cloudqueues/uk/CloudQueuesUKProviderMetadata.java @@ -19,20 +19,21 @@ package org.jclouds.rackspace.cloudqueues.uk; import static org.jclouds.location.reference.LocationConstants.ISO3166_CODES; import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGION; import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGIONS; -import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE; -import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE; +import static org.jclouds.openstack.keystone.config.KeystoneProperties.CREDENTIAL_TYPE; +import static org.jclouds.openstack.keystone.config.KeystoneProperties.KEYSTONE_VERSION; +import static org.jclouds.openstack.keystone.config.KeystoneProperties.SERVICE_TYPE; import java.net.URI; import java.util.Properties; -import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.RegionModule; +import org.jclouds.openstack.keystone.catalog.config.ServiceCatalogModule; +import org.jclouds.openstack.keystone.catalog.config.ServiceCatalogModule.RegionModule; import org.jclouds.openstack.marconi.v1.MarconiApiMetadata; import org.jclouds.openstack.marconi.v1.config.MarconiHttpApiModule; import org.jclouds.openstack.marconi.v1.config.MarconiTypeAdapters; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; 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; import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes; @@ -67,6 +68,7 @@ public class CloudQueuesUKProviderMetadata extends BaseProviderMetadata { Properties properties = new Properties(); properties.setProperty(CREDENTIAL_TYPE, CloudIdentityCredentialTypes.API_KEY_CREDENTIALS); properties.setProperty(SERVICE_TYPE, ServiceType.QUEUES); + properties.setProperty(KEYSTONE_VERSION, "2"); properties.setProperty(PROPERTY_REGIONS, "LON"); properties.setProperty(PROPERTY_REGION + ".LON." + ISO3166_CODES, "GB-SLG"); @@ -85,8 +87,8 @@ public class CloudQueuesUKProviderMetadata extends BaseProviderMetadata { .endpointName("Rackspace Cloud Identity service URL ending in /v2.0/") .documentation(URI.create("http://docs.rackspace.com/queues/api/v1.0/cq-devguide/content/overview.html";)) .defaultModules(ImmutableSet.<Class<? extends Module>>builder() - .add(CloudIdentityAuthenticationApiModule.class) .add(CloudIdentityAuthenticationModule.class) + .add(ServiceCatalogModule.class) .add(RegionModule.class) .add(MarconiTypeAdapters.class) .add(MarconiHttpApiModule.class).build()) http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/d3afa6ee/rackspace-cloudqueues-us/src/main/java/org/jclouds/rackspace/cloudqueues/us/CloudQueuesUSProviderMetadata.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudqueues-us/src/main/java/org/jclouds/rackspace/cloudqueues/us/CloudQueuesUSProviderMetadata.java b/rackspace-cloudqueues-us/src/main/java/org/jclouds/rackspace/cloudqueues/us/CloudQueuesUSProviderMetadata.java index d3bc8f2..c080001 100644 --- a/rackspace-cloudqueues-us/src/main/java/org/jclouds/rackspace/cloudqueues/us/CloudQueuesUSProviderMetadata.java +++ b/rackspace-cloudqueues-us/src/main/java/org/jclouds/rackspace/cloudqueues/us/CloudQueuesUSProviderMetadata.java @@ -19,20 +19,21 @@ package org.jclouds.rackspace.cloudqueues.us; import static org.jclouds.location.reference.LocationConstants.ISO3166_CODES; import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGION; import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGIONS; -import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE; -import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE; +import static org.jclouds.openstack.keystone.config.KeystoneProperties.CREDENTIAL_TYPE; +import static org.jclouds.openstack.keystone.config.KeystoneProperties.KEYSTONE_VERSION; +import static org.jclouds.openstack.keystone.config.KeystoneProperties.SERVICE_TYPE; import java.net.URI; import java.util.Properties; -import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.RegionModule; +import org.jclouds.openstack.keystone.catalog.config.ServiceCatalogModule; +import org.jclouds.openstack.keystone.catalog.config.ServiceCatalogModule.RegionModule; import org.jclouds.openstack.marconi.v1.MarconiApiMetadata; import org.jclouds.openstack.marconi.v1.config.MarconiHttpApiModule; import org.jclouds.openstack.marconi.v1.config.MarconiTypeAdapters; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; 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; import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes; @@ -67,6 +68,7 @@ public class CloudQueuesUSProviderMetadata extends BaseProviderMetadata { Properties properties = new Properties(); properties.setProperty(CREDENTIAL_TYPE, CloudIdentityCredentialTypes.API_KEY_CREDENTIALS); properties.setProperty(SERVICE_TYPE, ServiceType.QUEUES); + properties.setProperty(KEYSTONE_VERSION, "2"); properties.setProperty(PROPERTY_REGIONS, "ORD,DFW,IAD,SYD,HKG"); properties.setProperty(PROPERTY_REGION + ".ORD." + ISO3166_CODES, "US-IL"); @@ -90,8 +92,8 @@ public class CloudQueuesUSProviderMetadata extends BaseProviderMetadata { .endpointName("Rackspace Cloud Identity service URL ending in /v2.0/") .documentation(URI.create("http://docs.rackspace.com/queues/api/v1.0/cq-devguide/content/overview.html";)) .defaultModules(ImmutableSet.<Class<? extends Module>>builder() - .add(CloudIdentityAuthenticationApiModule.class) .add(CloudIdentityAuthenticationModule.class) + .add(ServiceCatalogModule.class) .add(RegionModule.class) .add(MarconiTypeAdapters.class) .add(MarconiHttpApiModule.class).build()) http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/d3afa6ee/rackspace-orchestration-uk/src/main/java/org/jclouds/rackspace/orchestration/uk/OrchestrationUKProviderMetadata.java ---------------------------------------------------------------------- diff --git a/rackspace-orchestration-uk/src/main/java/org/jclouds/rackspace/orchestration/uk/OrchestrationUKProviderMetadata.java b/rackspace-orchestration-uk/src/main/java/org/jclouds/rackspace/orchestration/uk/OrchestrationUKProviderMetadata.java index 1307a5d..1cab795 100644 --- a/rackspace-orchestration-uk/src/main/java/org/jclouds/rackspace/orchestration/uk/OrchestrationUKProviderMetadata.java +++ b/rackspace-orchestration-uk/src/main/java/org/jclouds/rackspace/orchestration/uk/OrchestrationUKProviderMetadata.java @@ -19,19 +19,20 @@ package org.jclouds.rackspace.orchestration.uk; import static org.jclouds.location.reference.LocationConstants.ISO3166_CODES; import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGION; import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGIONS; -import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE; -import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE; +import static org.jclouds.openstack.keystone.config.KeystoneProperties.CREDENTIAL_TYPE; +import static org.jclouds.openstack.keystone.config.KeystoneProperties.KEYSTONE_VERSION; +import static org.jclouds.openstack.keystone.config.KeystoneProperties.SERVICE_TYPE; import java.net.URI; import java.util.Properties; import org.jclouds.openstack.heat.v1.HeatApiMetadata; import org.jclouds.openstack.heat.v1.config.HeatHttpApiModule; -import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.RegionModule; +import org.jclouds.openstack.keystone.catalog.config.ServiceCatalogModule; +import org.jclouds.openstack.keystone.catalog.config.ServiceCatalogModule.RegionModule; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; 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; import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes; @@ -73,6 +74,7 @@ public class OrchestrationUKProviderMetadata extends BaseProviderMetadata { Properties properties = new Properties(); properties.setProperty(CREDENTIAL_TYPE, CloudIdentityCredentialTypes.API_KEY_CREDENTIALS); properties.setProperty(SERVICE_TYPE, ServiceType.ORCHESTRATION); + properties.setProperty(KEYSTONE_VERSION, "2"); properties.setProperty(PROPERTY_REGIONS, "LON"); properties.setProperty(PROPERTY_REGION + ".LON." + ISO3166_CODES, "GB-SLG"); @@ -93,8 +95,8 @@ public class OrchestrationUKProviderMetadata extends BaseProviderMetadata { .endpointName("Rackspace Cloud Identity service URL ending in /v2.0/") .version("1") .defaultModules(ImmutableSet.<Class<? extends Module>>builder() - .add(CloudIdentityAuthenticationApiModule.class) .add(CloudIdentityAuthenticationModule.class) + .add(ServiceCatalogModule.class) .add(RegionModule.class) .add(HeatHttpApiModule.class) .build()) http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/d3afa6ee/rackspace-orchestration-us/src/main/java/org/jclouds/rackspace/orchestration/us/OrchestrationUSProviderMetadata.java ---------------------------------------------------------------------- diff --git a/rackspace-orchestration-us/src/main/java/org/jclouds/rackspace/orchestration/us/OrchestrationUSProviderMetadata.java b/rackspace-orchestration-us/src/main/java/org/jclouds/rackspace/orchestration/us/OrchestrationUSProviderMetadata.java index a870995..f57e613 100644 --- a/rackspace-orchestration-us/src/main/java/org/jclouds/rackspace/orchestration/us/OrchestrationUSProviderMetadata.java +++ b/rackspace-orchestration-us/src/main/java/org/jclouds/rackspace/orchestration/us/OrchestrationUSProviderMetadata.java @@ -19,19 +19,20 @@ package org.jclouds.rackspace.orchestration.us; import static org.jclouds.location.reference.LocationConstants.ISO3166_CODES; import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGION; import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGIONS; -import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE; -import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE; +import static org.jclouds.openstack.keystone.config.KeystoneProperties.CREDENTIAL_TYPE; +import static org.jclouds.openstack.keystone.config.KeystoneProperties.KEYSTONE_VERSION; +import static org.jclouds.openstack.keystone.config.KeystoneProperties.SERVICE_TYPE; import java.net.URI; import java.util.Properties; import org.jclouds.openstack.heat.v1.HeatApiMetadata; import org.jclouds.openstack.heat.v1.config.HeatHttpApiModule; -import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.RegionModule; +import org.jclouds.openstack.keystone.catalog.config.ServiceCatalogModule; +import org.jclouds.openstack.keystone.catalog.config.ServiceCatalogModule.RegionModule; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; 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; import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes; @@ -73,6 +74,7 @@ public class OrchestrationUSProviderMetadata extends BaseProviderMetadata { Properties properties = new Properties(); properties.setProperty(CREDENTIAL_TYPE, CloudIdentityCredentialTypes.API_KEY_CREDENTIALS); properties.setProperty(SERVICE_TYPE, ServiceType.ORCHESTRATION); + properties.setProperty(KEYSTONE_VERSION, "2"); properties.setProperty(PROPERTY_REGIONS, "ORD,DFW,IAD,SYD,HKG"); properties.setProperty(PROPERTY_REGION + ".ORD." + ISO3166_CODES, "US-IL"); @@ -98,8 +100,8 @@ public class OrchestrationUSProviderMetadata extends BaseProviderMetadata { .endpointName("Rackspace Cloud Identity service URL ending in /v2.0/") .version("1") .defaultModules(ImmutableSet.<Class<? extends Module>>builder() - .add(CloudIdentityAuthenticationApiModule.class) .add(CloudIdentityAuthenticationModule.class) + .add(ServiceCatalogModule.class) .add(RegionModule.class) .add(HeatHttpApiModule.class) .build())
