From e46cef9fbb464ceff81e5472c13640fd8dc0cd53 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Tue, 27 Mar 2012 14:04:18 -0400 Subject: [PATCH] passwordAuthentication is now default for keystone --- .../NovaComputeServiceAdapterExpectTest.java | 4 ++-- .../compute/NovaComputeServiceExpectTest.java | 8 ++++---- ...locateAndAddFloatingIpToNodeExpectTest.java | 4 ++-- .../FloatingIPAsyncClientExpectTest.java | 16 ++++++++-------- .../extensions/FloatingIPClientExpectTest.java | 16 ++++++++-------- .../extensions/KeyPairClientExpectTest.java | 10 +++++----- .../SecurityGroupClientExpectTest.java | 18 +++++++++--------- .../features/ExtensionClientExpectTest.java | 8 ++++---- .../v1_1/features/FlavorClientExpectTest.java | 8 ++++---- .../v1_1/features/ImageClientExpectTest.java | 8 ++++---- .../v1_1/features/ServerClientExpectTest.java | 8 ++++---- .../CreateSecurityGroupIfNeededTest.java | 4 ++-- ...tyGroupWithNameAndReturnTrueExpectTest.java | 4 ++-- .../nova/v1_1/internal/BaseNovaExpectTest.java | 1 + .../config/KeystoneAuthenticationModule.java | 2 +- .../HPCloudComputePropertiesBuilder.java | 4 +++- .../HPCloudObjectStoragePropertiesBuilder.java | 11 ++++++++--- 17 files changed, 71 insertions(+), 63 deletions(-) diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeServiceAdapterExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeServiceAdapterExpectTest.java index ab3ecd3e75..f1075c165e 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeServiceAdapterExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeServiceAdapterExpectTest.java @@ -72,7 +72,7 @@ public class NovaComputeServiceAdapterExpectTest extends BaseNovaComputeServiceC Map requestResponseMap = ImmutableMap. builder() - .put(keystoneAuthWithAccessKeyAndSecretKey, responseWithKeystoneAccess) + .put(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess) .put(extensionsOfNovaRequest, extensionsOfNovaResponse) .put(listImagesDetail, listImagesDetailResponse) .put(listFlavorsDetail, listFlavorsDetailResponse) @@ -115,7 +115,7 @@ public class NovaComputeServiceAdapterExpectTest extends BaseNovaComputeServiceC Map requestResponseMap = ImmutableMap. builder() - .put(keystoneAuthWithAccessKeyAndSecretKey, responseWithKeystoneAccess) + .put(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess) .put(extensionsOfNovaRequest, extensionsOfNovaResponse) .put(listImagesDetail, listImagesDetailResponse) .put(listFlavorsDetail, listFlavorsDetailResponse) diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeServiceExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeServiceExpectTest.java index 1960e74f9b..fafd906d6f 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeServiceExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeServiceExpectTest.java @@ -51,7 +51,7 @@ public class NovaComputeServiceExpectTest extends BaseNovaComputeServiceExpectTe public void testListLocationsWhenResponseIs2xx() throws Exception { Map requestResponseMap = ImmutableMap. builder().put( - keystoneAuthWithAccessKeyAndSecretKey, responseWithKeystoneAccess).put(extensionsOfNovaRequest, + keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess).put(extensionsOfNovaRequest, extensionsOfNovaResponse).put(listImagesDetail, listImagesDetailResponse).put(listServers, listServersResponse).put(listFlavorsDetail, listFlavorsDetailResponse).build(); @@ -72,7 +72,7 @@ public class NovaComputeServiceExpectTest extends BaseNovaComputeServiceExpectTe public void testDefaultTemplateTryStack() throws Exception { Map requestResponseMap = ImmutableMap. builder().put( - keystoneAuthWithAccessKeyAndSecretKey, + keystoneAuthWithUsernameAndPassword, HttpResponse.builder().statusCode(200).message("HTTP/1.1 200").payload( payloadFromResourceWithContentType("/keystoneAuthResponse_trystack.json", "application/json")) .build()).put( @@ -117,7 +117,7 @@ public class NovaComputeServiceExpectTest extends BaseNovaComputeServiceExpectTe HttpResponse listServersResponse = HttpResponse.builder().statusCode(404).build(); - ComputeService clientWhenNoServersExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + ComputeService clientWhenNoServersExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, listServers, listServersResponse); assertTrue(clientWhenNoServersExist.listNodes().isEmpty()); @@ -127,7 +127,7 @@ public class NovaComputeServiceExpectTest extends BaseNovaComputeServiceExpectTe public void testCreateNodeSetsCredential() throws Exception { Map requestResponseMap = ImmutableMap. builder().put( - keystoneAuthWithAccessKeyAndSecretKey, responseWithKeystoneAccess).put(extensionsOfNovaRequest, + keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess).put(extensionsOfNovaRequest, extensionsOfNovaResponse).put(listImagesDetail, listImagesDetailResponse).put(listServers, listServersResponse).put(listFlavorsDetail, listFlavorsDetailResponse).build(); diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/AllocateAndAddFloatingIpToNodeExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/AllocateAndAddFloatingIpToNodeExpectTest.java index 28dbcb948a..8e4e0df4a7 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/AllocateAndAddFloatingIpToNodeExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/AllocateAndAddFloatingIpToNodeExpectTest.java @@ -71,7 +71,7 @@ public class AllocateAndAddFloatingIpToNodeExpectTest extends BaseNovaComputeSer HttpRequest addFloatingIPRequest = addFloatingIPForAddress("10.0.0.3"); AllocateAndAddFloatingIpToNode fn = requestsSendResponses( - ImmutableMap. builder().put(keystoneAuthWithAccessKeyAndSecretKey, + ImmutableMap. builder().put(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess).put(extensionsOfNovaRequest, extensionsOfNovaResponse).put( allocateFloatingIP, allocateFloatingIPResponse) .put(addFloatingIPRequest, addFloatingIPResponse).build()).getContext().utils().injector() @@ -117,7 +117,7 @@ public class AllocateAndAddFloatingIpToNodeExpectTest extends BaseNovaComputeSer HttpRequest addFloatingIPRequest = addFloatingIPForAddress("10.0.0.5"); AllocateAndAddFloatingIpToNode fn = requestsSendResponses( - ImmutableMap. builder().put(keystoneAuthWithAccessKeyAndSecretKey, + ImmutableMap. builder().put(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess).put(extensionsOfNovaRequest, extensionsOfNovaResponse).put( allocateFloatingIP, allocateFloatingIPResponse) .put(addFloatingIPRequest, addFloatingIPResponse).put(listFloatingIPs, diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPAsyncClientExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPAsyncClientExpectTest.java index 87f67791c2..9f5afdc23d 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPAsyncClientExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPAsyncClientExpectTest.java @@ -46,7 +46,7 @@ public class FloatingIPAsyncClientExpectTest extends BaseNovaAsyncClientExpectTe public void testWhenNamespaceInExtensionsListFloatingIpPresent() throws Exception { - NovaAsyncClient clientWhenExtensionNotInList = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaAsyncClient clientWhenExtensionNotInList = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse); assertEquals(clientWhenExtensionNotInList.getConfiguredZones(), ImmutableSet.of("az-1.region-a.geo-1")); @@ -57,7 +57,7 @@ public class FloatingIPAsyncClientExpectTest extends BaseNovaAsyncClientExpectTe public void testWhenNamespaceNotInExtensionsListFloatingIpNotPresent() throws Exception { - NovaAsyncClient clientWhenExtensionNotInList = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaAsyncClient clientWhenExtensionNotInList = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, extensionsOfNovaRequest, unmatchedExtensionsOfNovaResponse); assertEquals(clientWhenExtensionNotInList.getConfiguredZones(), ImmutableSet.of("az-1.region-a.geo-1")); @@ -78,7 +78,7 @@ public class FloatingIPAsyncClientExpectTest extends BaseNovaAsyncClientExpectTe HttpResponse listFloatingIPsResponse = HttpResponse.builder().statusCode(200) .payload(payloadFromResource("/floatingip_list.json")).build(); - NovaAsyncClient clientWhenFloatingIPsExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaAsyncClient clientWhenFloatingIPsExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, listFloatingIPs, listFloatingIPsResponse); assertEquals(clientWhenFloatingIPsExist.getConfiguredZones(), ImmutableSet.of("az-1.region-a.geo-1")); @@ -98,7 +98,7 @@ public class FloatingIPAsyncClientExpectTest extends BaseNovaAsyncClientExpectTe HttpResponse listFloatingIPsResponse = HttpResponse.builder().statusCode(404).build(); - NovaAsyncClient clientWhenNoServersExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaAsyncClient clientWhenNoServersExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, listFloatingIPs, listFloatingIPsResponse); assertTrue(clientWhenNoServersExist.getFloatingIPExtensionForZone("az-1.region-a.geo-1").get().listFloatingIPs().get() @@ -117,7 +117,7 @@ public class FloatingIPAsyncClientExpectTest extends BaseNovaAsyncClientExpectTe HttpResponse getFloatingIPResponse = HttpResponse.builder().statusCode(200) .payload(payloadFromResource("/floatingip_details.json")).build(); - NovaAsyncClient clientWhenFloatingIPsExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaAsyncClient clientWhenFloatingIPsExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, getFloatingIP, getFloatingIPResponse); assertEquals(clientWhenFloatingIPsExist.getFloatingIPExtensionForZone("az-1.region-a.geo-1").get().getFloatingIP("1").get() @@ -135,7 +135,7 @@ public class FloatingIPAsyncClientExpectTest extends BaseNovaAsyncClientExpectTe HttpResponse getFloatingIPResponse = HttpResponse.builder().statusCode(404).build(); - NovaAsyncClient clientWhenNoServersExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaAsyncClient clientWhenNoServersExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, getFloatingIP, getFloatingIPResponse); assertNull(clientWhenNoServersExist.getFloatingIPExtensionForZone("az-1.region-a.geo-1").get().getFloatingIP("1").get()); @@ -154,7 +154,7 @@ public class FloatingIPAsyncClientExpectTest extends BaseNovaAsyncClientExpectTe HttpResponse allocateFloatingIPResponse = HttpResponse.builder().statusCode(200) .payload(payloadFromResource("/floatingip_details.json")).build(); - NovaAsyncClient clientWhenFloatingIPsExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaAsyncClient clientWhenFloatingIPsExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, allocateFloatingIP, allocateFloatingIPResponse); @@ -175,7 +175,7 @@ public class FloatingIPAsyncClientExpectTest extends BaseNovaAsyncClientExpectTe HttpResponse allocateFloatingIPResponse = HttpResponse.builder().statusCode(404).build(); - NovaAsyncClient clientWhenNoServersExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaAsyncClient clientWhenNoServersExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, allocateFloatingIP, allocateFloatingIPResponse); diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPClientExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPClientExpectTest.java index d68bf10e67..1f44b4977a 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPClientExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPClientExpectTest.java @@ -45,7 +45,7 @@ import com.google.common.collect.ImmutableSet; public class FloatingIPClientExpectTest extends BaseNovaClientExpectTest { public void testWhenNamespaceInExtensionsListFloatingIpPresent() throws Exception { - NovaClient clientWhenExtensionNotInList = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenExtensionNotInList = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse); assertEquals(clientWhenExtensionNotInList.getConfiguredZones(), ImmutableSet.of("az-1.region-a.geo-1")); @@ -56,7 +56,7 @@ public class FloatingIPClientExpectTest extends BaseNovaClientExpectTest { public void testWhenNamespaceNotInExtensionsListFloatingIpNotPresent() throws Exception { - NovaClient clientWhenExtensionNotInList = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenExtensionNotInList = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, extensionsOfNovaRequest, unmatchedExtensionsOfNovaResponse); assertEquals(clientWhenExtensionNotInList.getConfiguredZones(), ImmutableSet.of("az-1.region-a.geo-1")); @@ -77,7 +77,7 @@ public class FloatingIPClientExpectTest extends BaseNovaClientExpectTest { HttpResponse listFloatingIPsResponse = HttpResponse.builder().statusCode(200) .payload(payloadFromResource("/floatingip_list.json")).build(); - NovaClient clientWhenFloatingIPsExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenFloatingIPsExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, listFloatingIPs, listFloatingIPsResponse); assertEquals(clientWhenFloatingIPsExist.getConfiguredZones(), ImmutableSet.of("az-1.region-a.geo-1")); @@ -97,7 +97,7 @@ public class FloatingIPClientExpectTest extends BaseNovaClientExpectTest { HttpResponse listFloatingIPsResponse = HttpResponse.builder().statusCode(404).build(); - NovaClient clientWhenNoServersExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenNoServersExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, listFloatingIPs, listFloatingIPsResponse); assertTrue(clientWhenNoServersExist.getFloatingIPExtensionForZone("az-1.region-a.geo-1").get().listFloatingIPs().isEmpty()); @@ -115,7 +115,7 @@ public class FloatingIPClientExpectTest extends BaseNovaClientExpectTest { HttpResponse getFloatingIPResponse = HttpResponse.builder().statusCode(200) .payload(payloadFromResource("/floatingip_details.json")).build(); - NovaClient clientWhenFloatingIPsExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenFloatingIPsExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, getFloatingIP, getFloatingIPResponse); assertEquals(clientWhenFloatingIPsExist.getFloatingIPExtensionForZone("az-1.region-a.geo-1").get().getFloatingIP("1") @@ -133,7 +133,7 @@ public class FloatingIPClientExpectTest extends BaseNovaClientExpectTest { HttpResponse getFloatingIPResponse = HttpResponse.builder().statusCode(404).build(); - NovaClient clientWhenNoServersExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenNoServersExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, getFloatingIP, getFloatingIPResponse); assertNull(clientWhenNoServersExist.getFloatingIPExtensionForZone("az-1.region-a.geo-1").get().getFloatingIP("1")); @@ -152,7 +152,7 @@ public class FloatingIPClientExpectTest extends BaseNovaClientExpectTest { HttpResponse allocateFloatingIPResponse = HttpResponse.builder().statusCode(200) .payload(payloadFromResource("/floatingip_details.json")).build(); - NovaClient clientWhenFloatingIPsExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenFloatingIPsExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, allocateFloatingIP, allocateFloatingIPResponse); @@ -173,7 +173,7 @@ public class FloatingIPClientExpectTest extends BaseNovaClientExpectTest { HttpResponse allocateFloatingIPResponse = HttpResponse.builder().statusCode(404).build(); - NovaClient clientWhenNoServersExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenNoServersExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, allocateFloatingIP, allocateFloatingIPResponse); diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/KeyPairClientExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/KeyPairClientExpectTest.java index 45818d3475..d0ec314d8b 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/KeyPairClientExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/KeyPairClientExpectTest.java @@ -54,7 +54,7 @@ public class KeyPairClientExpectTest extends BaseNovaClientExpectTest { HttpResponse listKeyPairsResponse = HttpResponse.builder().statusCode(200) .payload(payloadFromResource("/keypair_list.json")).build(); - NovaClient clientWhenServersExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenServersExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, listKeyPairs, listKeyPairsResponse); assertEquals(clientWhenServersExist.getConfiguredZones(), ImmutableSet.of("az-1.region-a.geo-1")); @@ -74,7 +74,7 @@ public class KeyPairClientExpectTest extends BaseNovaClientExpectTest { HttpResponse listKeyPairsResponse = HttpResponse.builder().statusCode(404).build(); - NovaClient clientWhenNoServersExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenNoServersExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, listKeyPairs, listKeyPairsResponse); assertTrue(clientWhenNoServersExist.getKeyPairExtensionForZone("az-1.region-a.geo-1").get().listKeyPairs().isEmpty()); @@ -95,7 +95,7 @@ public class KeyPairClientExpectTest extends BaseNovaClientExpectTest { HttpResponse createKeyPairResponse = HttpResponse.builder().statusCode(200) .payload(payloadFromResource("/keypair_created.json")).build(); - NovaClient clientWhenServersExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenServersExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, createKeyPair, createKeyPairResponse); assertEquals(clientWhenServersExist.getKeyPairExtensionForZone("az-1.region-a.geo-1").get().createKeyPair("testkeypair") @@ -119,7 +119,7 @@ public class KeyPairClientExpectTest extends BaseNovaClientExpectTest { HttpResponse createKeyPairResponse = HttpResponse.builder().statusCode(200) .payload(payloadFromResource("/keypair_created.json")).build(); - NovaClient clientWhenServersExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenServersExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, createKeyPair, createKeyPairResponse); assertEquals( @@ -143,7 +143,7 @@ public class KeyPairClientExpectTest extends BaseNovaClientExpectTest { HttpResponse deleteKeyPairResponse = HttpResponse.builder().statusCode(202).build(); - NovaClient clientWhenServersExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenServersExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, deleteKeyPair, deleteKeyPairResponse); assertTrue(clientWhenServersExist.getKeyPairExtensionForZone("az-1.region-a.geo-1").get().deleteKeyPair("testkeypair")); diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/SecurityGroupClientExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/SecurityGroupClientExpectTest.java index 334ad9b9a4..d4b1c6301a 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/SecurityGroupClientExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/SecurityGroupClientExpectTest.java @@ -55,7 +55,7 @@ public class SecurityGroupClientExpectTest extends BaseNovaClientExpectTest { HttpResponse listSecurityGroupsResponse = HttpResponse.builder().statusCode(200).payload( payloadFromResource("/securitygroup_list.json")).build(); - NovaClient clientWhenSecurityGroupsExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenSecurityGroupsExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, listSecurityGroups, listSecurityGroupsResponse); @@ -73,7 +73,7 @@ public class SecurityGroupClientExpectTest extends BaseNovaClientExpectTest { HttpResponse listListSecurityGroupsResponse = HttpResponse.builder().statusCode(404).build(); - NovaClient clientWhenNoSecurityGroupsExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenNoSecurityGroupsExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, listListSecurityGroups, listListSecurityGroupsResponse); @@ -91,7 +91,7 @@ public class SecurityGroupClientExpectTest extends BaseNovaClientExpectTest { HttpResponse getSecurityGroupResponse = HttpResponse.builder().statusCode(200).payload( payloadFromResource("/securitygroup_details.json")).build(); - NovaClient clientWhenSecurityGroupsExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenSecurityGroupsExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, getSecurityGroup, getSecurityGroupResponse); @@ -107,7 +107,7 @@ public class SecurityGroupClientExpectTest extends BaseNovaClientExpectTest { HttpResponse getSecurityGroupResponse = HttpResponse.builder().statusCode(404).build(); - NovaClient clientWhenNoSecurityGroupsExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenNoSecurityGroupsExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, getSecurityGroup, getSecurityGroupResponse); @@ -129,7 +129,7 @@ public class SecurityGroupClientExpectTest extends BaseNovaClientExpectTest { HttpResponse createSecurityGroupResponse = HttpResponse.builder().statusCode(200).payload( payloadFromResource("/securitygroup_created.json")).build(); - NovaClient clientWhenSecurityGroupsExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenSecurityGroupsExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, createSecurityGroup, createSecurityGroupResponse); @@ -147,7 +147,7 @@ public class SecurityGroupClientExpectTest extends BaseNovaClientExpectTest { HttpResponse deleteSecurityGroupResponse = HttpResponse.builder().statusCode(202).build(); - NovaClient clientWhenServersExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenServersExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, deleteSecurityGroup, deleteSecurityGroupResponse); @@ -172,7 +172,7 @@ public class SecurityGroupClientExpectTest extends BaseNovaClientExpectTest { HttpResponse createSecurityGroupRuleResponse = HttpResponse.builder().statusCode(200).payload( payloadFromResource("/securitygrouprule_created.json")).build(); - NovaClient clientWhenSecurityGroupsExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenSecurityGroupsExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, createSecurityGroupRule, createSecurityGroupRuleResponse); @@ -198,7 +198,7 @@ public class SecurityGroupClientExpectTest extends BaseNovaClientExpectTest { HttpResponse createSecurityGroupRuleResponse = HttpResponse.builder().statusCode(200).payload( payloadFromResource("/securitygrouprule_created.json")).build(); - NovaClient clientWhenSecurityGroupsExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenSecurityGroupsExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, createSecurityGroupRule, createSecurityGroupRuleResponse); @@ -217,7 +217,7 @@ public class SecurityGroupClientExpectTest extends BaseNovaClientExpectTest { HttpResponse deleteSecurityGroupRuleResponse = HttpResponse.builder().statusCode(202).build(); - NovaClient clientWhenSecurityGroupsExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenSecurityGroupsExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, deleteSecurityGroupRule, deleteSecurityGroupRuleResponse); diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ExtensionClientExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ExtensionClientExpectTest.java index 539873c19f..578ec46109 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ExtensionClientExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ExtensionClientExpectTest.java @@ -55,7 +55,7 @@ public class ExtensionClientExpectTest extends BaseNovaClientExpectTest { HttpResponse listExtensionsResponse = HttpResponse.builder().statusCode(200) .payload(payloadFromResource("/extension_list.json")).build(); - NovaClient clientWhenExtensionsExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenExtensionsExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, listExtensions, listExtensionsResponse); assertEquals(clientWhenExtensionsExist.getConfiguredZones(), ImmutableSet.of("az-1.region-a.geo-1")); @@ -75,7 +75,7 @@ public class ExtensionClientExpectTest extends BaseNovaClientExpectTest { HttpResponse listExtensionsResponse = HttpResponse.builder().statusCode(404).build(); - NovaClient clientWhenNoServersExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenNoServersExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, listExtensions, listExtensionsResponse); assertTrue(clientWhenNoServersExist.getExtensionClientForZone("az-1.region-a.geo-1").listExtensions().isEmpty()); @@ -95,7 +95,7 @@ public class ExtensionClientExpectTest extends BaseNovaClientExpectTest { HttpResponse getExtensionResponse = HttpResponse.builder().statusCode(200) .payload(payloadFromResource("/extension_details.json")).build(); - NovaClient clientWhenExtensionsExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenExtensionsExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, getExtension, getExtensionResponse); assertEquals(clientWhenExtensionsExist.getExtensionClientForZone("az-1.region-a.geo-1").getExtensionByAlias("RS-PIE") @@ -114,7 +114,7 @@ public class ExtensionClientExpectTest extends BaseNovaClientExpectTest { HttpResponse getExtensionResponse = HttpResponse.builder().statusCode(404) .payload(payloadFromResource("/extension_details.json")).build(); - NovaClient clientWhenNoExtensionsExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenNoExtensionsExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, getExtension, getExtensionResponse); assertNull(clientWhenNoExtensionsExist.getExtensionClientForZone("az-1.region-a.geo-1").getExtensionByAlias("RS-PIE")); diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/FlavorClientExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/FlavorClientExpectTest.java index f5856ab385..a95aeda7e2 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/FlavorClientExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/FlavorClientExpectTest.java @@ -55,7 +55,7 @@ public class FlavorClientExpectTest extends BaseNovaClientExpectTest { HttpResponse listFlavorsResponse = HttpResponse.builder().statusCode(200) .payload(payloadFromResource("/flavor_list.json")).build(); - NovaClient clientWhenFlavorsExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenFlavorsExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, listFlavors, listFlavorsResponse); assertEquals(clientWhenFlavorsExist.getConfiguredZones(), ImmutableSet.of("az-1.region-a.geo-1")); @@ -75,7 +75,7 @@ public class FlavorClientExpectTest extends BaseNovaClientExpectTest { HttpResponse listFlavorsResponse = HttpResponse.builder().statusCode(404).build(); - NovaClient clientWhenNoServersExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenNoServersExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, listFlavors, listFlavorsResponse); assertTrue(clientWhenNoServersExist.getFlavorClientForZone("az-1.region-a.geo-1").listFlavors().isEmpty()); @@ -95,7 +95,7 @@ public class FlavorClientExpectTest extends BaseNovaClientExpectTest { HttpResponse getFlavorResponse = HttpResponse.builder().statusCode(200) .payload(payloadFromResource("/flavor_details.json")).build(); - NovaClient clientWhenFlavorsExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenFlavorsExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, getFlavor, getFlavorResponse); assertEquals( @@ -115,7 +115,7 @@ public class FlavorClientExpectTest extends BaseNovaClientExpectTest { HttpResponse getFlavorResponse = HttpResponse.builder().statusCode(404) .payload(payloadFromResource("/flavor_details.json")).build(); - NovaClient clientWhenNoFlavorsExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenNoFlavorsExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, getFlavor, getFlavorResponse); assertNull(clientWhenNoFlavorsExist.getFlavorClientForZone("az-1.region-a.geo-1").getFlavor("123")); diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ImageClientExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ImageClientExpectTest.java index 5bdf1247c5..cf5e2c5eaa 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ImageClientExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ImageClientExpectTest.java @@ -54,7 +54,7 @@ public class ImageClientExpectTest extends BaseNovaClientExpectTest { HttpResponse listImagesResponse = HttpResponse.builder().statusCode(200) .payload(payloadFromResource("/image_list.json")).build(); - NovaClient clientWhenImagesExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenImagesExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, listImages, listImagesResponse); assertEquals(clientWhenImagesExist.getConfiguredZones(), ImmutableSet.of("az-1.region-a.geo-1")); @@ -74,7 +74,7 @@ public class ImageClientExpectTest extends BaseNovaClientExpectTest { HttpResponse listImagesResponse = HttpResponse.builder().statusCode(404).build(); - NovaClient clientWhenNoServersExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenNoServersExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, listImages, listImagesResponse); assertTrue(clientWhenNoServersExist.getImageClientForZone("az-1.region-a.geo-1").listImages().isEmpty()); @@ -93,7 +93,7 @@ public class ImageClientExpectTest extends BaseNovaClientExpectTest { HttpResponse getImageResponse = HttpResponse.builder().statusCode(200) .payload(payloadFromResource("/image_details.json")).build(); - NovaClient clientWhenImagesExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenImagesExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, getImage, getImageResponse); assertEquals( @@ -112,7 +112,7 @@ public class ImageClientExpectTest extends BaseNovaClientExpectTest { HttpResponse getImageResponse = HttpResponse.builder().statusCode(404).build(); - NovaClient clientWhenNoImagesExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenNoImagesExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, getImage, getImageResponse); assertNull(clientWhenNoImagesExist.getImageClientForZone("az-1.region-a.geo-1").getImage( diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ServerClientExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ServerClientExpectTest.java index 1439efe44c..c59690c0d9 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ServerClientExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ServerClientExpectTest.java @@ -55,7 +55,7 @@ public class ServerClientExpectTest extends BaseNovaClientExpectTest { HttpResponse listServersResponse = HttpResponse.builder().statusCode(200) .payload(payloadFromResource("/server_list.json")).build(); - NovaClient clientWhenServersExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenServersExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, listServers, listServersResponse); assertEquals(clientWhenServersExist.getConfiguredZones(), ImmutableSet.of("az-1.region-a.geo-1")); @@ -75,7 +75,7 @@ public class ServerClientExpectTest extends BaseNovaClientExpectTest { HttpResponse listServersResponse = HttpResponse.builder().statusCode(404).build(); - NovaClient clientWhenNoServersExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenNoServersExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, listServers, listServersResponse); assertTrue(clientWhenNoServersExist.getServerClientForZone("az-1.region-a.geo-1").listServers().isEmpty()); @@ -97,7 +97,7 @@ public class ServerClientExpectTest extends BaseNovaClientExpectTest { HttpResponse createServerResponse = HttpResponse.builder().statusCode(202).message("HTTP/1.1 202 Accepted") .payload(payloadFromResourceWithContentType("/new_server.json","application/json; charset=UTF-8")).build(); - NovaClient clientWithNewServer = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWithNewServer = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, createServer, createServerResponse); assertEquals(clientWithNewServer.getServerClientForZone("az-1.region-a.geo-1").createServer("test-e92", "1241", "100").toString(), @@ -122,7 +122,7 @@ public class ServerClientExpectTest extends BaseNovaClientExpectTest { .payload(payloadFromResourceWithContentType("/new_server.json","application/json; charset=UTF-8")).build(); - NovaClient clientWithNewServer = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWithNewServer = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, createServer, createServerResponse); assertEquals(clientWithNewServer.getServerClientForZone("az-1.region-a.geo-1").createServer("test-e92", "1241", diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/functions/CreateSecurityGroupIfNeededTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/functions/CreateSecurityGroupIfNeededTest.java index bada34a351..1c96aad30a 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/functions/CreateSecurityGroupIfNeededTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/functions/CreateSecurityGroupIfNeededTest.java @@ -57,7 +57,7 @@ public class CreateSecurityGroupIfNeededTest extends BaseNovaClientExpectTest { Builder builder = ImmutableMap.builder(); - builder.put(keystoneAuthWithAccessKeyAndSecretKey, responseWithKeystoneAccess); + builder.put(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess); builder.put(extensionsOfNovaRequest, extensionsOfNovaResponse); int groupId = 2769; @@ -135,7 +135,7 @@ public class CreateSecurityGroupIfNeededTest extends BaseNovaClientExpectTest { Builder builder = ImmutableMap.builder(); - builder.put(keystoneAuthWithAccessKeyAndSecretKey, responseWithKeystoneAccess); + builder.put(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess); builder.put(extensionsOfNovaRequest, extensionsOfNovaResponse); HttpResponse createSecurityGroupResponse = HttpResponse.builder().statusCode(400) diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/functions/FindSecurityGroupWithNameAndReturnTrueExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/functions/FindSecurityGroupWithNameAndReturnTrueExpectTest.java index d06f9ce5a8..0c58bfdf5f 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/functions/FindSecurityGroupWithNameAndReturnTrueExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/functions/FindSecurityGroupWithNameAndReturnTrueExpectTest.java @@ -54,7 +54,7 @@ public class FindSecurityGroupWithNameAndReturnTrueExpectTest extends BaseNovaCl HttpResponse listSecurityGroupsResponse = HttpResponse.builder().statusCode(200).payload( payloadFromResource("/securitygroup_list.json")).build(); - NovaClient clientWhenSecurityGroupsExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenSecurityGroupsExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, listSecurityGroups, listSecurityGroupsResponse); @@ -82,7 +82,7 @@ public class FindSecurityGroupWithNameAndReturnTrueExpectTest extends BaseNovaCl HttpResponse listSecurityGroupsResponse = HttpResponse.builder().statusCode(200).payload( payloadFromResource("/securitygroup_list.json")).build(); - NovaClient clientWhenSecurityGroupsExist = requestsSendResponses(keystoneAuthWithAccessKeyAndSecretKey, + NovaClient clientWhenSecurityGroupsExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword, responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, listSecurityGroups, listSecurityGroupsResponse); diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaExpectTest.java index df64ebac0f..2b38d4cd7e 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaExpectTest.java @@ -47,6 +47,7 @@ public class BaseNovaExpectTest extends BaseRestClientExpectTest { credential); keystoneAuthWithAccessKeyAndSecretKey = KeystoneFixture.INSTANCE.initialAuthWithAccessKeyAndSecretKey(identity, credential); + authToken = KeystoneFixture.INSTANCE.getAuthToken(); responseWithKeystoneAccess = KeystoneFixture.INSTANCE.responseWithAccess(); // now, createContext arg will need tenant prefix diff --git a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/config/KeystoneAuthenticationModule.java b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/config/KeystoneAuthenticationModule.java index 82ee0bd94c..24eef509e6 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/config/KeystoneAuthenticationModule.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/config/KeystoneAuthenticationModule.java @@ -161,7 +161,7 @@ public class KeystoneAuthenticationModule extends AbstractModule { */ @Inject(optional = true) @Named(KeystoneProperties.CREDENTIAL_TYPE) - String credentialType = CredentialType.API_ACCESS_KEY_CREDENTIALS.toString(); + String credentialType = CredentialType.PASSWORD_CREDENTIALS.toString(); @Override public CredentialType get() { diff --git a/providers/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputePropertiesBuilder.java b/providers/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputePropertiesBuilder.java index e4b688c657..4bf26720c1 100644 --- a/providers/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputePropertiesBuilder.java +++ b/providers/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputePropertiesBuilder.java @@ -21,6 +21,7 @@ package org.jclouds.hpcloud.compute; import static org.jclouds.Constants.PROPERTY_ENDPOINT; import static org.jclouds.Constants.PROPERTY_ISO3166_CODES; import static org.jclouds.compute.reference.ComputeServiceConstants.PROPERTY_TIMEOUT_NODE_TERMINATED; +import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE; import static org.jclouds.openstack.nova.v1_1.config.NovaProperties.AUTO_ALLOCATE_FLOATING_IPS; import static org.jclouds.openstack.nova.v1_1.config.NovaProperties.AUTO_GENERATE_KEYPAIRS; @@ -42,7 +43,8 @@ public class HPCloudComputePropertiesBuilder extends NovaPropertiesBuilder { // deallocating ip addresses can take a while properties.setProperty(PROPERTY_TIMEOUT_NODE_TERMINATED, 60 * 1000 + ""); - + + properties.setProperty(CREDENTIAL_TYPE, "apiAccessKeyCredentials"); properties.setProperty(AUTO_ALLOCATE_FLOATING_IPS, "true"); properties.setProperty(AUTO_GENERATE_KEYPAIRS, "true"); return properties; diff --git a/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStoragePropertiesBuilder.java b/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStoragePropertiesBuilder.java index 23094b5367..95bb9d2ecd 100644 --- a/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStoragePropertiesBuilder.java +++ b/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStoragePropertiesBuilder.java @@ -21,6 +21,8 @@ package org.jclouds.hpcloud.objectstorage; import static org.jclouds.Constants.PROPERTY_API_VERSION; import static org.jclouds.Constants.PROPERTY_ENDPOINT; import static org.jclouds.Constants.PROPERTY_ISO3166_CODES; +import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE; +import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE; import java.util.Properties; @@ -40,12 +42,15 @@ public class HPCloudObjectStoragePropertiesBuilder extends SwiftPropertiesBuilde @Override protected Properties defaultProperties() { Properties properties = super.defaultProperties(); - properties.setProperty(KeystoneProperties.SERVICE_TYPE, ServiceType.OBJECT_STORE); - // TODO: this doesn't actually do anything yet. - properties.setProperty(KeystoneProperties.VERSION, "2.0"); properties.setProperty(PROPERTY_ISO3166_CODES, "US-NV"); properties.setProperty(PROPERTY_ENDPOINT, "https://region-a.geo-1.identity.hpcloudsvc.com:35357"); properties.setProperty(PROPERTY_API_VERSION, "1.0"); + + properties.setProperty(SERVICE_TYPE, ServiceType.OBJECT_STORE); + // TODO: this doesn't actually do anything yet. + properties.setProperty(KeystoneProperties.VERSION, "2.0"); + + properties.setProperty(CREDENTIAL_TYPE, "apiAccessKeyCredentials"); return properties; }