Repository: jclouds-labs Updated Branches: refs/heads/master cb70f3254 -> 7aa033a97
Update endpoint to v3 Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/7aa033a9 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/7aa033a9 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/7aa033a9 Branch: refs/heads/master Commit: 7aa033a9706e46d82eacbe5612647a8d89f29b10 Parents: cb70f32 Author: Ali Bazlamit <[email protected]> Authored: Sat May 20 00:58:03 2017 +0200 Committer: Ignasi Barrera <[email protected]> Committed: Mon May 22 10:47:32 2017 +0200 ---------------------------------------------------------------------- .../profitbricks/rest/ProfitBricksProviderMetadata.java | 2 +- .../rest/binder/nic/CreateNicRequestBinder.java | 3 +++ .../rest/binder/nic/UpdateNicRequestBinder.java | 3 +++ .../rest/binder/server/CreateServerRequestBinder.java | 3 +++ .../rest/binder/server/UpdateServerRequestBinder.java | 9 ++++++--- .../jclouds/profitbricks/rest/domain/LicenceType.java | 2 +- .../org/apache/jclouds/profitbricks/rest/domain/Server.java | 5 +++++ .../firewall/CreateFirewallRuleRequestBinderTest.java | 2 +- .../firewall/UpdateFirewallRuleRequestBinderTest.java | 2 +- .../rest/binder/image/UpdateImageRequestBinderTest.java | 2 +- .../rest/binder/lan/CreateLanRequestBinderTest.java | 2 +- .../rest/binder/lan/UpdateLanRequestBinderTest.java | 2 +- .../rest/binder/nic/CreateNicRequestBinderTest.java | 2 +- .../rest/binder/nic/UpdateNicRequestBinderTest.java | 2 +- .../rest/binder/server/AttachCdromRequestBinderTest.java | 2 +- .../rest/binder/server/AttachVolumeRequestBinderTest.java | 2 +- .../rest/binder/server/CreateServerRequestBinderTest.java | 2 +- .../rest/binder/server/UpdateServerRequestBinderTest.java | 2 +- .../rest/binder/volume/CreateSnapshotRequestBinderTest.java | 2 +- .../rest/binder/volume/CreateVolumeRequestBinderTest.java | 2 +- .../binder/volume/RestoreSnapshotRequestBinderTest.java | 2 +- .../rest/binder/volume/UpdateVolumeRequestBinderTest.java | 2 +- .../profitbricks/rest/features/DataCenterApiLiveTest.java | 2 +- profitbricks-rest/src/test/resources/ipblock/get.json | 2 +- .../src/test/resources/ipblock/list.depth-5.json | 6 +++--- profitbricks-rest/src/test/resources/ipblock/list.json | 6 +++--- 26 files changed, 45 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7aa033a9/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/ProfitBricksProviderMetadata.java ---------------------------------------------------------------------- diff --git a/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/ProfitBricksProviderMetadata.java b/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/ProfitBricksProviderMetadata.java index 1631526..614dda9 100644 --- a/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/ProfitBricksProviderMetadata.java +++ b/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/ProfitBricksProviderMetadata.java @@ -91,7 +91,7 @@ public class ProfitBricksProviderMetadata extends BaseProviderMetadata { .homepage(URI.create("https://www.profitbricks.com/";)) .console(URI.create("https://my.profitbricks.com/dashboard/dcdr2";)) .iso3166Codes("DE-BW", "DE-HE", "US-NV") - .endpoint("https://api.profitbricks.com/rest/v2/";) + .endpoint("https://api.profitbricks.com/cloudapi/v3/";) .defaultProperties(ProfitBricksProviderMetadata.defaultProperties()); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7aa033a9/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/binder/nic/CreateNicRequestBinder.java ---------------------------------------------------------------------- diff --git a/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/binder/nic/CreateNicRequestBinder.java b/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/binder/nic/CreateNicRequestBinder.java index e0842ab..b389a8a 100644 --- a/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/binder/nic/CreateNicRequestBinder.java +++ b/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/binder/nic/CreateNicRequestBinder.java @@ -64,6 +64,9 @@ public class CreateNicRequestBinder extends BaseProfitBricksRequestBinder<Nic.Re if (payload.firewallActive() != null) properties.put("firewallActive", payload.firewallActive()); + if (payload.nat() != null) + properties.put("nat", payload.nat()); + if (payload.firewallrules() != null) { Map<String, Object> entities = new HashMap<String, Object>(); entities.put("firewallrules", payload.firewallrules()); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7aa033a9/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/binder/nic/UpdateNicRequestBinder.java ---------------------------------------------------------------------- diff --git a/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/binder/nic/UpdateNicRequestBinder.java b/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/binder/nic/UpdateNicRequestBinder.java index cb8482d..a5fbb96 100644 --- a/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/binder/nic/UpdateNicRequestBinder.java +++ b/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/binder/nic/UpdateNicRequestBinder.java @@ -60,6 +60,9 @@ public class UpdateNicRequestBinder extends BaseProfitBricksRequestBinder<Nic.Re if (payload.dhcp() != null) requestBuilder.put("dhcp", payload.dhcp()); + if (payload.nat() != null) + requestBuilder.put("nat", payload.nat()); + return jsonBinder.toJson(requestBuilder); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7aa033a9/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/binder/server/CreateServerRequestBinder.java ---------------------------------------------------------------------- diff --git a/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/binder/server/CreateServerRequestBinder.java b/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/binder/server/CreateServerRequestBinder.java index ae2e87a..d8aa7f0 100644 --- a/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/binder/server/CreateServerRequestBinder.java +++ b/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/binder/server/CreateServerRequestBinder.java @@ -61,6 +61,9 @@ public class CreateServerRequestBinder extends BaseProfitBricksRequestBinder<Ser else if (payload.bootCdrom() != null) properties.put("bootCdrom", payload.bootCdrom()); + if (payload.cpuFamily() != null) + properties.put("cpuFamily", payload.cpuFamily()); + requestBuilder.put("properties", properties); Server.Entities entities = payload.entities(); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7aa033a9/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/binder/server/UpdateServerRequestBinder.java ---------------------------------------------------------------------- diff --git a/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/binder/server/UpdateServerRequestBinder.java b/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/binder/server/UpdateServerRequestBinder.java index a9be7d1..45bc77c 100644 --- a/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/binder/server/UpdateServerRequestBinder.java +++ b/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/binder/server/UpdateServerRequestBinder.java @@ -16,15 +16,15 @@ */ package org.apache.jclouds.profitbricks.rest.binder.server; +import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.Supplier; import com.google.inject.Inject; +import java.net.URI; import org.apache.jclouds.profitbricks.rest.binder.BaseProfitBricksRequestBinder; import org.apache.jclouds.profitbricks.rest.domain.Server; import org.jclouds.http.HttpRequest; import org.jclouds.json.Json; -import com.google.common.base.Supplier; -import java.net.URI; import org.jclouds.location.Provider; -import static com.google.common.base.Preconditions.checkNotNull; public class UpdateServerRequestBinder extends BaseProfitBricksRequestBinder<Server.Request.UpdatePayload> { @@ -60,6 +60,9 @@ public class UpdateServerRequestBinder extends BaseProfitBricksRequestBinder<Ser else if (payload.bootCdrom() != null) requestBuilder.put("bootCdrom", payload.bootCdrom()); + if (payload.cpuFamily() != null) + requestBuilder.put("cpuFamily", payload.cpuFamily()); + return jsonBinder.toJson(requestBuilder); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7aa033a9/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/domain/LicenceType.java ---------------------------------------------------------------------- diff --git a/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/domain/LicenceType.java b/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/domain/LicenceType.java index 8b2a999..9bae78f 100644 --- a/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/domain/LicenceType.java +++ b/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/domain/LicenceType.java @@ -20,7 +20,7 @@ import com.google.common.base.Enums; public enum LicenceType { - WINDOWS, LINUX, OTHER, UNRECOGNIZED; + WINDOWS, LINUX, OTHER, WINDOWS2016, UNRECOGNIZED; public static LicenceType fromValue(String v) { return Enums.getIfPresent(LicenceType.class, v).or(UNRECOGNIZED); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7aa033a9/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/domain/Server.java ---------------------------------------------------------------------- diff --git a/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/domain/Server.java b/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/domain/Server.java index 1b8b01b..3c98d08 100644 --- a/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/domain/Server.java +++ b/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/domain/Server.java @@ -215,6 +215,9 @@ public abstract class Server extends Trackable { @Nullable public abstract Volume bootCdrom(); + + @Nullable + public abstract CpuFamily cpuFamily(); @Nullable public abstract AvailabilityZone availabilityZone(); @@ -238,6 +241,8 @@ public abstract class Server extends Trackable { public abstract Builder bootVolume(BootVolume bootVolume); public abstract Builder bootCdrom(Volume bootCdrom); + + public abstract Builder cpuFamily(CpuFamily cpuFamily); public abstract Builder availabilityZone(AvailabilityZone availabilityZone); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7aa033a9/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/firewall/CreateFirewallRuleRequestBinderTest.java ---------------------------------------------------------------------- diff --git a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/firewall/CreateFirewallRuleRequestBinderTest.java b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/firewall/CreateFirewallRuleRequestBinderTest.java index ce74db1..c6eaeae 100644 --- a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/firewall/CreateFirewallRuleRequestBinderTest.java +++ b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/firewall/CreateFirewallRuleRequestBinderTest.java @@ -51,7 +51,7 @@ public class CreateFirewallRuleRequestBinderTest extends BinderTestBase { actual ); - assertEquals(request.getEndpoint().getPath(), "/rest/v2/datacenters/datacenter-id/servers/server-id/nics/nic-id/firewallrules"); + assertEquals(request.getEndpoint().getPath(), "/cloudapi/v3/datacenters/datacenter-id/servers/server-id/nics/nic-id/firewallrules"); assertNotNull(actual, "Binder returned null payload"); Json json = injector.getInstance(Json.class); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7aa033a9/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/firewall/UpdateFirewallRuleRequestBinderTest.java ---------------------------------------------------------------------- diff --git a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/firewall/UpdateFirewallRuleRequestBinderTest.java b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/firewall/UpdateFirewallRuleRequestBinderTest.java index 49c0646..97afb24 100644 --- a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/firewall/UpdateFirewallRuleRequestBinderTest.java +++ b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/firewall/UpdateFirewallRuleRequestBinderTest.java @@ -48,7 +48,7 @@ public class UpdateFirewallRuleRequestBinderTest extends BinderTestBase { actual ); - assertEquals(request.getEndpoint().getPath(), "/rest/v2/datacenters/datacenter-id/servers/server-id/nics/nic-id/firewallrules/id"); + assertEquals(request.getEndpoint().getPath(), "/cloudapi/v3/datacenters/datacenter-id/servers/server-id/nics/nic-id/firewallrules/id"); assertNotNull(actual, "Binder returned null payload"); Json json = injector.getInstance(Json.class); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7aa033a9/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/image/UpdateImageRequestBinderTest.java ---------------------------------------------------------------------- diff --git a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/image/UpdateImageRequestBinderTest.java b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/image/UpdateImageRequestBinderTest.java index f2d417c..a631bcf 100644 --- a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/image/UpdateImageRequestBinderTest.java +++ b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/image/UpdateImageRequestBinderTest.java @@ -46,7 +46,7 @@ public class UpdateImageRequestBinderTest extends BinderTestBase { actual ); - assertEquals(request.getEndpoint().getPath(), "/rest/v2/images/some-id"); + assertEquals(request.getEndpoint().getPath(), "/cloudapi/v3/images/some-id"); assertNotNull(actual, "Binder returned null payload"); Json json = injector.getInstance(Json.class); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7aa033a9/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/lan/CreateLanRequestBinderTest.java ---------------------------------------------------------------------- diff --git a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/lan/CreateLanRequestBinderTest.java b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/lan/CreateLanRequestBinderTest.java index bfde777..a8e4db7 100644 --- a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/lan/CreateLanRequestBinderTest.java +++ b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/lan/CreateLanRequestBinderTest.java @@ -46,7 +46,7 @@ public class CreateLanRequestBinderTest extends BinderTestBase { actual ); - assertEquals(request.getEndpoint().getPath(), "/rest/v2/datacenters/datacenter-id/lans"); + assertEquals(request.getEndpoint().getPath(), "/cloudapi/v3/datacenters/datacenter-id/lans"); assertNotNull(actual, "Binder returned null payload"); Json json = injector.getInstance(Json.class); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7aa033a9/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/lan/UpdateLanRequestBinderTest.java ---------------------------------------------------------------------- diff --git a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/lan/UpdateLanRequestBinderTest.java b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/lan/UpdateLanRequestBinderTest.java index 75dbce7..ed670cc 100644 --- a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/lan/UpdateLanRequestBinderTest.java +++ b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/lan/UpdateLanRequestBinderTest.java @@ -46,7 +46,7 @@ public class UpdateLanRequestBinderTest extends BinderTestBase { actual ); - assertEquals(request.getEndpoint().getPath(), "/rest/v2/datacenters/datacenter-id/lans/lan-id"); + assertEquals(request.getEndpoint().getPath(), "/cloudapi/v3/datacenters/datacenter-id/lans/lan-id"); assertNotNull(actual, "Binder returned null payload"); Json json = injector.getInstance(Json.class); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7aa033a9/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/nic/CreateNicRequestBinderTest.java ---------------------------------------------------------------------- diff --git a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/nic/CreateNicRequestBinderTest.java b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/nic/CreateNicRequestBinderTest.java index 0c47e0f..5532f55 100644 --- a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/nic/CreateNicRequestBinderTest.java +++ b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/nic/CreateNicRequestBinderTest.java @@ -48,7 +48,7 @@ public class CreateNicRequestBinderTest extends BinderTestBase { actual ); - assertEquals(request.getEndpoint().getPath(), "/rest/v2/datacenters/datacenter-id/servers/server-id/nics"); + assertEquals(request.getEndpoint().getPath(), "/cloudapi/v3/datacenters/datacenter-id/servers/server-id/nics"); assertNotNull(actual, "Binder returned null payload"); Json json = injector.getInstance(Json.class); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7aa033a9/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/nic/UpdateNicRequestBinderTest.java ---------------------------------------------------------------------- diff --git a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/nic/UpdateNicRequestBinderTest.java b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/nic/UpdateNicRequestBinderTest.java index 9f6a906..cea37b1 100644 --- a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/nic/UpdateNicRequestBinderTest.java +++ b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/nic/UpdateNicRequestBinderTest.java @@ -47,7 +47,7 @@ public class UpdateNicRequestBinderTest extends BinderTestBase { actual ); - assertEquals(request.getEndpoint().getPath(), "/rest/v2/datacenters/datacenter-id/servers/server-id/nics/nic-id"); + assertEquals(request.getEndpoint().getPath(), "/cloudapi/v3/datacenters/datacenter-id/servers/server-id/nics/nic-id"); assertNotNull(actual, "Binder returned null payload"); Json json = injector.getInstance(Json.class); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7aa033a9/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/server/AttachCdromRequestBinderTest.java ---------------------------------------------------------------------- diff --git a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/server/AttachCdromRequestBinderTest.java b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/server/AttachCdromRequestBinderTest.java index e5f26a4..90854e1 100644 --- a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/server/AttachCdromRequestBinderTest.java +++ b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/server/AttachCdromRequestBinderTest.java @@ -48,7 +48,7 @@ public class AttachCdromRequestBinderTest extends BinderTestBase { actual ); - assertEquals(request.getEndpoint().getPath(), "/rest/v2/datacenters/datacenter-id/servers/server-id/cdroms"); + assertEquals(request.getEndpoint().getPath(), "/cloudapi/v3/datacenters/datacenter-id/servers/server-id/cdroms"); assertNotNull(actual, "Binder returned null payload"); Json json = injector.getInstance(Json.class); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7aa033a9/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/server/AttachVolumeRequestBinderTest.java ---------------------------------------------------------------------- diff --git a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/server/AttachVolumeRequestBinderTest.java b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/server/AttachVolumeRequestBinderTest.java index 55ea354..baabfc4 100644 --- a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/server/AttachVolumeRequestBinderTest.java +++ b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/server/AttachVolumeRequestBinderTest.java @@ -48,7 +48,7 @@ public class AttachVolumeRequestBinderTest extends BinderTestBase { actual ); - assertEquals(request.getEndpoint().getPath(), "/rest/v2/datacenters/datacenter-id/servers/server-id/volumes"); + assertEquals(request.getEndpoint().getPath(), "/cloudapi/v3/datacenters/datacenter-id/servers/server-id/volumes"); assertNotNull(actual, "Binder returned null payload"); Json json = injector.getInstance(Json.class); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7aa033a9/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/server/CreateServerRequestBinderTest.java ---------------------------------------------------------------------- diff --git a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/server/CreateServerRequestBinderTest.java b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/server/CreateServerRequestBinderTest.java index 7993416..4346ad1 100644 --- a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/server/CreateServerRequestBinderTest.java +++ b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/server/CreateServerRequestBinderTest.java @@ -48,7 +48,7 @@ public class CreateServerRequestBinderTest extends BinderTestBase { actual ); - assertEquals(request.getEndpoint().getPath(), "/rest/v2/datacenters/datacenter-id/servers"); + assertEquals(request.getEndpoint().getPath(), "/cloudapi/v3/datacenters/datacenter-id/servers"); assertNotNull(actual, "Binder returned null payload"); Json json = injector.getInstance(Json.class); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7aa033a9/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/server/UpdateServerRequestBinderTest.java ---------------------------------------------------------------------- diff --git a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/server/UpdateServerRequestBinderTest.java b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/server/UpdateServerRequestBinderTest.java index 1c61d85..62cea6b 100644 --- a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/server/UpdateServerRequestBinderTest.java +++ b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/server/UpdateServerRequestBinderTest.java @@ -48,7 +48,7 @@ public class UpdateServerRequestBinderTest extends BinderTestBase { actual ); - assertEquals(request.getEndpoint().getPath(), "/rest/v2/datacenters/datacenter-id/servers/server-id"); + assertEquals(request.getEndpoint().getPath(), "/cloudapi/v3/datacenters/datacenter-id/servers/server-id"); assertNotNull(actual, "Binder returned null payload"); Json json = injector.getInstance(Json.class); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7aa033a9/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/volume/CreateSnapshotRequestBinderTest.java ---------------------------------------------------------------------- diff --git a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/volume/CreateSnapshotRequestBinderTest.java b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/volume/CreateSnapshotRequestBinderTest.java index 26c3d9b..a81bf3f 100644 --- a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/volume/CreateSnapshotRequestBinderTest.java +++ b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/volume/CreateSnapshotRequestBinderTest.java @@ -52,7 +52,7 @@ public class CreateSnapshotRequestBinderTest extends BinderTestBase { expectedPayload.put("name", "test-snapshot"); expectedPayload.put("description", "snapshot desc..."); - assertEquals(request.getEndpoint().getPath(), "/rest/v2/datacenters/datacenter-id/volumes/volume-id/create-snapshot"); + assertEquals(request.getEndpoint().getPath(), "/cloudapi/v3/datacenters/datacenter-id/volumes/volume-id/create-snapshot"); assertEquals(request.getPayload().getContentMetadata().getContentType(), MediaType.APPLICATION_FORM_URLENCODED); assertEquals(request.getPayload().getRawContent(), "&" + (new UrlEncodedFormPayload(expectedPayload)).getRawContent()); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7aa033a9/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/volume/CreateVolumeRequestBinderTest.java ---------------------------------------------------------------------- diff --git a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/volume/CreateVolumeRequestBinderTest.java b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/volume/CreateVolumeRequestBinderTest.java index 9371cdc..66bf79f 100644 --- a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/volume/CreateVolumeRequestBinderTest.java +++ b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/volume/CreateVolumeRequestBinderTest.java @@ -51,7 +51,7 @@ public class CreateVolumeRequestBinderTest extends BinderTestBase { actual ); - assertEquals(request.getEndpoint().getPath(), "/rest/v2/datacenters/datacenter-id/volumes"); + assertEquals(request.getEndpoint().getPath(), "/cloudapi/v3/datacenters/datacenter-id/volumes"); assertNotNull(actual, "Binder returned null payload"); Json json = injector.getInstance(Json.class); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7aa033a9/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/volume/RestoreSnapshotRequestBinderTest.java ---------------------------------------------------------------------- diff --git a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/volume/RestoreSnapshotRequestBinderTest.java b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/volume/RestoreSnapshotRequestBinderTest.java index 5952ca9..1462a83 100644 --- a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/volume/RestoreSnapshotRequestBinderTest.java +++ b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/volume/RestoreSnapshotRequestBinderTest.java @@ -42,7 +42,7 @@ public class RestoreSnapshotRequestBinderTest extends BinderTestBase { binder.createPayload(payload) ); - assertEquals(request.getEndpoint().getPath(), "/rest/v2/datacenters/datacenter-id/volumes/volume-id/restore-snapshot"); + assertEquals(request.getEndpoint().getPath(), "/cloudapi/v3/datacenters/datacenter-id/volumes/volume-id/restore-snapshot"); assertEquals(request.getPayload().getContentMetadata().getContentType(), MediaType.APPLICATION_FORM_URLENCODED); assertEquals(request.getPayload().getRawContent(), "&snapshotId=snapshot-id"); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7aa033a9/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/volume/UpdateVolumeRequestBinderTest.java ---------------------------------------------------------------------- diff --git a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/volume/UpdateVolumeRequestBinderTest.java b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/volume/UpdateVolumeRequestBinderTest.java index d047e5e..9ae54f5 100644 --- a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/volume/UpdateVolumeRequestBinderTest.java +++ b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/binder/volume/UpdateVolumeRequestBinderTest.java @@ -48,7 +48,7 @@ public class UpdateVolumeRequestBinderTest extends BinderTestBase { actual ); - assertEquals(request.getEndpoint().getPath(), "/rest/v2/datacenters/datacenter-id/volumes/volume-id"); + assertEquals(request.getEndpoint().getPath(), "/cloudapi/v3/datacenters/datacenter-id/volumes/volume-id"); assertNotNull(actual, "Binder returned null payload"); Json json = injector.getInstance(Json.class); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7aa033a9/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/DataCenterApiLiveTest.java ---------------------------------------------------------------------- diff --git a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/DataCenterApiLiveTest.java b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/DataCenterApiLiveTest.java index 27938dd..eeffde3 100644 --- a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/DataCenterApiLiveTest.java +++ b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/DataCenterApiLiveTest.java @@ -20,9 +20,9 @@ import java.util.List; import org.apache.jclouds.profitbricks.rest.domain.DataCenter; import org.apache.jclouds.profitbricks.rest.domain.options.DepthOptions; import org.apache.jclouds.profitbricks.rest.internal.BaseProfitBricksLiveTest; -import org.testng.annotations.Test; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; +import org.testng.annotations.Test; @Test(groups = "live", testName = "DataCenterApiLiveTest") public class DataCenterApiLiveTest extends BaseProfitBricksLiveTest { http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7aa033a9/profitbricks-rest/src/test/resources/ipblock/get.json ---------------------------------------------------------------------- diff --git a/profitbricks-rest/src/test/resources/ipblock/get.json b/profitbricks-rest/src/test/resources/ipblock/get.json index 3765061..4893b25 100644 --- a/profitbricks-rest/src/test/resources/ipblock/get.json +++ b/profitbricks-rest/src/test/resources/ipblock/get.json @@ -1,7 +1,7 @@ { "id": "6c53515b-8557-44a8-9339-ea34e7e5baa2", "type": "ipblock", - "href": "https://api.profitbricks.com/rest/v2/ipblocks/6c53515b-8557-44a8-9339-ea34e7e5baa2";, + "href": "https://api.profitbricks.com/cloudapi/v3/ipblocks/6c53515b-8557-44a8-9339-ea34e7e5baa2";, "metadata": { "createdDate": "2016-06-18T21:38:20Z", "createdBy": "[email protected]", http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7aa033a9/profitbricks-rest/src/test/resources/ipblock/list.depth-5.json ---------------------------------------------------------------------- diff --git a/profitbricks-rest/src/test/resources/ipblock/list.depth-5.json b/profitbricks-rest/src/test/resources/ipblock/list.depth-5.json index c4cb2b7..70b96f3 100644 --- a/profitbricks-rest/src/test/resources/ipblock/list.depth-5.json +++ b/profitbricks-rest/src/test/resources/ipblock/list.depth-5.json @@ -1,11 +1,11 @@ { "id": "ipblocks", "type": "collection", - "href": "https://api.profitbricks.com/rest/v2/ipblocks";, + "href": "https://api.profitbricks.com/cloudapi/v3/ipblocks";, "items": [{ "id": "6c53515b-8557-44a8-9339-ea34e7e5baa2", "type": "ipblock", - "href": "https://api.profitbricks.com/rest/v2/ipblocks/6c53515b-8557-44a8-9339-ea34e7e5baa2";, + "href": "https://api.profitbricks.com/cloudapi/v3/ipblocks/6c53515b-8557-44a8-9339-ea34e7e5baa2";, "metadata": { "createdDate": "2016-06-18T21:38:20Z", "createdBy": "[email protected]", @@ -23,7 +23,7 @@ }, { "id": "b6f3be55-d7e1-4a62-835a-0c4a64dda433", "type": "ipblock", - "href": "https://api.profitbricks.com/rest/v2/ipblocks/b6f3be55-d7e1-4a62-835a-0c4a64dda433";, + "href": "https://api.profitbricks.com/cloudapi/v3/ipblocks/b6f3be55-d7e1-4a62-835a-0c4a64dda433";, "metadata": { "createdDate": "2016-06-09T21:27:26Z", "createdBy": "[email protected]", http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7aa033a9/profitbricks-rest/src/test/resources/ipblock/list.json ---------------------------------------------------------------------- diff --git a/profitbricks-rest/src/test/resources/ipblock/list.json b/profitbricks-rest/src/test/resources/ipblock/list.json index f1478b1..7c0a71e 100644 --- a/profitbricks-rest/src/test/resources/ipblock/list.json +++ b/profitbricks-rest/src/test/resources/ipblock/list.json @@ -1,14 +1,14 @@ { "id": "ipblocks", "type": "collection", - "href": "https://api.profitbricks.com/rest/v2/ipblocks";, + "href": "https://api.profitbricks.com/cloudapi/v3/ipblocks";, "items": [{ "id": "6c53515b-8557-44a8-9339-ea34e7e5baa2", "type": "ipblock", - "href": "https://api.profitbricks.com/rest/v2/ipblocks/6c53515b-8557-44a8-9339-ea34e7e5baa2"; + "href": "https://api.profitbricks.com/cloudapi/v3/ipblocks/6c53515b-8557-44a8-9339-ea34e7e5baa2"; }, { "id": "b6f3be55-d7e1-4a62-835a-0c4a64dda433", "type": "ipblock", - "href": "https://api.profitbricks.com/rest/v2/ipblocks/b6f3be55-d7e1-4a62-835a-0c4a64dda433"; + "href": "https://api.profitbricks.com/cloudapi/v3/ipblocks/b6f3be55-d7e1-4a62-835a-0c4a64dda433"; }] } \ No newline at end of file
