| commit | 80c730dcf231da7d93e8a8f58176470de5687df4 | [log] [tgz] |
|---|---|---|
| author | zack-shoylev <zack.shoylev@rackspace.com> | Mon Jul 08 16:26:09 2013 -0500 |
| committer | Everett Toews <everett.toews@rackspace.com> | Mon Jul 15 08:56:05 2013 -0500 |
| tree | 20ba6cd048217330d6f8018f8b247bf538194825 | |
| parent | c2524d07afa603e8c095e06f560d5a69a54a2e4a [diff] |
Fixes UK identity endpoint for rackspace
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 @@ .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 @@ .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()); }
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 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\"}}}"