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

fixed case on keystone

This commit is contained in:
Adrian Cole 2012-01-31 12:43:28 -08:00
parent 6f8c633ff2
commit 4bcea6fa23
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apis/cloudservers/src/test/java/org/jclouds/cloudservers/internal/BaseCloudServersRestClientExpectTest.java
View File

@ -31,7 +31,7 @@ import org.jclouds.date.internal.SimpleDateFormatDateService;
import org.jclouds.http.RequiresHttp;
import org.jclouds.openstack.filters.AddTimestampQuery;
import org.jclouds.openstack.keystone.v1_1.config.AuthenticationServiceModule;
import org.jclouds.openstack.keystone.v1_1.internal.BaseKeyStoneRestClientExpectTest;
import org.jclouds.openstack.keystone.v1_1.internal.BaseKeystoneRestClientExpectTest;
import org.jclouds.rest.ConfiguresRestClient;
import com.google.common.base.Supplier;
@ -42,7 +42,7 @@ import com.google.inject.Module;
*
* @author Adrian Cole
*/
public class BaseCloudServersRestClientExpectTest extends BaseKeyStoneRestClientExpectTest<CloudServersClient> {
public class BaseCloudServersRestClientExpectTest extends BaseKeystoneRestClientExpectTest<CloudServersClient> {
public BaseCloudServersRestClientExpectTest() {
provider = "cloudservers";

2
common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/config/KeyStoneAuthenticationModule.java → common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/config/KeystoneAuthenticationModule.java
View File

@ -56,7 +56,7 @@ import com.google.inject.Provides;
* @author Adrian Cole
*/
@RequiresHttp
public class KeyStoneAuthenticationModule extends AbstractModule {
public class KeystoneAuthenticationModule extends AbstractModule {
@Override
protected void configure() {

6
common/openstack/src/test/java/org/jclouds/openstack/keystone/v1_1/internal/BaseKeyStoneRestClientExpectTest.java → common/openstack/src/test/java/org/jclouds/openstack/keystone/v1_1/internal/BaseKeystoneRestClientExpectTest.java
View File

@ -33,11 +33,11 @@ import com.google.common.net.HttpHeaders;
*
* @author Adrian Cole
*/
public class BaseKeyStoneRestClientExpectTest<S> extends BaseRestClientExpectTest<S> {
public class BaseKeystoneRestClientExpectTest<S> extends BaseRestClientExpectTest<S> {
protected String endpoint = "http://localhost:5000";
public BaseKeyStoneRestClientExpectTest() {
public BaseKeystoneRestClientExpectTest() {
identity = "user@jclouds.org";
credential = "Password1234";
}
@ -60,7 +60,7 @@ public class BaseKeyStoneRestClientExpectTest<S> extends BaseRestClientExpectTes
/**
* in case you need to override anything
*/
public static class TestKeyStoneAuthenticationModule extends AuthenticationServiceModule {
public static class TestKeystoneAuthenticationModule extends AuthenticationServiceModule {
@Override
protected void configure() {
super.configure();

8
common/openstack/src/test/java/org/jclouds/openstack/keystone/v2_0/internal/BaseKeyStoneRestClientExpectTest.java → common/openstack/src/test/java/org/jclouds/openstack/keystone/v2_0/internal/BaseKeystoneRestClientExpectTest.java
View File

@ -23,7 +23,7 @@ import java.net.URI;
import org.jclouds.http.HttpRequest;
import org.jclouds.http.HttpResponse;
import org.jclouds.openstack.keystone.v2_0.config.KeyStoneAuthenticationModule;
import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule;
import org.jclouds.rest.BaseRestClientExpectTest;
import com.google.common.collect.ImmutableMultimap;
@ -34,7 +34,7 @@ import com.google.common.net.HttpHeaders;
*
* @author Adrian Cole
*/
public class BaseKeyStoneRestClientExpectTest<S> extends BaseRestClientExpectTest<S> {
public class BaseKeystoneRestClientExpectTest<S> extends BaseRestClientExpectTest<S> {
protected static final String tenantId = "12346637803162";
@ -64,7 +64,7 @@ public class BaseKeyStoneRestClientExpectTest<S> extends BaseRestClientExpectTes
"{\"auth\":{\"apiAccessKeyCredentials\":{\"accessKey\":\"%s\",\"secretKey\":\"%s\"},\"tenantId\":\"%s\"}}",
accessKey, secretKey, tenantId), "application/json")).build();
public BaseKeyStoneRestClientExpectTest() {
public BaseKeystoneRestClientExpectTest() {
identity = tenantId + ":" + accessKey;
credential = secretKey;
}
@ -79,7 +79,7 @@ public class BaseKeyStoneRestClientExpectTest<S> extends BaseRestClientExpectTes
/**
* in case you need to override anything
*/
public static class TestKeyStoneAuthenticationModule extends KeyStoneAuthenticationModule {
public static class TestKeystoneAuthenticationModule extends KeystoneAuthenticationModule {
@Override
protected void configure() {
super.configure();

8
labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/config/NovaRestClientModule.java
View File

@ -28,7 +28,7 @@ import org.jclouds.http.RequiresHttp;
import org.jclouds.http.annotation.ClientError;
import org.jclouds.http.annotation.Redirection;
import org.jclouds.http.annotation.ServerError;
import org.jclouds.openstack.keystone.v2_0.config.KeyStoneAuthenticationModule;
import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule;
import org.jclouds.openstack.keystone.v2_0.domain.Access;
import org.jclouds.openstack.keystone.v2_0.domain.Service;
import org.jclouds.openstack.nova.v1_1.NovaAsyncClient;
@ -59,13 +59,13 @@ public class NovaRestClientModule extends RestClientModule<NovaClient, NovaAsync
.put(ServerClient.class, ServerAsyncClient.class)//
.build();
private final KeyStoneAuthenticationModule authModule;
private final KeystoneAuthenticationModule authModule;
public NovaRestClientModule() {
this(new KeyStoneAuthenticationModule());
this(new KeystoneAuthenticationModule());
}
public NovaRestClientModule(KeyStoneAuthenticationModule authModule) {
public NovaRestClientModule(KeystoneAuthenticationModule authModule) {
super(NovaClient.class, NovaAsyncClient.class, DELEGATE_MAP);
this.authModule = authModule;
}

6
labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaRestClientExpectTest.java
View File

@ -19,7 +19,7 @@
package org.jclouds.openstack.nova.v1_1.internal;
import org.jclouds.http.RequiresHttp;
import org.jclouds.openstack.keystone.v2_0.internal.BaseKeyStoneRestClientExpectTest;
import org.jclouds.openstack.keystone.v2_0.internal.BaseKeystoneRestClientExpectTest;
import org.jclouds.openstack.nova.v1_1.NovaClient;
import org.jclouds.openstack.nova.v1_1.config.NovaRestClientModule;
import org.jclouds.rest.ConfiguresRestClient;
@ -31,7 +31,7 @@ import com.google.inject.Module;
*
* @author Adrian Cole
*/
public class BaseNovaRestClientExpectTest extends BaseKeyStoneRestClientExpectTest<NovaClient> {
public class BaseNovaRestClientExpectTest extends BaseKeystoneRestClientExpectTest<NovaClient> {
public BaseNovaRestClientExpectTest() {
provider = "openstack-nova";
@ -46,7 +46,7 @@ public class BaseNovaRestClientExpectTest extends BaseKeyStoneRestClientExpectTe
@RequiresHttp
protected static class TestNovaRestClientModule extends NovaRestClientModule {
private TestNovaRestClientModule() {
super(new TestKeyStoneAuthenticationModule());
super(new TestKeystoneAuthenticationModule());
}
}