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

Merge pull request #238 from andreisavu/domain-user-account 

Finished implementing registerUserKeys API
This commit is contained in:
Adrian Cole 2011-12-13 00:40:30 -08:00
parent c10d585052 81a4b25cee
commit dda1b5baab
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apis/cloudstack/src/main/java/org/jclouds/cloudstack/config/CloudStackRestClientModule.java
View File

@ -204,6 +204,7 @@ public class CloudStackRestClientModule extends RestClientModule<CloudStackClien
protected URI providesIntegrationEndpoint(@Provider URI normal,
@Named("jclouds.cloudstack.integration-api-port") int port,
com.google.inject.Provider<UriBuilder> uriBuilder) {
return uriBuilder.get().uri(normal).port(port).build();
return uriBuilder.get().scheme(normal.getScheme())
.host(normal.getHost()).path("/").port(port).build();
}
}

3
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUserAsyncClient.java
View File

@ -66,7 +66,8 @@ public interface GlobalUserAsyncClient extends DomainUserAsyncClient {
* @see GlobalUserClient#registerUserKeys
*/
@GET
@QueryParams(keys = "comand", values = "registerUserKeys")
@QueryParams(keys = "command", values = "registerUserKeys")
@SelectJson("userkeys")
@Endpoint(Integration.class)
@Consumes(MediaType.APPLICATION_JSON)
@ExceptionParser(ReturnNullOnNotFoundOr404.class)

2
apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalUserClientLiveTest.java
View File

@ -100,7 +100,7 @@ public class GlobalUserClientLiveTest extends BaseCloudStackClientLiveTest {
}
private Properties credentialsAsProperties(ApiKeyPair keyPair) {
Properties overrides = new Properties();
Properties overrides = setupProperties();
overrides.put(provider + ".identity", checkNotNull(keyPair.getApiKey()));
overrides.put(provider + ".credential", checkNotNull(keyPair.getSecretKey()));
return overrides;