http://git-wip-us.apache.org/repos/asf/jclouds/blob/ed247e7d/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/loadbalancer/LoadBalancerResponseHandlerTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/loadbalancer/LoadBalancerResponseHandlerTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/loadbalancer/LoadBalancerResponseHandlerTest.java index 365383b..079c5c0 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/loadbalancer/LoadBalancerResponseHandlerTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/loadbalancer/LoadBalancerResponseHandlerTest.java @@ -17,9 +17,9 @@ package org.jclouds.profitbricks.http.parser.loadbalancer; import com.google.common.collect.Lists; + import java.util.List; -import org.jclouds.date.DateCodec; -import org.jclouds.date.DateCodecFactory; + import org.jclouds.http.functions.ParseSax; import org.jclouds.profitbricks.domain.Firewall; import org.jclouds.profitbricks.domain.LoadBalancer; @@ -28,8 +28,12 @@ import org.jclouds.profitbricks.domain.ProvisioningState; import org.jclouds.profitbricks.domain.Server; import org.jclouds.profitbricks.domain.Storage; import org.jclouds.profitbricks.http.parser.BaseResponseHandlerTest; + import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; + +import org.jclouds.date.DateService; +import org.jclouds.profitbricks.domain.DataCenter; import org.testng.annotations.Test; @Test(groups = "unit", testName = "LoadBalancerResponseHandlerTest") @@ -40,8 +44,8 @@ public class LoadBalancerResponseHandlerTest extends BaseResponseHandlerTest<Loa return factory.create(injector.getInstance(LoadBalancerResponseHandler.class)); } - protected DateCodecFactory createDateParser() { - return injector.getInstance(DateCodecFactory.class); + protected DateService createDateParser() { + return injector.getInstance(DateService.class); } @Test @@ -51,13 +55,13 @@ public class LoadBalancerResponseHandlerTest extends BaseResponseHandlerTest<Loa LoadBalancer actual = parser.parse(payloadFromResource("/loadbalancer/loadbalancer.xml")); assertNotNull(actual, "Parsed content returned null"); - DateCodec dateParser = createDateParser().iso8601(); + DateService dateParser = createDateParser(); List<Storage> emptyStorages = Lists.newArrayList(); List<Server> balancedServers = Lists.newArrayList(); balancedServers.add(Server.builder() - .activate(true) + .loadBalanced(true) .balancedNicId("balanced-nic-id") .id("server-id") .name("server-name") @@ -73,16 +77,18 @@ public class LoadBalancerResponseHandlerTest extends BaseResponseHandlerTest<Loa LoadBalancer expected = LoadBalancer.builder() .id("aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee") - .loadBalancerAlgorithm(Algorithm.ROUND_ROBIN) + .algorithm(Algorithm.ROUND_ROBIN) .name("load-balancer-name") - .dataCenterId("datacenter-id") - .dataCenterVersion("datacenter-version") + .dataCenter(DataCenter.builder() + .id("datacenter-id") + .version(4) + .build()) .internetAccess(true) .ip("192.168.0.1") .lanId("lan-id") .state(ProvisioningState.AVAILABLE) - .creationTime(dateParser.toDate("2014-12-12T03:08:35.629Z")) - .lastModificationTime(dateParser.toDate("2014-12-12T03:08:35.629Z")) + .creationTime(dateParser.iso8601DateOrSecondsDateParse("2014-12-12T03:08:35.629Z")) + .lastModificationTime(dateParser.iso8601DateOrSecondsDateParse("2014-12-12T03:08:35.629Z")) .firewalls(firewalls) .balancedServers(balancedServers) .build();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/ed247e7d/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/server/ServerInfoResponseHandlerTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/server/ServerInfoResponseHandlerTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/server/ServerInfoResponseHandlerTest.java index 88124e7..5e629b9 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/server/ServerInfoResponseHandlerTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/server/ServerInfoResponseHandlerTest.java @@ -19,10 +19,10 @@ package org.jclouds.profitbricks.http.parser.server; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; -import org.jclouds.date.DateCodec; -import org.jclouds.date.DateCodecFactory; +import org.jclouds.date.DateService; import org.jclouds.http.functions.ParseSax; import org.jclouds.profitbricks.domain.AvailabilityZone; +import org.jclouds.profitbricks.domain.DataCenter; import org.jclouds.profitbricks.domain.Firewall; import org.jclouds.profitbricks.domain.Nic; import org.jclouds.profitbricks.domain.OsType; @@ -43,8 +43,8 @@ public class ServerInfoResponseHandlerTest extends BaseResponseHandlerTest<Serve return factory.create(injector.getInstance(ServerInfoResponseHandler.class)); } - protected DateCodecFactory createDateParser() { - return injector.getInstance(DateCodecFactory.class); + protected DateService createDateParser() { + return injector.getInstance(DateService.class); } @Test @@ -54,18 +54,22 @@ public class ServerInfoResponseHandlerTest extends BaseResponseHandlerTest<Serve Server actual = parser.parse(payloadFromResource("/server/server.xml")); assertNotNull(actual, "Parsed content returned null"); - DateCodec dateParser = createDateParser().iso8601(); + DateService dateParser = createDateParser(); Server expected = Server.builder() .id("qwertyui-qwer-qwer-qwer-qwertyyuiiop") + .dataCenter(DataCenter.builder() + .id("aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee") + .version(10) + .build()) .name("facebook-node") .cores(4) .ram(4096) .hasInternetAccess(true) .state(ProvisioningState.AVAILABLE) .status(Server.Status.RUNNING) - .creationTime(dateParser.toDate("2014-12-04T07:09:23.138Z")) - .lastModificationTime(dateParser.toDate("2014-12-12T03:08:35.629Z")) + .creationTime(dateParser.iso8601DateOrSecondsDateParse("2014-12-04T07:09:23.138Z")) + .lastModificationTime(dateParser.iso8601DateOrSecondsDateParse("2014-12-12T03:08:35.629Z")) .osType(OsType.LINUX) .availabilityZone(AvailabilityZone.AUTO) .isCpuHotPlug(true) @@ -74,7 +78,7 @@ public class ServerInfoResponseHandlerTest extends BaseResponseHandlerTest<Serve .isNicHotUnPlug(true) .isDiscVirtioHotPlug(true) .isDiscVirtioHotUnPlug(true) - .activate(true) + .loadBalanced(true) .balancedNicId("qswdefrg-qaws-qaws-defe-rgrgdsvcxbrh") .storages(ImmutableList.<Storage>of( Storage.builder() http://git-wip-us.apache.org/repos/asf/jclouds/blob/ed247e7d/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/server/ServerListResponseHandlerTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/server/ServerListResponseHandlerTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/server/ServerListResponseHandlerTest.java index 1442ba9..ea5d46d 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/server/ServerListResponseHandlerTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/server/ServerListResponseHandlerTest.java @@ -20,8 +20,6 @@ import com.google.common.collect.ImmutableList; import java.util.List; -import org.jclouds.date.DateCodec; -import org.jclouds.date.DateCodecFactory; import org.jclouds.http.functions.ParseSax; import org.jclouds.profitbricks.domain.AvailabilityZone; import org.jclouds.profitbricks.domain.OsType; @@ -32,6 +30,8 @@ import org.jclouds.profitbricks.http.parser.BaseResponseHandlerTest; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; +import org.jclouds.date.DateService; +import org.jclouds.profitbricks.domain.DataCenter; import org.jclouds.profitbricks.domain.Firewall; import org.jclouds.profitbricks.domain.Nic; import org.jclouds.profitbricks.domain.Storage; @@ -45,8 +45,8 @@ public class ServerListResponseHandlerTest extends BaseResponseHandlerTest<List< return factory.create(injector.getInstance(ServerListResponseHandler.class)); } - protected DateCodecFactory createDateParser() { - return injector.getInstance(DateCodecFactory.class); + protected DateService createDateParser() { + return injector.getInstance(DateService.class); } @Test @@ -56,10 +56,15 @@ public class ServerListResponseHandlerTest extends BaseResponseHandlerTest<List< List<Server> actual = parser.parse(payloadFromResource("/server/servers.xml")); assertNotNull(actual, "Parsed content returned null"); - DateCodec dateParser = createDateParser().iso8601(); + DateService dateParser = createDateParser(); List<Server> expected = ImmutableList.<Server>of( Server.builder() + .dataCenter(DataCenter.builder() + .id("aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee") + .version(10) + .build() + ) .id("qwertyui-qwer-qwer-qwer-qwertyyuiiop") .name("facebook-node") .cores(4) @@ -67,8 +72,8 @@ public class ServerListResponseHandlerTest extends BaseResponseHandlerTest<List< .hasInternetAccess(true) .state(ProvisioningState.AVAILABLE) .status(Server.Status.RUNNING) - .creationTime(dateParser.toDate("2014-12-04T07:09:23.138Z")) - .lastModificationTime(dateParser.toDate("2014-12-12T03:08:35.629Z")) + .creationTime(dateParser.iso8601DateOrSecondsDateParse("2014-12-04T07:09:23.138Z")) + .lastModificationTime(dateParser.iso8601DateOrSecondsDateParse("2014-12-12T03:08:35.629Z")) .osType(OsType.LINUX) .availabilityZone(AvailabilityZone.AUTO) .isCpuHotPlug(true) @@ -77,7 +82,7 @@ public class ServerListResponseHandlerTest extends BaseResponseHandlerTest<List< .isNicHotUnPlug(true) .isDiscVirtioHotPlug(true) .isDiscVirtioHotUnPlug(true) - .activate(true) + .loadBalanced(true) .balancedNicId("qswdefrg-qaws-qaws-defe-rgrgdsvcxbrh") .storages(ImmutableList.<Storage>of( Storage.builder() @@ -113,6 +118,11 @@ public class ServerListResponseHandlerTest extends BaseResponseHandlerTest<List< ) .build(), Server.builder() + .dataCenter(DataCenter.builder() + .id("qqqqqqqq-wwww-rrrr-tttt-yyyyyyyyyyyy") + .version(238) + .build() + ) .id("asdfghjk-asdf-asdf-asdf-asdfghjklkjl") .name("google-node") .cores(1) @@ -120,8 +130,8 @@ public class ServerListResponseHandlerTest extends BaseResponseHandlerTest<List< .hasInternetAccess(false) .state(ProvisioningState.AVAILABLE) .status(Server.Status.RUNNING) - .creationTime(dateParser.toDate("2014-11-12T07:01:00.441Z")) - .lastModificationTime(dateParser.toDate("2014-11-12T07:01:00.441Z")) + .creationTime(dateParser.iso8601DateOrSecondsDateParse("2014-11-12T07:01:00.441Z")) + .lastModificationTime(dateParser.iso8601DateOrSecondsDateParse("2014-11-12T07:01:00.441Z")) .osType(OsType.LINUX) .availabilityZone(AvailabilityZone.AUTO) .isCpuHotPlug(true) @@ -130,7 +140,7 @@ public class ServerListResponseHandlerTest extends BaseResponseHandlerTest<List< .isNicHotUnPlug(true) .isDiscVirtioHotPlug(true) .isDiscVirtioHotUnPlug(true) - .activate(true) + .loadBalanced(true) .balancedNicId("qswdefrg-qaws-qaws-defe-rgrgdsvcxbrh") .storages(ImmutableList.<Storage>of( Storage.builder() http://git-wip-us.apache.org/repos/asf/jclouds/blob/ed247e7d/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/snapshot/SnapshotListResponseHandlerTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/snapshot/SnapshotListResponseHandlerTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/snapshot/SnapshotListResponseHandlerTest.java index 38dfa1e..f9f93d0 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/snapshot/SnapshotListResponseHandlerTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/snapshot/SnapshotListResponseHandlerTest.java @@ -17,17 +17,20 @@ package org.jclouds.profitbricks.http.parser.snapshot; import com.google.common.collect.Lists; + import java.util.List; -import org.jclouds.date.DateCodec; -import org.jclouds.date.DateCodecFactory; + import org.jclouds.http.functions.ParseSax; import org.jclouds.profitbricks.domain.Location; import org.jclouds.profitbricks.domain.OsType; import org.jclouds.profitbricks.domain.ProvisioningState; import org.jclouds.profitbricks.domain.Snapshot; import org.jclouds.profitbricks.http.parser.BaseResponseHandlerTest; + import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; + +import org.jclouds.date.DateService; import org.testng.annotations.Test; @Test(groups = "unit", testName = "SnapshotListResponseHandlerTest") @@ -38,8 +41,8 @@ public class SnapshotListResponseHandlerTest extends BaseResponseHandlerTest<Lis return factory.create(injector.getInstance(SnapshotListResponseHandler.class)); } - protected DateCodecFactory createDateParser() { - return injector.getInstance(DateCodecFactory.class); + protected DateService createDateParser() { + return injector.getInstance(DateService.class); } @Test @@ -49,51 +52,51 @@ public class SnapshotListResponseHandlerTest extends BaseResponseHandlerTest<Lis List<Snapshot> actual = parser.parse(payloadFromResource("/snapshot/snapshots.xml")); assertNotNull(actual); - DateCodec dateParser = createDateParser().iso8601(); + DateService dateParser = createDateParser(); List<Snapshot> expected = Lists.newArrayList(); expected.add(Snapshot.builder() - .id("aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee") - .description("description") - .size(1024) - .name("snapshot01") - .state(ProvisioningState.AVAILABLE) - .bootable(true) - .osType(OsType.LINUX) - .cpuHotPlug(true) - .cpuHotUnPlug(true) - .discVirtioHotPlug(true) - .discVirtioHotUnPlug(true) - .ramHotPlug(true) - .ramHotUnPlug(true) - .nicHotPlug(true) - .nicHotUnPlug(true) - .location(Location.US_LAS) - .creationTime(dateParser.toDate("2015-01-26T07:09:23.138Z")) - .lastModificationTime(dateParser.toDate("2015-01-26T07:09:23.138Z")) - .build()); + .id("aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee") + .description("description") + .size(1024) + .name("snapshot01") + .state(ProvisioningState.AVAILABLE) + .isBootable(true) + .osType(OsType.LINUX) + .isCpuHotPlug(true) + .isCpuHotUnPlug(true) + .isDiscVirtioHotPlug(true) + .isDiscVirtioHotUnPlug(true) + .isRamHotPlug(true) + .isRamHotUnPlug(true) + .isNicHotPlug(true) + .isNicHotUnPlug(true) + .location(Location.US_LAS) + .creationTime(dateParser.iso8601DateOrSecondsDateParse("2015-01-26T07:09:23.138Z")) + .lastModificationTime(dateParser.iso8601DateOrSecondsDateParse("2015-01-26T07:09:23.138Z")) + .build()); expected.add(Snapshot.builder() - .id("qqqqqqqq-wwww-rrrr-tttt-yyyyyyyyyyyy") - .description("description") - .size(1024) - .name("snapshot02") - .state(ProvisioningState.AVAILABLE) - .bootable(true) - .osType(OsType.LINUX) - .cpuHotPlug(true) - .cpuHotUnPlug(true) - .discVirtioHotPlug(true) - .discVirtioHotUnPlug(true) - .ramHotPlug(true) - .ramHotUnPlug(true) - .nicHotPlug(true) - .nicHotUnPlug(true) - .location(Location.US_LAS) - .creationTime(dateParser.toDate("2015-01-26T07:09:23.138Z")) - .lastModificationTime(dateParser.toDate("2015-01-26T07:09:23.138Z")) - .build()); + .id("qqqqqqqq-wwww-rrrr-tttt-yyyyyyyyyyyy") + .description("description") + .size(1024) + .name("snapshot02") + .state(ProvisioningState.AVAILABLE) + .isBootable(true) + .osType(OsType.LINUX) + .isCpuHotPlug(true) + .isCpuHotUnPlug(true) + .isDiscVirtioHotPlug(true) + .isDiscVirtioHotUnPlug(true) + .isRamHotPlug(true) + .isRamHotUnPlug(true) + .isNicHotPlug(true) + .isNicHotUnPlug(true) + .location(Location.US_LAS) + .creationTime(dateParser.iso8601DateOrSecondsDateParse("2015-01-26T07:09:23.138Z")) + .lastModificationTime(dateParser.iso8601DateOrSecondsDateParse("2015-01-26T07:09:23.138Z")) + .build()); assertEquals(actual, expected); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/ed247e7d/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/snapshot/SnapshotResponseHandlerTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/snapshot/SnapshotResponseHandlerTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/snapshot/SnapshotResponseHandlerTest.java index 9928e92..ced1814 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/snapshot/SnapshotResponseHandlerTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/snapshot/SnapshotResponseHandlerTest.java @@ -16,16 +16,17 @@ */ package org.jclouds.profitbricks.http.parser.snapshot; -import org.jclouds.date.DateCodec; -import org.jclouds.date.DateCodecFactory; import org.jclouds.http.functions.ParseSax; import org.jclouds.profitbricks.domain.Location; import org.jclouds.profitbricks.domain.OsType; import org.jclouds.profitbricks.domain.ProvisioningState; import org.jclouds.profitbricks.domain.Snapshot; import org.jclouds.profitbricks.http.parser.BaseResponseHandlerTest; + import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; + +import org.jclouds.date.DateService; import org.testng.annotations.Test; @Test(groups = "unit", testName = "ServerResponseHandlerTest") @@ -36,8 +37,8 @@ public class SnapshotResponseHandlerTest extends BaseResponseHandlerTest<Snapsho return factory.create(injector.getInstance(SnapshotResponseHandler.class)); } - protected DateCodecFactory createDateParser() { - return injector.getInstance(DateCodecFactory.class); + protected DateService createDateParser() { + return injector.getInstance(DateService.class); } @Test @@ -47,28 +48,28 @@ public class SnapshotResponseHandlerTest extends BaseResponseHandlerTest<Snapsho Snapshot actual = parser.parse(payloadFromResource("/snapshot/snapshot.xml")); assertNotNull(actual, "Parsed content returned null"); - DateCodec dateParser = createDateParser().iso8601(); + DateService dateParser = createDateParser(); Snapshot expected = Snapshot.builder() - .id("qswdefrg-qaws-qaws-defe-rgrgdsvcxbrh") - .description("description") - .size(1024) - .name("snapshot01") - .state(ProvisioningState.AVAILABLE) - .bootable(true) - .osType(OsType.LINUX) - .cpuHotPlug(true) - .cpuHotUnPlug(true) - .discVirtioHotPlug(true) - .discVirtioHotUnPlug(true) - .ramHotPlug(true) - .ramHotUnPlug(true) - .nicHotPlug(true) - .nicHotUnPlug(true) - .location(Location.US_LAS) - .creationTime(dateParser.toDate("2015-01-26T07:09:23.138Z")) - .lastModificationTime(dateParser.toDate("2015-01-26T07:09:23.138Z")) - .build(); + .id("qswdefrg-qaws-qaws-defe-rgrgdsvcxbrh") + .description("description") + .size(1024) + .name("snapshot01") + .state(ProvisioningState.AVAILABLE) + .isBootable(true) + .osType(OsType.LINUX) + .isCpuHotPlug(true) + .isCpuHotUnPlug(true) + .isDiscVirtioHotPlug(true) + .isDiscVirtioHotUnPlug(true) + .isRamHotPlug(true) + .isRamHotUnPlug(true) + .isNicHotPlug(true) + .isNicHotUnPlug(true) + .location(Location.US_LAS) + .creationTime(dateParser.iso8601DateOrSecondsDateParse("2015-01-26T07:09:23.138Z")) + .lastModificationTime(dateParser.iso8601DateOrSecondsDateParse("2015-01-26T07:09:23.138Z")) + .build(); assertEquals(actual, expected); http://git-wip-us.apache.org/repos/asf/jclouds/blob/ed247e7d/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/storage/StorageInfoResponseHandlerTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/storage/StorageInfoResponseHandlerTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/storage/StorageInfoResponseHandlerTest.java index 338b02b..411865f 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/storage/StorageInfoResponseHandlerTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/storage/StorageInfoResponseHandlerTest.java @@ -19,8 +19,7 @@ package org.jclouds.profitbricks.http.parser.storage; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; -import org.jclouds.date.DateCodec; -import org.jclouds.date.DateCodecFactory; +import org.jclouds.date.DateService; import org.jclouds.http.functions.ParseSax; import org.jclouds.profitbricks.domain.ProvisioningState; import org.jclouds.profitbricks.domain.Storage; @@ -37,8 +36,8 @@ public class StorageInfoResponseHandlerTest extends BaseResponseHandlerTest<Stor return factory.create(injector.getInstance(StorageInfoResponseHandler.class)); } - protected DateCodecFactory createDateParser() { - return injector.getInstance(DateCodecFactory.class); + protected DateService createDateParser() { + return injector.getInstance(DateService.class); } @Test @@ -48,7 +47,7 @@ public class StorageInfoResponseHandlerTest extends BaseResponseHandlerTest<Stor Storage actual = parser.parse(payloadFromResource("/storage/storage.xml")); assertNotNull(actual, "Parsed content returned null"); - DateCodec dateParser = createDateParser().iso8601(); + DateService dateParser = createDateParser(); Storage expected = Storage.builder() .id("qswdefrg-qaws-qaws-defe-rgrgdsvcxbrh") @@ -56,8 +55,8 @@ public class StorageInfoResponseHandlerTest extends BaseResponseHandlerTest<Stor .name("hdd-1") .state(ProvisioningState.AVAILABLE) .serverIds(ImmutableList.<String>of("qwertyui-qwer-qwer-qwer-qwertyyuiiop")) - .creationTime(dateParser.toDate("2014-12-04T07:09:23.138Z")) - .lastModificationTime(dateParser.toDate("2014-12-12T03:14:48.316Z")) + .creationTime(dateParser.iso8601DateOrSecondsDateParse("2014-12-04T07:09:23.138Z")) + .lastModificationTime(dateParser.iso8601DateOrSecondsDateParse("2014-12-12T03:14:48.316Z")) .build(); assertEquals(actual, expected); http://git-wip-us.apache.org/repos/asf/jclouds/blob/ed247e7d/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/storage/StorageListResponseHandlerTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/storage/StorageListResponseHandlerTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/storage/StorageListResponseHandlerTest.java index 62e43fc..9ac696d 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/storage/StorageListResponseHandlerTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/storage/StorageListResponseHandlerTest.java @@ -23,8 +23,7 @@ import com.google.common.collect.ImmutableList; import java.util.List; -import org.jclouds.date.DateCodec; -import org.jclouds.date.DateCodecFactory; +import org.jclouds.date.DateService; import org.jclouds.http.functions.ParseSax; import org.jclouds.profitbricks.domain.ProvisioningState; import org.jclouds.profitbricks.domain.Storage; @@ -40,8 +39,8 @@ public class StorageListResponseHandlerTest extends BaseResponseHandlerTest<List return factory.create(injector.getInstance(StorageListResponseHandler.class)); } - protected DateCodecFactory createDateParser() { - return injector.getInstance(DateCodecFactory.class); + protected DateService createDateParser() { + return injector.getInstance(DateService.class); } @Test @@ -51,7 +50,7 @@ public class StorageListResponseHandlerTest extends BaseResponseHandlerTest<List List<Storage> actual = parser.parse(payloadFromResource("/storage/storages.xml")); assertNotNull(actual, "Parsed content returned null"); - DateCodec dateParser = createDateParser().iso8601(); + DateService dateParser = createDateParser(); List<Storage> expected = ImmutableList.<Storage>of( Storage.builder() @@ -60,8 +59,8 @@ public class StorageListResponseHandlerTest extends BaseResponseHandlerTest<List .name("hdd-1") .state(ProvisioningState.AVAILABLE) .serverIds(ImmutableList.<String>of("qwertyui-qwer-qwer-qwer-qwertyyuiiop")) - .creationTime(dateParser.toDate("2014-12-04T07:09:23.138Z")) - .lastModificationTime(dateParser.toDate("2014-12-12T03:14:48.316Z")) + .creationTime(dateParser.iso8601DateOrSecondsDateParse("2014-12-04T07:09:23.138Z")) + .lastModificationTime(dateParser.iso8601DateOrSecondsDateParse("2014-12-12T03:14:48.316Z")) .build(), Storage.builder() .id("asfasfle-f23n-cu89-klfr-njkdsvwllkfa") @@ -69,8 +68,8 @@ public class StorageListResponseHandlerTest extends BaseResponseHandlerTest<List .name("hdd-2") .state(ProvisioningState.INPROCESS) .serverIds(ImmutableList.<String>of("asdfghjk-asdf-asdf-asdf-asdfghjklkjl")) - .creationTime(dateParser.toDate("2014-11-04T07:09:23.138Z")) - .lastModificationTime(dateParser.toDate("2014-11-12T03:14:48.316Z")) + .creationTime(dateParser.iso8601DateOrSecondsDateParse("2014-11-04T07:09:23.138Z")) + .lastModificationTime(dateParser.iso8601DateOrSecondsDateParse("2014-11-12T03:14:48.316Z")) .build() ); http://git-wip-us.apache.org/repos/asf/jclouds/blob/ed247e7d/providers/profitbricks/src/test/java/org/jclouds/profitbricks/util/PasswordsTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/util/PasswordsTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/util/PasswordsTest.java new file mode 100644 index 0000000..fc7be1f --- /dev/null +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/util/PasswordsTest.java @@ -0,0 +1,53 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jclouds.profitbricks.util; + +import com.google.common.collect.ImmutableList; +import java.util.List; +import static org.jclouds.profitbricks.util.Passwords.isValidPassword; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; +import org.testng.annotations.Test; + +@Test(groups = "unit", testName = "PasswordsTest") +public class PasswordsTest { + + private final List<String> validPasswords = ImmutableList.of( + "fKVasTnNm", "84625894", "QQQQQQQQ", "qqqqqqqq", "asdfghjk" + ); + private final List<String> invalidPasswords = ImmutableList.of( + "", "apachejclouds", "s0merand0mpassw0rd" + ); + + @Test + public void testPasswordValidation() { + for (String pwd : validPasswords) + assertTrue(isValidPassword(pwd), "Should've been valid: " + pwd); + + for (String pwd : invalidPasswords) + assertFalse(isValidPassword(pwd), "Should've been invalid: " + pwd); + } + + @Test + public void testGeneratorGeneratesValidPassword() { + final int times = 50; + for (int i = 0; i < times; i++) { + String pwd = Passwords.generate(); + assertTrue(isValidPassword(pwd), "Failed with: " + pwd); + } + } +} http://git-wip-us.apache.org/repos/asf/jclouds/blob/ed247e7d/providers/profitbricks/src/test/resources/datacenter/datacenter-deleted.xml ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/resources/datacenter/datacenter-deleted.xml b/providers/profitbricks/src/test/resources/datacenter/datacenter-deleted.xml index c09858e..531ed53 100644 --- a/providers/profitbricks/src/test/resources/datacenter/datacenter-deleted.xml +++ b/providers/profitbricks/src/test/resources/datacenter/datacenter-deleted.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <S:Envelope xmlns:S="http://schemas.xmlsoap.org/soap/envelope/";> - <S:Body> - <ns2:deleteDataCenterResponse xmlns:ns2="http://ws.api.profitbricks.com/";> - <return> - <requestId>11411363</requestId> - </return> - </ns2:deleteDataCenterResponse> - </S:Body> + <S:Body> + <ns2:deleteDataCenterResponse xmlns:ns2="http://ws.api.profitbricks.com/";> + <return> + <requestId>11411363</requestId> + </return> + </ns2:deleteDataCenterResponse> + </S:Body> </S:Envelope> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds/blob/ed247e7d/providers/profitbricks/src/test/resources/datacenter/datacenter-not-found.xml ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/resources/datacenter/datacenter-not-found.xml b/providers/profitbricks/src/test/resources/datacenter/datacenter-not-found.xml index 486706d..e4a9701 100644 --- a/providers/profitbricks/src/test/resources/datacenter/datacenter-not-found.xml +++ b/providers/profitbricks/src/test/resources/datacenter/datacenter-not-found.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <S:Envelope xmlns:S="http://schemas.xmlsoap.org/soap/envelope/";> - <S:Body> - <S:Fault xmlns:ns4="http://www.w3.org/2003/05/soap-envelope";> - <faultcode>S:Server</faultcode> - <faultstring>The requested resource could not be found. Please refer to Request Id : 11122416. [VDC-6-404] The requested data center does not exist or already deleted by the users. ResourceId random-non-existing-id</faultstring> - <detail> - <ns2:ProfitbricksServiceFault xmlns:ns2="http://ws.api.profitbricks.com/";> - <faultCode>RESOURCE_NOT_FOUND</faultCode> - <httpCode>404</httpCode> - <message>The requested resource could not be found. Please refer to Request Id : 11122416. [VDC-6-404] The requested data center does not exist or already deleted by the users. ResourceId random-non-existing-id</message> - <requestId>11122416</requestId> - </ns2:ProfitbricksServiceFault> - </detail> - </S:Fault> - </S:Body> + <S:Body> + <S:Fault xmlns:ns4="http://www.w3.org/2003/05/soap-envelope";> + <faultcode>S:Server</faultcode> + <faultstring>The requested resource could not be found. Please refer to Request Id : 11122416. [VDC-6-404] The requested data center does not exist or already deleted by the users. ResourceId random-non-existing-id</faultstring> + <detail> + <ns2:ProfitbricksServiceFault xmlns:ns2="http://ws.api.profitbricks.com/";> + <faultCode>RESOURCE_NOT_FOUND</faultCode> + <httpCode>404</httpCode> + <message>The requested resource could not be found. Please refer to Request Id : 11122416. [VDC-6-404] The requested data center does not exist or already deleted by the users. ResourceId random-non-existing-id</message> + <requestId>11122416</requestId> + </ns2:ProfitbricksServiceFault> + </detail> + </S:Fault> + </S:Body> </S:Envelope> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds/blob/ed247e7d/providers/profitbricks/src/test/resources/datacenter/datacenter-state-inprocess.xml ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/resources/datacenter/datacenter-state-inprocess.xml b/providers/profitbricks/src/test/resources/datacenter/datacenter-state-inprocess.xml index 77d41e3..722c653 100644 --- a/providers/profitbricks/src/test/resources/datacenter/datacenter-state-inprocess.xml +++ b/providers/profitbricks/src/test/resources/datacenter/datacenter-state-inprocess.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <S:Envelope xmlns:S="http://schemas.xmlsoap.org/soap/envelope/";> - <S:Body> - <ns2:getDataCenterStateResponse xmlns:ns2="http://ws.api.profitbricks.com/";> - <return>INPROCESS</return> - </ns2:getDataCenterStateResponse> - </S:Body> + <S:Body> + <ns2:getDataCenterStateResponse xmlns:ns2="http://ws.api.profitbricks.com/";> + <return>INPROCESS</return> + </ns2:getDataCenterStateResponse> + </S:Body> </S:Envelope> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds/blob/ed247e7d/providers/profitbricks/src/test/resources/datacenter/datacenter-state.xml ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/resources/datacenter/datacenter-state.xml b/providers/profitbricks/src/test/resources/datacenter/datacenter-state.xml index 8bd56e2..3327c82 100644 --- a/providers/profitbricks/src/test/resources/datacenter/datacenter-state.xml +++ b/providers/profitbricks/src/test/resources/datacenter/datacenter-state.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <S:Envelope xmlns:S="http://schemas.xmlsoap.org/soap/envelope/";> - <S:Body> - <ns2:getDataCenterStateResponse xmlns:ns2="http://ws.api.profitbricks.com/";> - <return>AVAILABLE</return> - </ns2:getDataCenterStateResponse> - </S:Body> + <S:Body> + <ns2:getDataCenterStateResponse xmlns:ns2="http://ws.api.profitbricks.com/";> + <return>AVAILABLE</return> + </ns2:getDataCenterStateResponse> + </S:Body> </S:Envelope> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds/blob/ed247e7d/providers/profitbricks/src/test/resources/drives/drives-add.xml ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/resources/drives/drives-add.xml b/providers/profitbricks/src/test/resources/drives/drives-add.xml index 752f8f3..52a04f5 100644 --- a/providers/profitbricks/src/test/resources/drives/drives-add.xml +++ b/providers/profitbricks/src/test/resources/drives/drives-add.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <S:Envelope xmlns:S="http://schemas.xmlsoap.org/soap/envelope/";> - <S:Body> - <ns2:addRomDriveToServerResponse xmlns:ns2="http://ws.api.profitbricks.com/";> - <return> - <requestId>request-id</requestId> - <dataCenterId>datacenter-id</dataCenterId> - <dataCenterVersion>datacenter-version</dataCenterVersion> - </return> - </ns2:addRomDriveToServerResponse> - </S:Body> + <S:Body> + <ns2:addRomDriveToServerResponse xmlns:ns2="http://ws.api.profitbricks.com/";> + <return> + <requestId>request-id</requestId> + <dataCenterId>datacenter-id</dataCenterId> + <dataCenterVersion>datacenter-version</dataCenterVersion> + </return> + </ns2:addRomDriveToServerResponse> + </S:Body> </S:Envelope> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds/blob/ed247e7d/providers/profitbricks/src/test/resources/drives/drives-remove.xml ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/resources/drives/drives-remove.xml b/providers/profitbricks/src/test/resources/drives/drives-remove.xml index ccfd400..699b359 100644 --- a/providers/profitbricks/src/test/resources/drives/drives-remove.xml +++ b/providers/profitbricks/src/test/resources/drives/drives-remove.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <S:Envelope xmlns:S="http://schemas.xmlsoap.org/soap/envelope/";> - <S:Body> - <ns2:removeRomDriveFromServerResponse xmlns:ns2="http://ws.api.profitbricks.com/";> - <return> - <requestId>request-id</requestId> - <dataCenterId>datacenter-id</dataCenterId> - <dataCenterVersion>datacenter-version</dataCenterVersion> - </return> - </ns2:removeRomDriveFromServerResponse> - </S:Body> + <S:Body> + <ns2:removeRomDriveFromServerResponse xmlns:ns2="http://ws.api.profitbricks.com/";> + <return> + <requestId>request-id</requestId> + <dataCenterId>datacenter-id</dataCenterId> + <dataCenterVersion>datacenter-version</dataCenterVersion> + </return> + </ns2:removeRomDriveFromServerResponse> + </S:Body> </S:Envelope> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds/blob/ed247e7d/providers/profitbricks/src/test/resources/firewall/firewall-activate.xml ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/resources/firewall/firewall-activate.xml b/providers/profitbricks/src/test/resources/firewall/firewall-activate.xml index 2150c6b..16e32b9 100644 --- a/providers/profitbricks/src/test/resources/firewall/firewall-activate.xml +++ b/providers/profitbricks/src/test/resources/firewall/firewall-activate.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <S:Envelope xmlns:S="http://schemas.xmlsoap.org/soap/envelope/";> - <S:Body> - <ns2:activateFirewallsResponse xmlns:ns2="http://ws.api.profitbricks.com/";> - <return> - <requestId>request-id</requestId> - <dataCenterId>datacenter-id</dataCenterId> - <dataCenterVersion>datacenter-version</dataCenterVersion> - </return> - </ns2:activateFirewallsResponse> - </S:Body> + <S:Body> + <ns2:activateFirewallsResponse xmlns:ns2="http://ws.api.profitbricks.com/";> + <return> + <requestId>request-id</requestId> + <dataCenterId>datacenter-id</dataCenterId> + <dataCenterVersion>datacenter-version</dataCenterVersion> + </return> + </ns2:activateFirewallsResponse> + </S:Body> </S:Envelope> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds/blob/ed247e7d/providers/profitbricks/src/test/resources/firewall/firewall-addtonic.xml ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/resources/firewall/firewall-addtonic.xml b/providers/profitbricks/src/test/resources/firewall/firewall-addtonic.xml index 1267040..740c042 100644 --- a/providers/profitbricks/src/test/resources/firewall/firewall-addtonic.xml +++ b/providers/profitbricks/src/test/resources/firewall/firewall-addtonic.xml @@ -1,23 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> <S:Envelope xmlns:S="http://schemas.xmlsoap.org/soap/envelope/";> - <S:Body> - <ns2:addFirewallRulesToNicResponse xmlns:ns2="http://ws.api.profitbricks.com/";> - <return> - <active>active</active> - <firewallId>firewall-id</firewallId> - <firewallRules> - <firewallRuleId>firewall-rule-id</firewallRuleId> - <name>name</name> - <portRangeEnd>45678</portRangeEnd> - <portRangeStart>12345</portRangeStart> - <protocol>TCP</protocol> - <sourceIp>192.168.0.1</sourceIp> - <sourceMac>aa:bb:cc:dd:ee:ff</sourceMac> - <targetIp>192.168.0.2</targetIp> - </firewallRules> - <nicId>nic-id</nicId> - <provisioningState>AVAILABLE</provisioningState> - </return> - </ns2:addFirewallRulesToNicResponse> - </S:Body> + <S:Body> + <ns2:addFirewallRulesToNicResponse xmlns:ns2="http://ws.api.profitbricks.com/";> + <return> + <active>active</active> + <firewallId>firewall-id</firewallId> + <firewallRules> + <firewallRuleId>firewall-rule-id</firewallRuleId> + <name>name</name> + <portRangeEnd>45678</portRangeEnd> + <portRangeStart>12345</portRangeStart> + <protocol>TCP</protocol> + <sourceIp>192.168.0.1</sourceIp> + <sourceMac>aa:bb:cc:dd:ee:ff</sourceMac> + <targetIp>192.168.0.2</targetIp> + </firewallRules> + <nicId>nic-id</nicId> + <provisioningState>AVAILABLE</provisioningState> + </return> + </ns2:addFirewallRulesToNicResponse> + </S:Body> </S:Envelope> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds/blob/ed247e7d/providers/profitbricks/src/test/resources/firewall/firewall-deactivate.xml ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/resources/firewall/firewall-deactivate.xml b/providers/profitbricks/src/test/resources/firewall/firewall-deactivate.xml index a0bca25..0adaabd 100644 --- a/providers/profitbricks/src/test/resources/firewall/firewall-deactivate.xml +++ b/providers/profitbricks/src/test/resources/firewall/firewall-deactivate.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <S:Envelope xmlns:S="http://schemas.xmlsoap.org/soap/envelope/";> - <S:Body> - <ns2:deactivateFirewallsResponse xmlns:ns2="http://ws.api.profitbricks.com/";> - <return> - <requestId>request-id1111</requestId> - <dataCenterId>datacenter-id</dataCenterId> - <dataCenterVersion>datacenter-version</dataCenterVersion> - </return> - </ns2:deactivateFirewallsResponse> - </S:Body> + <S:Body> + <ns2:deactivateFirewallsResponse xmlns:ns2="http://ws.api.profitbricks.com/";> + <return> + <requestId>request-id1111</requestId> + <dataCenterId>datacenter-id</dataCenterId> + <dataCenterVersion>datacenter-version</dataCenterVersion> + </return> + </ns2:deactivateFirewallsResponse> + </S:Body> </S:Envelope> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds/blob/ed247e7d/providers/profitbricks/src/test/resources/firewall/firewall-delete.xml ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/resources/firewall/firewall-delete.xml b/providers/profitbricks/src/test/resources/firewall/firewall-delete.xml index 2c7364f..26371a9 100644 --- a/providers/profitbricks/src/test/resources/firewall/firewall-delete.xml +++ b/providers/profitbricks/src/test/resources/firewall/firewall-delete.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <S:Envelope xmlns:S="http://schemas.xmlsoap.org/soap/envelope/";> - <S:Body> - <ns2:deleteFirewallsResponse xmlns:ns2="http://ws.api.profitbricks.com/";> - <return> - <requestId>request-id</requestId> - <dataCenterId>datacenter-id</dataCenterId> - <dataCenterVersion>datacenter-version</dataCenterVersion> - </return> - </ns2:deleteFirewallsResponse> - </S:Body> + <S:Body> + <ns2:deleteFirewallsResponse xmlns:ns2="http://ws.api.profitbricks.com/";> + <return> + <requestId>request-id</requestId> + <dataCenterId>datacenter-id</dataCenterId> + <dataCenterVersion>datacenter-version</dataCenterVersion> + </return> + </ns2:deleteFirewallsResponse> + </S:Body> </S:Envelope> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds/blob/ed247e7d/providers/profitbricks/src/test/resources/firewall/firewall-remove.xml ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/resources/firewall/firewall-remove.xml b/providers/profitbricks/src/test/resources/firewall/firewall-remove.xml index 793bdd0..6301e6a 100644 --- a/providers/profitbricks/src/test/resources/firewall/firewall-remove.xml +++ b/providers/profitbricks/src/test/resources/firewall/firewall-remove.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <S:Envelope xmlns:S="http://schemas.xmlsoap.org/soap/envelope/";> - <S:Body> - <ns2:removeFirewallRulesResponse xmlns:ns2="http://ws.api.profitbricks.com/";> - <return> - <requestId>request-id</requestId> - <dataCenterId>datacenter-id</dataCenterId> - <dataCenterVersion>datacenter-version</dataCenterVersion> - </return> - </ns2:removeFirewallRulesResponse> - </S:Body> + <S:Body> + <ns2:removeFirewallRulesResponse xmlns:ns2="http://ws.api.profitbricks.com/";> + <return> + <requestId>request-id</requestId> + <dataCenterId>datacenter-id</dataCenterId> + <dataCenterVersion>datacenter-version</dataCenterVersion> + </return> + </ns2:removeFirewallRulesResponse> + </S:Body> </S:Envelope> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds/blob/ed247e7d/providers/profitbricks/src/test/resources/firewall/firewall.xml ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/resources/firewall/firewall.xml b/providers/profitbricks/src/test/resources/firewall/firewall.xml index 3275a70..839502c 100644 --- a/providers/profitbricks/src/test/resources/firewall/firewall.xml +++ b/providers/profitbricks/src/test/resources/firewall/firewall.xml @@ -1,23 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> <S:Envelope xmlns:S="http://schemas.xmlsoap.org/soap/envelope/";> - <S:Body> - <ns2:getFirewallResponse xmlns:ns2="http://ws.api.profitbricks.com/";> - <return> - <active>true</active> - <firewallId>firewall-id</firewallId> - <firewallRules> - <firewallRuleId>firewall-rule-id</firewallRuleId> - <name>name</name> - <portRangeEnd>45678</portRangeEnd> - <portRangeStart>12345</portRangeStart> - <protocol>TCP</protocol> - <sourceIp>192.168.0.1</sourceIp> - <sourceMac>aa:bb:cc:dd:ee:ff</sourceMac> - <targetIp>192.168.0.2</targetIp> - </firewallRules> - <nicId>nic-id</nicId> - <provisioningState>AVAILABLE</provisioningState> - </return> - </ns2:getFirewallResponse> - </S:Body> + <S:Body> + <ns2:getFirewallResponse xmlns:ns2="http://ws.api.profitbricks.com/";> + <return> + <active>true</active> + <firewallId>firewall-id</firewallId> + <firewallRules> + <firewallRuleId>firewall-rule-id</firewallRuleId> + <name>name</name> + <portRangeEnd>45678</portRangeEnd> + <portRangeStart>12345</portRangeStart> + <protocol>TCP</protocol> + <sourceIp>192.168.0.1</sourceIp> + <sourceMac>aa:bb:cc:dd:ee:ff</sourceMac> + <targetIp>192.168.0.2</targetIp> + </firewallRules> + <nicId>nic-id</nicId> + <provisioningState>AVAILABLE</provisioningState> + </return> + </ns2:getFirewallResponse> + </S:Body> </S:Envelope> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds/blob/ed247e7d/providers/profitbricks/src/test/resources/ipblock/ipblock-addtonic.xml ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/resources/ipblock/ipblock-addtonic.xml b/providers/profitbricks/src/test/resources/ipblock/ipblock-addtonic.xml index a9c1974..8496660 100644 --- a/providers/profitbricks/src/test/resources/ipblock/ipblock-addtonic.xml +++ b/providers/profitbricks/src/test/resources/ipblock/ipblock-addtonic.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <S:Envelope xmlns:S="http://schemas.xmlsoap.org/soap/envelope/";> - <S:Body> - <ns2:addPublicIpToNicResponse xmlns:ns2="http://ws.api.profitbricks.com/";> - <return> - <requestId>request-id</requestId> - <dataCenterId>datacenter-id</dataCenterId> - <dataCenterVersion>datacenter-version</dataCenterVersion> - </return> - </ns2:addPublicIpToNicResponse> - </S:Body> + <S:Body> + <ns2:addPublicIpToNicResponse xmlns:ns2="http://ws.api.profitbricks.com/";> + <return> + <requestId>request-id</requestId> + <dataCenterId>datacenter-id</dataCenterId> + <dataCenterVersion>datacenter-version</dataCenterVersion> + </return> + </ns2:addPublicIpToNicResponse> + </S:Body> </S:Envelope> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds/blob/ed247e7d/providers/profitbricks/src/test/resources/ipblock/ipblock-release.xml ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/resources/ipblock/ipblock-release.xml b/providers/profitbricks/src/test/resources/ipblock/ipblock-release.xml index a9f22bf..d10e675 100644 --- a/providers/profitbricks/src/test/resources/ipblock/ipblock-release.xml +++ b/providers/profitbricks/src/test/resources/ipblock/ipblock-release.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <S:Envelope xmlns:S="http://schemas.xmlsoap.org/soap/envelope/";> - <S:Body> - <ns2:releasePublicIpBlockResponse xmlns:ns2="http://ws.api.profitbricks.com/";> - <return> - <requestId>request-id</requestId> - </return> - </ns2:releasePublicIpBlockResponse> - </S:Body> + <S:Body> + <ns2:releasePublicIpBlockResponse xmlns:ns2="http://ws.api.profitbricks.com/";> + <return> + <requestId>request-id</requestId> + </return> + </ns2:releasePublicIpBlockResponse> + </S:Body> </S:Envelope> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds/blob/ed247e7d/providers/profitbricks/src/test/resources/ipblock/ipblock-removefromnic.xml ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/resources/ipblock/ipblock-removefromnic.xml b/providers/profitbricks/src/test/resources/ipblock/ipblock-removefromnic.xml index a9c1974..8496660 100644 --- a/providers/profitbricks/src/test/resources/ipblock/ipblock-removefromnic.xml +++ b/providers/profitbricks/src/test/resources/ipblock/ipblock-removefromnic.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <S:Envelope xmlns:S="http://schemas.xmlsoap.org/soap/envelope/";> - <S:Body> - <ns2:addPublicIpToNicResponse xmlns:ns2="http://ws.api.profitbricks.com/";> - <return> - <requestId>request-id</requestId> - <dataCenterId>datacenter-id</dataCenterId> - <dataCenterVersion>datacenter-version</dataCenterVersion> - </return> - </ns2:addPublicIpToNicResponse> - </S:Body> + <S:Body> + <ns2:addPublicIpToNicResponse xmlns:ns2="http://ws.api.profitbricks.com/";> + <return> + <requestId>request-id</requestId> + <dataCenterId>datacenter-id</dataCenterId> + <dataCenterVersion>datacenter-version</dataCenterVersion> + </return> + </ns2:addPublicIpToNicResponse> + </S:Body> </S:Envelope> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds/blob/ed247e7d/providers/profitbricks/src/test/resources/ipblock/ipblock-reserve.xml ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/resources/ipblock/ipblock-reserve.xml b/providers/profitbricks/src/test/resources/ipblock/ipblock-reserve.xml index 863e9ff..8586aaf 100644 --- a/providers/profitbricks/src/test/resources/ipblock/ipblock-reserve.xml +++ b/providers/profitbricks/src/test/resources/ipblock/ipblock-reserve.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <S:Envelope xmlns:S="http://schemas.xmlsoap.org/soap/envelope/";> - <S:Body> - <ns2:reservePublicIpBlockResponse xmlns:ns2="http://ws.api.profitbricks.com/";> - <return> - <requestId>request-id</requestId> - <blockId>block-id</blockId> - <location>us/las</location> - <ips>ip</ips> - </return> - </ns2:reservePublicIpBlockResponse> - </S:Body> + <S:Body> + <ns2:reservePublicIpBlockResponse xmlns:ns2="http://ws.api.profitbricks.com/";> + <return> + <requestId>request-id</requestId> + <blockId>block-id</blockId> + <location>us/las</location> + <ips>ip</ips> + </return> + </ns2:reservePublicIpBlockResponse> + </S:Body> </S:Envelope> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds/blob/ed247e7d/providers/profitbricks/src/test/resources/ipblock/ipblock.xml ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/resources/ipblock/ipblock.xml b/providers/profitbricks/src/test/resources/ipblock/ipblock.xml index 2dd54f2..339fdfb 100644 --- a/providers/profitbricks/src/test/resources/ipblock/ipblock.xml +++ b/providers/profitbricks/src/test/resources/ipblock/ipblock.xml @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <S:Envelope xmlns:S="http://schemas.xmlsoap.org/soap/envelope/";> - <S:Body> - <ns2:getAllPublicIpBlocksResponse xmlns:ns2="http://ws.api.profitbricks.com/";> - <return> - <blockId>qwertyui-qwer-qwer-qwer-qwertyyuiiop</blockId> - <location>us/las</location> - <publicIps> - <ip>ip</ip> - <nicId>nic-id</nicId> - </publicIps> - <publicIps> - <ip>ip</ip> - </publicIps> - </return> - </ns2:getAllPublicIpBlocksResponse> - </S:Body> + <S:Body> + <ns2:getAllPublicIpBlocksResponse xmlns:ns2="http://ws.api.profitbricks.com/";> + <return> + <blockId>qwertyui-qwer-qwer-qwer-qwertyyuiiop</blockId> + <location>us/las</location> + <publicIps> + <ip>ip</ip> + <nicId>nic-id</nicId> + </publicIps> + <publicIps> + <ip>ip</ip> + </publicIps> + </return> + </ns2:getAllPublicIpBlocksResponse> + </S:Body> </S:Envelope> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds/blob/ed247e7d/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer-create.xml ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer-create.xml b/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer-create.xml index 14ad678..33eb41b 100644 --- a/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer-create.xml +++ b/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer-create.xml @@ -1,6 +1,6 @@ <soapenv:Envelope - xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' - xmlns:ws='http://ws.api.profitbricks.com/'> + xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' + xmlns:ws='http://ws.api.profitbricks.com/'> <soapenv:Header /> <soapenv:Body> <ws:createLoadBalancer> http://git-wip-us.apache.org/repos/asf/jclouds/blob/ed247e7d/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer-delete.xml ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer-delete.xml b/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer-delete.xml index b699be6..8396174 100644 --- a/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer-delete.xml +++ b/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer-delete.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <S:Envelope xmlns:S="http://schemas.xmlsoap.org/soap/envelope/";> - <S:Body> - <ns2:deleteLoadBalancerResponse xmlns:ns2="http://ws.api.profitbricks.com/";> - <return> - <requestId>request-id</requestId> - <dataCenterId>datacenter-id</dataCenterId> - <dataCenterVersion>datacenter-version</dataCenterVersion> - </return> - </ns2:deleteLoadBalancerResponse> - </S:Body> + <S:Body> + <ns2:deleteLoadBalancerResponse xmlns:ns2="http://ws.api.profitbricks.com/";> + <return> + <requestId>request-id</requestId> + <dataCenterId>datacenter-id</dataCenterId> + <dataCenterVersion>datacenter-version</dataCenterVersion> + </return> + </ns2:deleteLoadBalancerResponse> + </S:Body> </S:Envelope> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds/blob/ed247e7d/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer-deregister.xml ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer-deregister.xml b/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer-deregister.xml index ee03c47..86ef94c 100644 --- a/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer-deregister.xml +++ b/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer-deregister.xml @@ -1,14 +1,14 @@ <soapenv:Envelope - xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' - xmlns:ws='http://ws.api.profitbricks.com/'> + xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' + xmlns:ws='http://ws.api.profitbricks.com/'> <soapenv:Header /> <soapenv:Body> <ws:deregisterServersOnLoadBalancer> - <request> + <request> <serverIds>1</serverIds> <serverIds>2</serverIds> <loadBalancerId>load-balancer-id</loadBalancerId> - <request> + <request> </ws:deregisterServersOnLoadBalancer> </soapenv:Body> </soapenv:Envelope> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds/blob/ed247e7d/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer-register.xml ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer-register.xml b/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer-register.xml index 48a1ff1..a32c65a 100644 --- a/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer-register.xml +++ b/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer-register.xml @@ -1,13 +1,13 @@ <soapenv:Envelope - xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' - xmlns:ws='http://ws.api.profitbricks.com/'> + xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' + xmlns:ws='http://ws.api.profitbricks.com/'> <soapenv:Header/> <soapenv:Body> <ws:registerServersOnLoadBalancer> - <request> + <request> <serverIds>1234</serverIds> <loadBalancerId>load-balancer-id</loadBalancerId> - </request> + </request> </ws:registerServersOnLoadBalancer> </soapenv:Body> </soapenv:Envelope> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds/blob/ed247e7d/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer-update.xml ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer-update.xml b/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer-update.xml index 7a39dea..87c1f02 100644 --- a/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer-update.xml +++ b/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer-update.xml @@ -1,6 +1,6 @@ <soapenv:Envelope - xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' - xmlns:ws='http://ws.api.profitbricks.com/'> + xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' + xmlns:ws='http://ws.api.profitbricks.com/'> <soapenv:Header /> <soapenv:Body> <ws:updateLoadBalancer> http://git-wip-us.apache.org/repos/asf/jclouds/blob/ed247e7d/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer.xml ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer.xml b/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer.xml index 501e470..302c10e 100644 --- a/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer.xml +++ b/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer.xml @@ -4,7 +4,7 @@ <ns2:getLoadBalancerResponse xmlns:ns2="http://ws.api.profitbricks.com/";> <return> <dataCenterId>datacenter-id</dataCenterId> - <dataCenterVersion>datacenter-version</dataCenterVersion> + <dataCenterVersion>4</dataCenterVersion> <loadBalancerId>aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee</loadBalancerId> <loadBalancerName>load-balancer-name</loadBalancerName> <loadBalancerAlgorithm>ROUND_ROBIN</loadBalancerAlgorithm> http://git-wip-us.apache.org/repos/asf/jclouds/blob/ed247e7d/providers/profitbricks/src/test/resources/loadbalancer/loadbalancers.xml ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/resources/loadbalancer/loadbalancers.xml b/providers/profitbricks/src/test/resources/loadbalancer/loadbalancers.xml index 155a1e3..54d1949 100644 --- a/providers/profitbricks/src/test/resources/loadbalancer/loadbalancers.xml +++ b/providers/profitbricks/src/test/resources/loadbalancer/loadbalancers.xml @@ -4,7 +4,7 @@ <ns2:getAllLoadBalancersResponse xmlns:ns2="http://ws.api.profitbricks.com/";> <return> <dataCenterId>datacenter-id</dataCenterId> - <dataCenterVersion>datacenter-version</dataCenterVersion> + <dataCenterVersion>4</dataCenterVersion> <loadBalancerId>aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee</loadBalancerId> <loadBalancerName>load-1234567890-name</loadBalancerName> <loadBalancerAlgorithm>ROUND_ROBIN</loadBalancerAlgorithm> @@ -29,7 +29,7 @@ </return> <return> <dataCenterId>datacenter-id</dataCenterId> - <dataCenterVersion>datacenter-version</dataCenterVersion> + <dataCenterVersion>4</dataCenterVersion> <loadBalancerId>qqqqqqqq-wwww-rrrr-tttt-yyyyyyyyyyyy</loadBalancerId> <loadBalancerName>load-balancer-name</loadBalancerName> <loadBalancerAlgorithm>ROUND_ROBIN</loadBalancerAlgorithm> http://git-wip-us.apache.org/repos/asf/jclouds/blob/ed247e7d/providers/profitbricks/src/test/resources/server/server.xml ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/resources/server/server.xml b/providers/profitbricks/src/test/resources/server/server.xml index 33fa824..c78721f 100644 --- a/providers/profitbricks/src/test/resources/server/server.xml +++ b/providers/profitbricks/src/test/resources/server/server.xml @@ -12,8 +12,8 @@ <ram>4096</ram> <internetAccess>true</internetAccess> <ips>173.252.120.6</ips> - <balancedNicId>qswdefrg-qaws-qaws-defe-rgrgdsvcxbrh</balancedNicId> - <activate>true</activate> + <balancedNicId>qswdefrg-qaws-qaws-defe-rgrgdsvcxbrh</balancedNicId> + <activate>true</activate> <connectedStorages> <bootDevice>true</bootDevice> <busType>VIRTIO</busType> http://git-wip-us.apache.org/repos/asf/jclouds/blob/ed247e7d/providers/profitbricks/src/test/resources/snapshot/snapshots.xml ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/resources/snapshot/snapshots.xml b/providers/profitbricks/src/test/resources/snapshot/snapshots.xml index d59826a..1b3ab72 100644 --- a/providers/profitbricks/src/test/resources/snapshot/snapshots.xml +++ b/providers/profitbricks/src/test/resources/snapshot/snapshots.xml @@ -3,25 +3,25 @@ <S:Body> <ns2:getAllSnapshotsResponse xmlns:ns2="http://ws.api.profitbricks.com/";> <return> - <snapshotId>aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee</snapshotId> - <description>description</description> - <snapshotSize>1024</snapshotSize> - <snapshotName>snapshot01</snapshotName> - <provisioningState>AVAILABLE</provisioningState> - <bootable>true</bootable> - <osType>LINUX</osType> - <cpuHotPlug>true</cpuHotPlug> - <cpuHotUnPlug>true</cpuHotUnPlug> - <discVirtioHotPlug>true</discVirtioHotPlug> - <discVirtioHotUnPlug>true</discVirtioHotUnPlug> - <ramHotPlug>true</ramHotPlug> - <ramHotUnPlug>true</ramHotUnPlug> - <nicHotPlug>true</nicHotPlug> - <nicHotUnPlug>true</nicHotUnPlug> - <creationTimestamp>2015-01-26T07:09:23.138Z</creationTimestamp> - <modificationTimestamp>2015-01-26T07:09:23.138Z</modificationTimestamp> - <location>us/las</location> - </return> + <snapshotId>aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee</snapshotId> + <description>description</description> + <snapshotSize>1024</snapshotSize> + <snapshotName>snapshot01</snapshotName> + <provisioningState>AVAILABLE</provisioningState> + <bootable>true</bootable> + <osType>LINUX</osType> + <cpuHotPlug>true</cpuHotPlug> + <cpuHotUnPlug>true</cpuHotUnPlug> + <discVirtioHotPlug>true</discVirtioHotPlug> + <discVirtioHotUnPlug>true</discVirtioHotUnPlug> + <ramHotPlug>true</ramHotPlug> + <ramHotUnPlug>true</ramHotUnPlug> + <nicHotPlug>true</nicHotPlug> + <nicHotUnPlug>true</nicHotUnPlug> + <creationTimestamp>2015-01-26T07:09:23.138Z</creationTimestamp> + <modificationTimestamp>2015-01-26T07:09:23.138Z</modificationTimestamp> + <location>us/las</location> + </return> <return> <snapshotId>qqqqqqqq-wwww-rrrr-tttt-yyyyyyyyyyyy</snapshotId> <description>description</description>
