You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by jd...@apache.org on 2014/07/21 19:51:15 UTC
[6/6] git commit: JCLOUDS-554: Update Nova default API to v2
JCLOUDS-554: Update Nova default API to v2
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/0d77d8c2
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/0d77d8c2
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/0d77d8c2
Branch: refs/heads/master
Commit: 0d77d8c2b11197146d4970ee4407e99dc1c9ec40
Parents: f17c876
Author: Jeremy Daggett <je...@rackspace.com>
Authored: Mon Jun 2 09:10:21 2014 -0700
Committer: Jeremy Daggett <jd...@apache.org>
Committed: Mon Jul 21 10:50:46 2014 -0700
----------------------------------------------------------------------
.../keystone/v2_0/internal/KeystoneFixture.java | 27 +-
.../keystone/v2_0/parse/ParseAccessTest.java | 18 +-
...nIdToURIFromAccessForTypeAndVersionTest.java | 16 +-
...AdminURIFromAccessForTypeAndVersionTest.java | 2 +-
...nIdToURIFromAccessForTypeAndVersionTest.java | 8 +-
...eIdToURIFromAccessForTypeAndVersionTest.java | 8 +-
.../test/resources/keystoneAuthResponse.json | 20 +-
.../keystoneAuthResponse_openstack.json | 6 +-
.../openstack/nova/v2_0/NovaApiMetadata.java | 2 +-
...tKeyAndTenantIdAuthenticationExpectTest.java | 2 +-
...antNamePropertyAuthenticationExpectTest.java | 2 +-
...KeyAndSecretKeyAuthenticationExpectTest.java | 2 +-
.../v2_0/PasswordAuthenticationExpectTest.java | 2 +-
...dAuthenticationWithTenantNameExpectTest.java | 2 +-
.../NovaComputeServiceAdapterExpectTest.java | 20 +-
.../compute/NovaComputeServiceExpectTest.java | 28 +-
.../NovaImageExtensionExpectTest.java | 8 +-
.../NovaSecurityGroupExtensionExpectTest.java | 36 +-
...llocateAndAddFloatingIpToNodeExpectTest.java | 8 +-
.../ServerInZoneToNodeMetadataTest.java | 8 +-
.../extensions/AdminActionsApiExpectTest.java | 48 +-
.../AvailabilityZoneApiExpectTest.java | 2 +-
.../FlavorExtraSpecsApiExpectTest.java | 16 +-
.../extensions/FloatingIPApiExpectTest.java | 14 +-
.../HostAdministrationApiExpectTest.java | 26 +-
.../extensions/HostAggregateApiExpectTest.java | 22 +-
.../v2_0/extensions/KeyPairApiExpectTest.java | 14 +-
.../v2_0/extensions/QuotaApiExpectTest.java | 12 +-
.../extensions/SecurityGroupApiExpectTest.java | 18 +-
.../ServerWithSecurityGroupsApiExpectTest.java | 4 +-
.../SimpleTenantUsageApiExpectTest.java | 4 +-
.../VirtualInterfaceApiExpectTest.java | 4 +-
.../v2_0/extensions/VolumeApiExpectTest.java | 56 +-
.../VolumeAttachmentApiExpectTest.java | 16 +-
.../extensions/VolumeTypeApiExpectTest.java | 32 +-
.../v2_0/features/ExtensionApiExpectTest.java | 8 +-
.../nova/v2_0/features/FlavorApiExpectTest.java | 12 +-
.../nova/v2_0/features/ImageApiExpectTest.java | 30 +-
.../nova/v2_0/features/ServerApiExpectTest.java | 66 +-
.../CreateSecurityGroupIfNeededTest.java | 10 +-
...ityGroupWithNameAndReturnTrueExpectTest.java | 4 +-
.../v2_0/handlers/NovaErrorHandlerTest.java | 6 +-
...BaseNovaComputeServiceContextExpectTest.java | 16 +-
.../nova/v2_0/internal/BaseNovaExpectTest.java | 2 +-
.../nova/v2_0/parse/ParseCreateFlavorTest.java | 32 +-
.../nova/v2_0/parse/ParseCreatedServerTest.java | 4 +-
.../nova/v2_0/parse/ParseFlavorListTest.java | 4 +-
.../nova/v2_0/parse/ParseFlavorTest.java | 2 +-
.../nova/v2_0/parse/ParseImageListTest.java | 4 +-
.../nova/v2_0/parse/ParseImageTest.java | 4 +-
.../v2_0/parse/ParseServerDetailsEssexTest.java | 6 +-
.../nova/v2_0/parse/ParseServerListTest.java | 4 +-
.../nova/v2_0/parse/ParseServerTest.java | 8 +-
.../ParseServerWithInternetAddressesTest.java | 2 +-
.../v2_0/parse/ParseServerWithoutImageTest.java | 4 +-
...ublicIpsInPrivateAddressBlockExpectTest.java | 2 +-
.../src/test/resources/access.json | 208 +++---
.../src/test/resources/attachment_details.json | 9 +-
.../src/test/resources/attachment_list.json | 11 +-
.../src/test/resources/extension_details.json | 28 +-
.../src/test/resources/extension_list.json | 2 +-
.../src/test/resources/extension_list_full.json | 563 ++++++++--------
.../test/resources/extension_list_normal.json | 65 +-
.../resources/extension_list_openstack.json | 253 ++++----
.../src/test/resources/flavor_details.json | 22 +-
.../src/test/resources/flavor_list.json | 6 +-
.../src/test/resources/flavor_list_detail.json | 125 +++-
.../resources/flavor_list_detail_openstack.json | 185 +++---
.../src/test/resources/flavor_new.json | 14 +-
.../src/test/resources/floatingip_list.json | 4 +-
.../openstack-nova/src/test/resources/host.json | 41 +-
.../test/resources/host_aggregate_details.json | 18 +-
.../src/test/resources/host_aggregate_list.json | 20 +-
.../host_aggregate_with_host_details.json | 20 +-
.../src/test/resources/hosts_list.json | 9 +-
.../src/test/resources/image_active.json | 42 +-
.../src/test/resources/image_details.json | 42 +-
.../src/test/resources/image_list.json | 20 +-
.../src/test/resources/image_list_detail.json | 504 ++++++++++++++-
.../image_list_detail_imageextension.json | 263 ++++----
.../resources/image_list_detail_openstack.json | 175 ++---
.../keypair_created_computeservice.json | 2 +-
.../src/test/resources/keypair_details.json | 2 +-
.../src/test/resources/keypair_list.json | 2 +-
.../src/test/resources/metadata_item.json | 4 +-
.../src/test/resources/metadata_list.json | 4 +-
.../src/test/resources/metadata_updated.json | 4 +-
.../src/test/resources/new_server.json | 39 +-
.../resources/new_server_disk_config_auto.json | 39 +-
.../new_server_disk_config_manual.json | 39 +-
.../src/test/resources/new_server_in_zone.json | 39 +-
.../resources/new_server_networks_response.json | 2 +-
.../test/resources/new_server_no_adminpass.json | 2 +-
.../src/test/resources/quotas.json | 32 +-
.../test/resources/securitygroup_created.json | 4 +-
.../test/resources/securitygroup_details.json | 51 +-
...itygroup_details_computeservice_typical.json | 87 +--
.../securitygroup_details_extension.json | 51 +-
...securitygroup_details_extension_norules.json | 17 +-
.../resources/securitygroup_details_port22.json | 26 +-
.../src/test/resources/securitygroup_list.json | 90 ++-
...oup_list_details_computeservice_typical.json | 109 ++--
.../resources/securitygroup_list_extension.json | 90 ++-
.../resources/securitygrouprule_created.json | 5 +-
.../securitygrouprule_created_cidr.json | 2 +-
.../securitygrouprule_created_group.json | 2 +-
.../src/test/resources/server_details.json | 38 +-
.../test/resources/server_details_devstack.json | 104 +--
.../resources/server_details_openstack.json | 49 +-
.../resources/server_details_without_image.json | 4 +-
.../src/test/resources/server_diagnostics.json | 30 +-
.../src/test/resources/server_list.json | 4 +-
.../src/test/resources/server_list_details.json | 151 +++--
.../resources/server_list_details_essex.json | 334 +++++-----
.../resources/server_public_ip_in_private.json | 56 +-
.../resources/server_with_security_groups.json | 63 +-
.../server_with_security_groups_extension.json | 60 +-
.../src/test/resources/simple_tenant_usage.json | 40 +-
.../test/resources/simple_tenant_usages.json | 14 +-
.../src/test/resources/snapshot_details.json | 12 +-
.../src/test/resources/snapshot_list.json | 14 +-
.../test/resources/snapshot_list_detail.json | 14 +-
.../test/resources/virtual_interfaces_list.json | 9 +-
.../src/test/resources/volume_details.json | 23 +-
.../src/test/resources/volume_list.json | 25 +-
.../src/test/resources/volume_list_detail.json | 25 +-
.../src/test/resources/volume_type.json | 23 +-
.../test/resources/volume_type_extra_specs.json | 6 +-
.../src/test/resources/volume_type_list.json | 17 +-
.../src/test/resources/access_hpcloud.json | 634 ++++++++++---------
130 files changed, 3562 insertions(+), 2323 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/internal/KeystoneFixture.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/internal/KeystoneFixture.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/internal/KeystoneFixture.java
index 0d0d6d0..674f4db 100644
--- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/internal/KeystoneFixture.java
+++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/internal/KeystoneFixture.java
@@ -37,9 +37,9 @@ public enum KeystoneFixture {
public String getTenantId() {
return "12346637803162";
}
-
+
public String getTenantName() {
- return "adrian@jclouds.org";
+ return "user@jclouds.apache.org";
}
public HttpRequest initialAuthWithUsernameAndPassword(String username, String password) {
@@ -52,7 +52,7 @@ public enum KeystoneFixture {
"{\"auth\":{\"passwordCredentials\":{\"username\":\"%s\",\"password\":\"%s\"}}}",
username, password), "application/json")).build();
}
-
+
public HttpRequest initialAuthWithUsernameAndPasswordAndTenantName(String username, String password) {
return HttpRequest.builder().method("POST")
.endpoint("http://localhost:5000/v2.0/tokens")
@@ -63,7 +63,7 @@ public enum KeystoneFixture {
"{\"auth\":{\"passwordCredentials\":{\"username\":\"%s\",\"password\":\"%s\"},\"tenantName\":\"%s\"}}",
username, password, getTenantName()), "application/json")).build();
}
-
+
public HttpRequest initialAuthWithAccessKeyAndSecretKeyAndTenantName(String accessKey, String secretKey) {
return HttpRequest.builder().method("POST")
.endpoint("http://localhost:5000/v2.0/tokens")
@@ -74,18 +74,17 @@ public enum KeystoneFixture {
"{\"auth\":{\"apiAccessKeyCredentials\":{\"accessKey\":\"%s\",\"secretKey\":\"%s\"},\"tenantName\":\"%s\"}}",
accessKey, secretKey, getTenantName()), "application/json")).build();
}
-
+
public HttpRequest initialAuthWithAccessKeyAndSecretKeyAndTenantId(String accessKey, String secretKey) {
return HttpRequest.builder().method("POST")
-
- .endpoint("http://localhost:5000/v2.0/tokens")
- .addHeader(HttpHeaders.ACCEPT, "application/json")
- .payload(
- payloadFromStringWithContentType(
- format(
- "{\"auth\":{\"apiAccessKeyCredentials\":{\"accessKey\":\"%s\",\"secretKey\":\"%s\"},\"tenantId\":\"%s\"}}",
- accessKey, secretKey, getTenantId()), "application/json")).build();
- }
+ .endpoint("http://localhost:5000/v2.0/tokens")
+ .addHeader(HttpHeaders.ACCEPT, "application/json")
+ .payload(
+ payloadFromStringWithContentType(
+ format(
+ "{\"auth\":{\"apiAccessKeyCredentials\":{\"accessKey\":\"%s\",\"secretKey\":\"%s\"},\"tenantId\":\"%s\"}}",
+ accessKey, secretKey, getTenantId()), "application/json")).build();
+ }
public String getAuthToken() {
return "Auth_4f173437e4b013bee56d1007";
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseAccessTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseAccessTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseAccessTest.java
index bfb5d38..b4dba5c 100644
--- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseAccessTest.java
+++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseAccessTest.java
@@ -87,24 +87,24 @@ public class ParseAccessTest extends BaseItemParserTest<Access> {
.service(Service.builder().name("Compute").type(COMPUTE)
.endpoint(Endpoint.builder()
.tenantId("3456")
- .publicURL("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456")
+ .publicURL("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456")
.region("az-1.region-a.geo-1")
- .versionId("1.1")
- .versionInfo("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/")
+ .versionId("2")
+ .versionInfo("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/")
.versionList("https://az-1.region-a.geo-1.compute.hpcloudsvc.com").build())
.endpoint(Endpoint.builder()
.tenantId("3456")
- .publicURL("https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456")
+ .publicURL("https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v2/3456")
.region("az-2.region-a.geo-1")
- .versionId("1.1")
- .versionInfo("https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v1.1/")
+ .versionId("2")
+ .versionInfo("https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v2/")
.versionList("https://az-2.region-a.geo-1.compute.hpcloudsvc.com").build())
.endpoint(Endpoint.builder()
.tenantId("3456")
- .publicURL("https://az-3.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456")
+ .publicURL("https://az-3.region-a.geo-1.compute.hpcloudsvc.com/v2/3456")
.region("az-3.region-a.geo-1")
- .versionId("1.1")
- .versionInfo("https://az-3.region-a.geo-1.compute.hpcloudsvc.com/v1.1/")
+ .versionId("2")
+ .versionInfo("https://az-3.region-a.geo-1.compute.hpcloudsvc.com/v2/")
.versionList("https://az-3.region-a.geo-1.compute.hpcloudsvc.com").build()).build())
.service(Service.builder().name("Neutron Service").type(NETWORK)
.endpoint(Endpoint.builder()
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/LocationIdToURIFromAccessForTypeAndVersionTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/LocationIdToURIFromAccessForTypeAndVersionTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/LocationIdToURIFromAccessForTypeAndVersionTest.java
index 4db8110..f530329 100644
--- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/LocationIdToURIFromAccessForTypeAndVersionTest.java
+++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/LocationIdToURIFromAccessForTypeAndVersionTest.java
@@ -67,19 +67,19 @@ public class LocationIdToURIFromAccessForTypeAndVersionTest {
}).getInstance(LocationIdToURIFromAccessForTypeAndVersion.Factory.class);
public void testRegionUnmatchesOkWhenNoVersionIdSet() {
- assertEquals(Maps.transformValues(factory.createForApiTypeAndVersion("compute", "1.1").get(), Suppliers
+ assertEquals(Maps.transformValues(factory.createForApiTypeAndVersion("compute", "2").get(), Suppliers
.<URI> supplierFunction()), ImmutableMap.of("az-1.region-a.geo-1", URI
- .create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456"), "az-2.region-a.geo-1", URI
- .create("https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456"), "az-3.region-a.geo-1", URI
- .create("https://az-3.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456")));
+ .create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456"), "az-2.region-a.geo-1", URI
+ .create("https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v2/3456"), "az-3.region-a.geo-1", URI
+ .create("https://az-3.region-a.geo-1.compute.hpcloudsvc.com/v2/3456")));
}
public void testRegionMatches() {
- assertEquals(Maps.transformValues(factory.createForApiTypeAndVersion("compute", "1.1").get(), Suppliers
+ assertEquals(Maps.transformValues(factory.createForApiTypeAndVersion("compute", "2").get(), Suppliers
.<URI> supplierFunction()), ImmutableMap.of("az-1.region-a.geo-1", URI
- .create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456"), "az-2.region-a.geo-1", URI
- .create("https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456"), "az-3.region-a.geo-1", URI
- .create("https://az-3.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456")));
+ .create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456"), "az-2.region-a.geo-1", URI
+ .create("https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v2/3456"), "az-3.region-a.geo-1", URI
+ .create("https://az-3.region-a.geo-1.compute.hpcloudsvc.com/v2/3456")));
}
private final LocationIdToURIFromAccessForTypeAndVersion.Factory raxFactory = Guice.createInjector(new AbstractModule() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToAdminURIFromAccessForTypeAndVersionTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToAdminURIFromAccessForTypeAndVersionTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToAdminURIFromAccessForTypeAndVersionTest.java
index 3db29d6..91ebb61 100644
--- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToAdminURIFromAccessForTypeAndVersionTest.java
+++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToAdminURIFromAccessForTypeAndVersionTest.java
@@ -67,7 +67,7 @@ public class RegionIdToAdminURIFromAccessForTypeAndVersionTest {
map.put("region-a.geo-1", null);
map.put("region-b.geo-1", null);
map.put("region-c.geo-1", null);
- assertEquals(Maps.transformValues(factory.createForApiTypeAndVersion("compute", "1.1").get(), Suppliers
+ assertEquals(Maps.transformValues(factory.createForApiTypeAndVersion("compute", "2").get(), Suppliers
.<URI> supplierFunction()), map);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToURIFromAccessForTypeAndVersionTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToURIFromAccessForTypeAndVersionTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToURIFromAccessForTypeAndVersionTest.java
index 92bd4f3..68843a1 100644
--- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToURIFromAccessForTypeAndVersionTest.java
+++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToURIFromAccessForTypeAndVersionTest.java
@@ -68,11 +68,11 @@ public class RegionIdToURIFromAccessForTypeAndVersionTest {
}
public void testRegionMatches() {
- assertEquals(Maps.transformValues(factory.createForApiTypeAndVersion("compute", "1.1").get(), Suppliers
+ assertEquals(Maps.transformValues(factory.createForApiTypeAndVersion("compute", "2").get(), Suppliers
.<URI> supplierFunction()), ImmutableMap.of("az-1.region-a.geo-1", URI
- .create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456"), "az-2.region-a.geo-1", URI
- .create("https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456"), "az-3.region-a.geo-1", URI
- .create("https://az-3.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456")));
+ .create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456"), "az-2.region-a.geo-1", URI
+ .create("https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v2/3456"), "az-3.region-a.geo-1", URI
+ .create("https://az-3.region-a.geo-1.compute.hpcloudsvc.com/v2/3456")));
}
private final RegionIdToURISupplier.Factory raxFactory = Guice.createInjector(new AbstractModule() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/ZoneIdToURIFromAccessForTypeAndVersionTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/ZoneIdToURIFromAccessForTypeAndVersionTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/ZoneIdToURIFromAccessForTypeAndVersionTest.java
index 9e1b191..a7eb893 100644
--- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/ZoneIdToURIFromAccessForTypeAndVersionTest.java
+++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/ZoneIdToURIFromAccessForTypeAndVersionTest.java
@@ -68,10 +68,10 @@ public class ZoneIdToURIFromAccessForTypeAndVersionTest {
}
public void testZoneMatches() {
- assertEquals(Maps.transformValues(factory.createForApiTypeAndVersion("compute", "1.1").get(), Suppliers
- .<URI> supplierFunction()), ImmutableMap.of("az-1.region-a.geo-1", URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456"),
- "az-2.region-a.geo-1", URI.create("https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456"),
- "az-3.region-a.geo-1", URI.create("https://az-3.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456")));
+ assertEquals(Maps.transformValues(factory.createForApiTypeAndVersion("compute", "2").get(), Suppliers
+ .<URI> supplierFunction()), ImmutableMap.of("az-1.region-a.geo-1", URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456"),
+ "az-2.region-a.geo-1", URI.create("https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v2/3456"),
+ "az-3.region-a.geo-1", URI.create("https://az-3.region-a.geo-1.compute.hpcloudsvc.com/v2/3456")));
}
private final ZoneIdToURISupplier.Factory raxFactory = Guice.createInjector(new AbstractModule() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-keystone/src/test/resources/keystoneAuthResponse.json
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/test/resources/keystoneAuthResponse.json b/apis/openstack-keystone/src/test/resources/keystoneAuthResponse.json
index e20670f..eab46bd 100644
--- a/apis/openstack-keystone/src/test/resources/keystoneAuthResponse.json
+++ b/apis/openstack-keystone/src/test/resources/keystoneAuthResponse.json
@@ -83,29 +83,29 @@
"endpoints": [
{
"tenantId": "3456",
- "publicURL": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456",
+ "publicURL": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456",
"publicURL2": "https://az-1.region-a.geo-1.ec2-compute.hpcloudsvc.com/services/Cloud",
"region": "az-1.region-a.geo-1",
- "versionId": "1.1",
- "versionInfo": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/",
+ "versionId": "2",
+ "versionInfo": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/",
"versionList": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com"
},
{
"tenantId": "3456",
- "publicURL": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456",
+ "publicURL": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v2/3456",
"publicURL2": "https://az-2.region-a.geo-1.ec2-compute.hpcloudsvc.com/services/Cloud",
"region": "az-2.region-a.geo-1",
- "versionId": "1.1",
- "versionInfo": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v1.1/",
+ "versionId": "2",
+ "versionInfo": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v2/",
"versionList": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com"
},
{
"tenantId": "3456",
- "publicURL": "https://az-3.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456",
+ "publicURL": "https://az-3.region-a.geo-1.compute.hpcloudsvc.com/v2/3456",
"publicURL2": "https://az-3.region-a.geo-1.ec2-compute.hpcloudsvc.com/services/Cloud",
"region": "az-3.region-a.geo-1",
- "versionId": "1.1",
- "versionInfo": "https://az-3.region-a.geo-1.compute.hpcloudsvc.com/v1.1/",
+ "versionId": "2",
+ "versionInfo": "https://az-3.region-a.geo-1.compute.hpcloudsvc.com/v2/",
"versionList": "https://az-3.region-a.geo-1.compute.hpcloudsvc.com"
}
]
@@ -191,4 +191,4 @@
}
]
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-keystone/src/test/resources/keystoneAuthResponse_openstack.json
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/test/resources/keystoneAuthResponse_openstack.json b/apis/openstack-keystone/src/test/resources/keystoneAuthResponse_openstack.json
index 214be22..f5fea55 100644
--- a/apis/openstack-keystone/src/test/resources/keystoneAuthResponse_openstack.json
+++ b/apis/openstack-keystone/src/test/resources/keystoneAuthResponse_openstack.json
@@ -12,10 +12,10 @@
{
"endpoints": [
{
- "adminURL": "https://nova-api.openstack.org:9774/v1.1/3456",
+ "adminURL": "https://nova-api.openstack.org:9774/v2/3456",
"region": "RegionOne",
- "internalURL": "https://nova-api.openstack.org:9774/v1.1/3456",
- "publicURL": "https://nova-api.openstack.org:9774/v1.1/3456"
+ "internalURL": "https://nova-api.openstack.org:9774/v2/3456",
+ "publicURL": "https://nova-api.openstack.org:9774/v2/3456"
}
],
"type": "compute",
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java
index 2958c4e..4dfd401 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java
@@ -85,7 +85,7 @@ public class NovaApiMetadata extends BaseHttpApiMetadata<NovaApi> {
.credentialName("${password}")
.endpointName("Keystone base url ending in /v2.0/")
.documentation(URI.create("http://api.openstack.org/"))
- .version("1.1")
+ .version("2")
.defaultEndpoint("http://localhost:5000/v2.0/")
.defaultProperties(NovaApiMetadata.defaultProperties())
.view(typeToken(ComputeServiceContext.class))
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/AccessKeyAndSecretKeyAndTenantIdAuthenticationExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/AccessKeyAndSecretKeyAndTenantIdAuthenticationExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/AccessKeyAndSecretKeyAndTenantIdAuthenticationExpectTest.java
index 7d5299f..7cafdd5 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/AccessKeyAndSecretKeyAndTenantIdAuthenticationExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/AccessKeyAndSecretKeyAndTenantIdAuthenticationExpectTest.java
@@ -54,7 +54,7 @@ public class AccessKeyAndSecretKeyAndTenantIdAuthenticationExpectTest extends Ba
HttpRequest listServers = HttpRequest
.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/AccessKeyAndSecretKeyAndTenantNamePropertyAuthenticationExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/AccessKeyAndSecretKeyAndTenantNamePropertyAuthenticationExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/AccessKeyAndSecretKeyAndTenantNamePropertyAuthenticationExpectTest.java
index 53771c1..a013889 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/AccessKeyAndSecretKeyAndTenantNamePropertyAuthenticationExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/AccessKeyAndSecretKeyAndTenantNamePropertyAuthenticationExpectTest.java
@@ -54,7 +54,7 @@ public class AccessKeyAndSecretKeyAndTenantNamePropertyAuthenticationExpectTest
HttpRequest listServers = HttpRequest
.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/AccessKeyAndSecretKeyAuthenticationExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/AccessKeyAndSecretKeyAuthenticationExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/AccessKeyAndSecretKeyAuthenticationExpectTest.java
index 166d542..8cc0539 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/AccessKeyAndSecretKeyAuthenticationExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/AccessKeyAndSecretKeyAuthenticationExpectTest.java
@@ -49,7 +49,7 @@ public class AccessKeyAndSecretKeyAuthenticationExpectTest extends BaseNovaApiEx
HttpRequest listServers = HttpRequest
.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/PasswordAuthenticationExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/PasswordAuthenticationExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/PasswordAuthenticationExpectTest.java
index e3bde10..22b446e 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/PasswordAuthenticationExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/PasswordAuthenticationExpectTest.java
@@ -40,7 +40,7 @@ public class PasswordAuthenticationExpectTest extends BaseNovaApiExpectTest {
HttpRequest listServers = HttpRequest
.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/PasswordAuthenticationWithTenantNameExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/PasswordAuthenticationWithTenantNameExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/PasswordAuthenticationWithTenantNameExpectTest.java
index 81184d5..b6cb881 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/PasswordAuthenticationWithTenantNameExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/PasswordAuthenticationWithTenantNameExpectTest.java
@@ -49,7 +49,7 @@ public class PasswordAuthenticationWithTenantNameExpectTest extends BaseNovaApiE
HttpRequest listServers = HttpRequest
.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapterExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapterExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapterExpectTest.java
index c63f7e9..0a9aa06 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapterExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapterExpectTest.java
@@ -55,7 +55,7 @@ public class NovaComputeServiceAdapterExpectTest extends BaseNovaComputeServiceC
HttpRequest serverDetail = HttpRequest
.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/71752")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/71752")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
@@ -67,7 +67,7 @@ public class NovaComputeServiceAdapterExpectTest extends BaseNovaComputeServiceC
HttpRequest createServer = HttpRequest
.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -102,7 +102,7 @@ public class NovaComputeServiceAdapterExpectTest extends BaseNovaComputeServiceC
HttpRequest createServer = HttpRequest
.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -137,7 +137,7 @@ public class NovaComputeServiceAdapterExpectTest extends BaseNovaComputeServiceC
HttpRequest createServer = HttpRequest
.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -171,7 +171,7 @@ public class NovaComputeServiceAdapterExpectTest extends BaseNovaComputeServiceC
HttpRequest createServer = HttpRequest
.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -218,7 +218,7 @@ public class NovaComputeServiceAdapterExpectTest extends BaseNovaComputeServiceC
HttpRequest createServer = HttpRequest
.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -259,7 +259,7 @@ public class NovaComputeServiceAdapterExpectTest extends BaseNovaComputeServiceC
HttpRequest createServer = HttpRequest
.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -309,7 +309,7 @@ public class NovaComputeServiceAdapterExpectTest extends BaseNovaComputeServiceC
HttpRequest createServer = HttpRequest
.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -348,7 +348,7 @@ public class NovaComputeServiceAdapterExpectTest extends BaseNovaComputeServiceC
HttpRequest suspendServer = HttpRequest
.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/71752/action")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/71752/action")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -384,7 +384,7 @@ public class NovaComputeServiceAdapterExpectTest extends BaseNovaComputeServiceC
HttpRequest suspendServer = HttpRequest
.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/71752/action")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/71752/action")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
"{\"suspend\":null}", "application/json"))
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceExpectTest.java
index f87f66e..f62e97e 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceExpectTest.java
@@ -93,18 +93,18 @@ public class NovaComputeServiceExpectTest extends BaseNovaComputeServiceExpectTe
payloadFromResourceWithContentType("/keystoneAuthResponse_openstack.json", "application/json"))
.build())
.put(extensionsOfNovaRequest.toBuilder()
- .endpoint("https://nova-api.openstack.org:9774/v1.1/3456/extensions").build(),
+ .endpoint("https://nova-api.openstack.org:9774/v2/3456/extensions").build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/extension_list_openstack.json"))
.build())
.put(listDetail.toBuilder()
- .endpoint("https://nova-api.openstack.org:9774/v1.1/3456/images/detail").build(),
+ .endpoint("https://nova-api.openstack.org:9774/v2/3456/images/detail").build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/image_list_detail_openstack.json"))
.build())
.put(listServers.toBuilder()
- .endpoint("https://nova-api.openstack.org:9774/v1.1/3456/servers/detail").build(),
+ .endpoint("https://nova-api.openstack.org:9774/v2/3456/servers/detail").build(),
listServersResponse)
.put(listFlavorsDetail.toBuilder()
- .endpoint("https://nova-api.openstack.org:9774/v1.1/3456/flavors/detail").build(),
+ .endpoint("https://nova-api.openstack.org:9774/v2/3456/flavors/detail").build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/flavor_list_detail_openstack.json"))
.build()).build();
@@ -131,7 +131,7 @@ public class NovaComputeServiceExpectTest extends BaseNovaComputeServiceExpectTe
HttpRequest listServers = HttpRequest
.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/detail")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/detail")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
@@ -146,7 +146,7 @@ public class NovaComputeServiceExpectTest extends BaseNovaComputeServiceExpectTe
HttpRequest list = HttpRequest
.builder()
.method("GET")
- .endpoint("https://nova-api.openstack.org:9774/v1.1/3456/os-security-groups")
+ .endpoint("https://nova-api.openstack.org:9774/v2/3456/os-security-groups")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
@@ -155,7 +155,7 @@ public class NovaComputeServiceExpectTest extends BaseNovaComputeServiceExpectTe
HttpRequest createWithPrefixOnGroup = HttpRequest
.builder()
.method("POST")
- .endpoint("https://nova-api.openstack.org:9774/v1.1/3456/os-security-groups")
+ .endpoint("https://nova-api.openstack.org:9774/v2/3456/os-security-groups")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(
@@ -169,7 +169,7 @@ public class NovaComputeServiceExpectTest extends BaseNovaComputeServiceExpectTe
HttpRequest createRuleForDefaultPort22 = HttpRequest
.builder()
.method("POST")
- .endpoint("https://nova-api.openstack.org:9774/v1.1/3456/os-security-group-rules")
+ .endpoint("https://nova-api.openstack.org:9774/v2/3456/os-security-group-rules")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(
@@ -183,7 +183,7 @@ public class NovaComputeServiceExpectTest extends BaseNovaComputeServiceExpectTe
HttpRequest getSecurityGroup = HttpRequest
.builder()
.method("GET")
- .endpoint("https://nova-api.openstack.org:9774/v1.1/3456/os-security-groups/160")
+ .endpoint("https://nova-api.openstack.org:9774/v2/3456/os-security-groups/160")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
@@ -193,7 +193,7 @@ public class NovaComputeServiceExpectTest extends BaseNovaComputeServiceExpectTe
HttpRequest create = HttpRequest
.builder()
.method("POST")
- .endpoint("https://nova-api.openstack.org:9774/v1.1/3456/os-keypairs")
+ .endpoint("https://nova-api.openstack.org:9774/v2/3456/os-keypairs")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(
@@ -207,7 +207,7 @@ public class NovaComputeServiceExpectTest extends BaseNovaComputeServiceExpectTe
HttpRequest serverDetail = HttpRequest
.builder()
.method("GET")
- .endpoint("https://nova-api.openstack.org:9774/v1.1/3456/servers/71752")
+ .endpoint("https://nova-api.openstack.org:9774/v2/3456/servers/71752")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
@@ -233,7 +233,7 @@ public class NovaComputeServiceExpectTest extends BaseNovaComputeServiceExpectTe
HttpRequest createServerWithGeneratedKeyPair = HttpRequest
.builder()
.method("POST")
- .endpoint("https://nova-api.openstack.org:9774/v1.1/3456/servers")
+ .endpoint("https://nova-api.openstack.org:9774/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(
@@ -288,7 +288,7 @@ public class NovaComputeServiceExpectTest extends BaseNovaComputeServiceExpectTe
HttpRequest createServerWithSuppliedKeyPair = HttpRequest
.builder()
.method("POST")
- .endpoint("https://nova-api.openstack.org:9774/v1.1/3456/servers")
+ .endpoint("https://nova-api.openstack.org:9774/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(
@@ -339,7 +339,7 @@ public class NovaComputeServiceExpectTest extends BaseNovaComputeServiceExpectTe
HttpRequest createServerWithSuppliedKeyPairAndGroup = HttpRequest
.builder()
.method("POST")
- .endpoint("https://nova-api.openstack.org:9774/v1.1/3456/servers")
+ .endpoint("https://nova-api.openstack.org:9774/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaImageExtensionExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaImageExtensionExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaImageExtensionExpectTest.java
index 11fba54..8021cb9 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaImageExtensionExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaImageExtensionExpectTest.java
@@ -43,7 +43,7 @@ public class NovaImageExtensionExpectTest extends BaseNovaComputeServiceExpectTe
}
HttpRequest serverDetail = HttpRequest.builder().method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/71752")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/71752")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
@@ -51,7 +51,7 @@ public class NovaImageExtensionExpectTest extends BaseNovaComputeServiceExpectTe
.payload(payloadFromResource("/server_details.json")).build();
HttpRequest createImage = HttpRequest.builder().method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/71752/action")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/71752/action")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(
@@ -60,11 +60,11 @@ public class NovaImageExtensionExpectTest extends BaseNovaComputeServiceExpectTe
"application/json")).build();
HttpResponse createImageResponse = HttpResponse.builder().statusCode(202)
- .addHeader("Location", "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/images/52415800-8b69-11e0-9b19-734f5736d2a2")
+ .addHeader("Location", "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/images/52415800-8b69-11e0-9b19-734f5736d2a2")
.build();
HttpRequest getImage = HttpRequest.builder().method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/images/52415800-8b69-11e0-9b19-734f5736d2a2")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/images/52415800-8b69-11e0-9b19-734f5736d2a2")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtensionExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtensionExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtensionExpectTest.java
index 5bf3fcd..775490a 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtensionExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtensionExpectTest.java
@@ -49,7 +49,7 @@ public class NovaSecurityGroupExtensionExpectTest extends BaseNovaComputeService
protected String zone = "az-1.region-a.geo-1";
protected HttpRequest list = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-groups")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
@@ -79,7 +79,7 @@ public class NovaSecurityGroupExtensionExpectTest extends BaseNovaComputeService
public void testListSecurityGroupsInLocation() {
HttpRequest list = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-groups")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
@@ -104,7 +104,7 @@ public class NovaSecurityGroupExtensionExpectTest extends BaseNovaComputeService
public void testListSecurityGroupsForNode() {
HttpRequest serverReq = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-create-server-ext/8d0a6ca5-8849-4b3d-b86e-f24c92490ebb"))
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-create-server-ext/8d0a6ca5-8849-4b3d-b86e-f24c92490ebb"))
.headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
@@ -113,7 +113,7 @@ public class NovaSecurityGroupExtensionExpectTest extends BaseNovaComputeService
payloadFromResource("/server_with_security_groups_extension.json")).build();
HttpRequest list = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-groups")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
@@ -135,7 +135,7 @@ public class NovaSecurityGroupExtensionExpectTest extends BaseNovaComputeService
public void testGetSecurityGroupById() {
HttpRequest getSecurityGroup = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-groups/160")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups/160")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
@@ -156,7 +156,7 @@ public class NovaSecurityGroupExtensionExpectTest extends BaseNovaComputeService
public void testCreateSecurityGroup() {
HttpRequest getSecurityGroup = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-groups/160")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups/160")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
@@ -164,7 +164,7 @@ public class NovaSecurityGroupExtensionExpectTest extends BaseNovaComputeService
payloadFromResource("/securitygroup_details_extension.json")).build();
HttpRequest create = HttpRequest.builder().method("POST").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-groups")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build())
.payload(
@@ -176,7 +176,7 @@ public class NovaSecurityGroupExtensionExpectTest extends BaseNovaComputeService
payloadFromResource("/securitygroup_created.json")).build();
HttpRequest list = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-groups")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups")).headers(
ImmutableMultimap.<String, String>builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
@@ -202,7 +202,7 @@ public class NovaSecurityGroupExtensionExpectTest extends BaseNovaComputeService
public void testRemoveSecurityGroup() {
HttpRequest delete = HttpRequest.builder().method("DELETE").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-groups/160"))
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups/160"))
.headers(
ImmutableMultimap.<String, String>builder().put("Accept", "application/json")
.put("X-Auth-Token", authToken).build()).build();
@@ -210,7 +210,7 @@ public class NovaSecurityGroupExtensionExpectTest extends BaseNovaComputeService
HttpResponse deleteResponse = HttpResponse.builder().statusCode(202).build();
HttpRequest getSecurityGroup = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-groups/160")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups/160")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
@@ -232,7 +232,7 @@ public class NovaSecurityGroupExtensionExpectTest extends BaseNovaComputeService
HttpRequest createRule = HttpRequest
.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-group-rules")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-group-rules")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(
@@ -244,7 +244,7 @@ public class NovaSecurityGroupExtensionExpectTest extends BaseNovaComputeService
payloadFromResource("/securitygrouprule_created_cidr.json")).build();
HttpRequest getSecurityGroup = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-groups/160")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups/160")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
@@ -281,7 +281,7 @@ public class NovaSecurityGroupExtensionExpectTest extends BaseNovaComputeService
HttpRequest createRule = HttpRequest
.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-group-rules")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-group-rules")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(
@@ -293,7 +293,7 @@ public class NovaSecurityGroupExtensionExpectTest extends BaseNovaComputeService
payloadFromResource("/securitygrouprule_created_cidr.json")).build();
HttpRequest getSecurityGroup = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-groups/160")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups/160")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
@@ -327,7 +327,7 @@ public class NovaSecurityGroupExtensionExpectTest extends BaseNovaComputeService
HttpRequest createRule = HttpRequest
.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-group-rules")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-group-rules")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(
@@ -339,7 +339,7 @@ public class NovaSecurityGroupExtensionExpectTest extends BaseNovaComputeService
payloadFromResource("/securitygrouprule_created_group.json")).build();
HttpRequest getSecurityGroup = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-groups/160")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups/160")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
@@ -376,7 +376,7 @@ public class NovaSecurityGroupExtensionExpectTest extends BaseNovaComputeService
HttpRequest createRule = HttpRequest
.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-group-rules")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-group-rules")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(
@@ -388,7 +388,7 @@ public class NovaSecurityGroupExtensionExpectTest extends BaseNovaComputeService
payloadFromResource("/securitygrouprule_created_group.json")).build();
HttpRequest getSecurityGroup = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-groups/160")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups/160")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/AllocateAndAddFloatingIpToNodeExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/AllocateAndAddFloatingIpToNodeExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/AllocateAndAddFloatingIpToNodeExpectTest.java
index 2c3e285..28cc533 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/AllocateAndAddFloatingIpToNodeExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/AllocateAndAddFloatingIpToNodeExpectTest.java
@@ -58,7 +58,7 @@ public class AllocateAndAddFloatingIpToNodeExpectTest extends BaseNovaComputeSer
final NovaTemplateOptions options = NovaTemplateOptions.Builder.autoAssignFloatingIp(false);
HttpRequest createFloatingIP = HttpRequest.builder().method("POST").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-floating-ips")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-floating-ips")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).payload(payloadFromStringWithContentType("{}", "application/json")).build();
@@ -92,7 +92,7 @@ public class AllocateAndAddFloatingIpToNodeExpectTest extends BaseNovaComputeSer
private HttpRequest addFloatingIPForAddress(String address) {
HttpRequest addFloatingIPRequest = HttpRequest.builder().method("POST").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/71592/action"))
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/71592/action"))
.headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json")
.put("X-Auth-Token", authToken).build()).payload(
@@ -111,7 +111,7 @@ public class AllocateAndAddFloatingIpToNodeExpectTest extends BaseNovaComputeSer
"application/json")).build();
HttpRequest list = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-floating-ips")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-floating-ips")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
@@ -149,7 +149,7 @@ public class AllocateAndAddFloatingIpToNodeExpectTest extends BaseNovaComputeSer
"application/json")).build();
HttpRequest list = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-floating-ips")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-floating-ips")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/ServerInZoneToNodeMetadataTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/ServerInZoneToNodeMetadataTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/ServerInZoneToNodeMetadataTest.java
index d0cedfe..b5c1646 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/ServerInZoneToNodeMetadataTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/ServerInZoneToNodeMetadataTest.java
@@ -273,8 +273,8 @@ public class ServerInZoneToNodeMetadataTest {
assertNotNull(convertedNodeMetadata.getUserMetadata());
assertEquals(convertedNodeMetadata.getUserMetadata(),
ImmutableMap.<String, String> of("Server Label", "Web Head 1", "Image Version", "2.1"));
-
- URI expectedURI = URI.create("http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f6f006e54");
+
+ URI expectedURI = URI.create("http://servers.api.openstack.org/v2/1234/servers/71752");
assertEquals(convertedNodeMetadata.getUri(), expectedURI);
}
@@ -300,7 +300,7 @@ public class ServerInZoneToNodeMetadataTest {
assertEquals(convertedNodeMetadata.getLocation(), zone);
- URI expectedURI = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/37936628937291/servers/71752");
+ URI expectedURI = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/37936628937291/servers/71752");
assertEquals(convertedNodeMetadata.getUri(), expectedURI);
}
@@ -334,7 +334,7 @@ public class ServerInZoneToNodeMetadataTest {
URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/flavors/100")))
.build())
.links(
- Link.create(Link.Relation.SELF, URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/37936628937291/servers/71752")),
+ Link.create(Link.Relation.SELF, URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/37936628937291/servers/71752")),
Link.create(Link.Relation.BOOKMARK, URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/servers/71752"))).build();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AdminActionsApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AdminActionsApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AdminActionsApiExpectTest.java
index aa849c7..b3a80a7 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AdminActionsApiExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AdminActionsApiExpectTest.java
@@ -42,7 +42,7 @@ import com.google.common.collect.ImmutableMap;
public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
public void testSuspend() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -54,7 +54,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testSuspendFailsNotFound() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -67,7 +67,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
@Test(expectedExceptions = AuthorizationException.class)
public void testSuspendFailsNotAuthorized() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -79,7 +79,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testResume() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -91,7 +91,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testResumeFailsNotFound() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -104,7 +104,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
@Test(expectedExceptions = AuthorizationException.class)
public void testResumeFailsNotAuthorized() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -116,7 +116,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testLock() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -128,7 +128,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testLockFailsNotFound() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -140,7 +140,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testUnlock() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -152,7 +152,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testUnlockFailsNotFound() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -164,7 +164,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testPause() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -176,7 +176,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testPauseFailsNotFound() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -188,7 +188,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testUnpause() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -200,7 +200,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testUnpauseFailsNotFound() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -212,7 +212,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testMigrateServer() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -225,7 +225,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
public void testMigrateServerFailsNotFound() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -237,7 +237,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testResetNetworkOfServer() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -249,7 +249,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testResetNetworkOfServerFailsNotFound() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -261,7 +261,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testInjectNetworkInfoIntoServer() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -273,7 +273,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testInjectNetworkInfoIntoServerFailsNotFound() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -288,7 +288,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
- authenticatedGET().endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action").method("POST")
+ authenticatedGET().endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action").method("POST")
.payload(payloadFromStringWithContentType("{\"createBackup\":{\"backup_type\":\"weekly\",\"rotation\":3,\"name\":\"mybackup\",\"metadata\":{\"some\":\"data or other\"}}}", MediaType.APPLICATION_JSON)).build(),
HttpResponse.builder().statusCode(202).addHeader("Location", "http://172.16.89.149:8774/v2/images/1976b3b3-409a-468d-b16c-a9172c341b46").build()
).getServerAdminExtensionForZone("az-1.region-a.geo-1").get();
@@ -299,7 +299,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
@Test(expectedExceptions = ResourceNotFoundException.class)
public void testBackupServerFailNotFound() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -312,7 +312,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testLiveMigrateServer() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -325,7 +325,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testLiveMigrateServerFailsNotFound() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneApiExpectTest.java
index d3b71db..bc2eba4 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneApiExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneApiExpectTest.java
@@ -36,7 +36,7 @@ public class AvailabilityZoneApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest list = HttpRequest
.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-availability-zone")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-availability-zone")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();