Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #631 from andrewgaul/hpcloud-tenant-name 

Identity should be tenameName:accessKey
This commit is contained in:
Adrian Cole 2012-05-11 16:50:47 -07:00
parent 27c07a507d 191a4e7341
commit a895869e6f
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaApiMetadata.java
View File

@ -88,7 +88,7 @@ public class NovaApiMetadata extends BaseRestApiMetadata {
super(NovaClient.class, NovaAsyncClient.class);
id("openstack-nova")
.name("OpenStack Nova Diablo+ API")
.identityName("tenantId:user")
.identityName("tenantName:accessKey")
.credentialName("password")
.documentation(URI.create("http://api.openstack.org/"))
.version("1.1")

2
common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/functions/AuthenticateApiAccessKeyCredentials.java
View File

@ -41,7 +41,7 @@ public class AuthenticateApiAccessKeyCredentials implements Function<Credentials
@Override
public Access apply(Credentials input) {
if (input.identity.indexOf(':') == -1) {
throw new AuthorizationException(String.format("Identity %s does not match format tenantId:accesskey",
throw new AuthorizationException(String.format("Identity %s does not match format tenantName:accessKey",
input.identity), null);
}

2
providers/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputeProviderMetadata.java
View File

@ -79,7 +79,7 @@ public class HPCloudComputeProviderMetadata extends BaseProviderMetadata {
id("hpcloud-compute")
.name("HP Cloud Compute Services")
.apiMetadata(new NovaApiMetadata().toBuilder()
.identityName("tenantId:accessKey")
.identityName("tenantName:accessKey")
.credentialName("secretKey")
.defaultModules(ImmutableSet.<Class<? extends Module>>of(NovaRestClientModule.class, HPCloudComputeServiceContextModule.class))
.build())

2
providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageApiMetadata.java
View File

@ -83,7 +83,7 @@ public class HPCloudObjectStorageApiMetadata extends BaseRestApiMetadata {
super(HPCloudObjectStorageClient.class, HPCloudObjectStorageAsyncClient.class);
id("hpcloud-objectstorage")
.name("HP Cloud Services Object Storage API")
.identityName("tenantId:accessKey")
.identityName("tenantName:accessKey")
.credentialName("secretKey")
.version("1.0")
.documentation(URI.create("https://build.hpcloud.com/object-storage/api"))