Updated Branches: refs/heads/master c2524d07a -> 80c730dcf
Fixes UK identity endpoint for rackspace Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/commit/80c730dc Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/tree/80c730dc Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/diff/80c730dc Branch: refs/heads/master Commit: 80c730dcf231da7d93e8a8f58176470de5687df4 Parents: c2524d0 Author: zack-shoylev <[email protected]> Authored: Mon Jul 8 16:26:09 2013 -0500 Committer: Everett Toews <[email protected]> Committed: Mon Jul 15 08:56:05 2013 -0500 ---------------------------------------------------------------------- .../clouddatabases/uk/CloudDatabasesUKProviderMetadata.java | 4 ++-- .../uk/CloudDatabasesUKProviderMetadataExpectTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/80c730dc/rackspace-clouddatabases-uk/src/main/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadata.java ---------------------------------------------------------------------- diff --git a/rackspace-clouddatabases-uk/src/main/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadata.java b/rackspace-clouddatabases-uk/src/main/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadata.java index dd56dfc..f6cfaa0 100644 --- a/rackspace-clouddatabases-uk/src/main/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadata.java +++ b/rackspace-clouddatabases-uk/src/main/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadata.java @@ -79,7 +79,7 @@ public class CloudDatabasesUKProviderMetadata extends BaseProviderMetadata { .apiMetadata(new TroveApiMetadata().toBuilder() .identityName("${userName}") .credentialName("${apiKey}") - .defaultEndpoint("https://lon.api.rackspacecloud.com/v2.0/";) + .defaultEndpoint("https://lon.identity.api.rackspacecloud.com/v2.0";) .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() @@ -93,7 +93,7 @@ public class CloudDatabasesUKProviderMetadata extends BaseProviderMetadata { .console(URI.create("https://mycloud.rackspace.com";)) .linkedServices("rackspace-cloudservers-uk", "cloudfiles-uk") .iso3166Codes("GB-SLG") - .endpoint("https://lon.api.rackspacecloud.com/v2.0/";) + .endpoint("https://lon.identity.api.rackspacecloud.com/v2.0";) .defaultProperties(CloudDatabasesUKProviderMetadata.defaultProperties()); } http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/80c730dc/rackspace-clouddatabases-uk/src/test/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadataExpectTest.java ---------------------------------------------------------------------- diff --git a/rackspace-clouddatabases-uk/src/test/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadataExpectTest.java b/rackspace-clouddatabases-uk/src/test/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadataExpectTest.java index afbfc4a..d0f7143 100644 --- a/rackspace-clouddatabases-uk/src/test/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadataExpectTest.java +++ b/rackspace-clouddatabases-uk/src/test/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadataExpectTest.java @@ -43,7 +43,7 @@ public class CloudDatabasesUKProviderMetadataExpectTest extends BaseTroveApiExpe public void testCanGetConfiguredZones() { HttpRequest authenticate = HttpRequest.builder().method("POST") - .endpoint("https://lon.api.rackspacecloud.com/v2.0/tokens";) + .endpoint("https://lon.identity.api.rackspacecloud.com/v2.0/tokens";) .addHeader("Accept", "application/json") .payload(payloadFromStringWithContentType( "{\"auth\":{\"RAX-KSKEY:apiKeyCredentials\":{\"username\":\"myUsername\",\"apiKey\":\"myApiKey\"}}}"
