You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by de...@apache.org on 2016/02/22 13:20:15 UTC

[02/11] jclouds-labs git commit: Remove ProfitBricks

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/93aff921/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/nic/NicResponseHandlerTest.java
----------------------------------------------------------------------
diff --git a/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/nic/NicResponseHandlerTest.java b/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/nic/NicResponseHandlerTest.java
deleted file mode 100644
index 3797ca0..0000000
--- a/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/nic/NicResponseHandlerTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * 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.http.parser.nic;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-
-import com.google.common.collect.ImmutableList;
-
-import org.jclouds.http.functions.ParseSax;
-import org.jclouds.profitbricks.domain.Firewall;
-import org.jclouds.profitbricks.domain.Nic;
-import org.jclouds.profitbricks.domain.ProvisioningState;
-import org.jclouds.profitbricks.http.parser.BaseResponseHandlerTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "NicResponseHandlerTest")
-public class NicResponseHandlerTest extends BaseResponseHandlerTest<Nic> {
-
-   @Override
-   protected ParseSax<Nic> createParser() {
-      return factory.create(injector.getInstance(NicResponseHandler.class));
-   }
-
-   @Test
-   public void testParseResponseFromGetNic() {
-      ParseSax<Nic> parser = createParser();
-      Nic actual = parser.parse(payloadFromResource("/nic/nic.xml"));
-      assertNotNull(actual, "Parsed content returned null");
-
-      Nic expected = Nic.builder()
-              .id("12345678-abcd-efgh-ijkl-987654321000")
-              .dataCenterId("0")
-              .name("name")
-              .lanId(1)
-              .internetAccess(true)
-              .serverId("server-id")
-              .ips(ImmutableList.of("192.168.0.1"))
-              .macAddress("aa:bb:cc:dd:ee:ff")
-              .dhcpActive(true)
-              .gatewayIp("10.0.0.1")
-              .state(ProvisioningState.AVAILABLE)
-              .firewall(
-                      Firewall.builder()
-                      .active(true)
-                      .id("firewall-id")
-                      .nicId("nic-id")
-                      .state(ProvisioningState.AVAILABLE)
-                      .build())
-              .build();
-
-      assertEquals(actual, expected);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/93aff921/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/server/ServerIdOnlyResponseHandlerTest.java
----------------------------------------------------------------------
diff --git a/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/server/ServerIdOnlyResponseHandlerTest.java b/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/server/ServerIdOnlyResponseHandlerTest.java
deleted file mode 100644
index 19bc29d..0000000
--- a/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/server/ServerIdOnlyResponseHandlerTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.http.parser.server;
-
-import org.jclouds.http.functions.ParseSax;
-import org.jclouds.profitbricks.http.parser.BaseResponseHandlerTest;
-import static org.testng.Assert.assertEquals;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "ServerIdOnlyResponseHandlerTest")
-public class ServerIdOnlyResponseHandlerTest extends BaseResponseHandlerTest<String> {
-
-   @Override
-   protected ParseSax<String> createParser() {
-      return factory.create(injector.getInstance(ServerIdOnlyResponseHandler.class));
-   }
-
-   @Test
-   public void testParseResponseFromCreateServer() {
-      ParseSax<String> parser = createParser();
-
-      String serverId = parser.parse(payloadFromResource("/server/server-create.xml"));
-
-      assertEquals("qwertyui-qwer-qwer-qwer-qwertyyuiiop", serverId);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/93aff921/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/server/ServerInfoResponseHandlerTest.java
----------------------------------------------------------------------
diff --git a/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/server/ServerInfoResponseHandlerTest.java b/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/server/ServerInfoResponseHandlerTest.java
deleted file mode 100644
index 03fb3da..0000000
--- a/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/server/ServerInfoResponseHandlerTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * 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.http.parser.server;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-
-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;
-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 org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-
-@Test(groups = "unit", testName = "ServerInfoResponseHandlerTest")
-public class ServerInfoResponseHandlerTest extends BaseResponseHandlerTest<Server> {
-
-   @Override
-   protected ParseSax<Server> createParser() {
-      return factory.create(injector.getInstance(ServerInfoResponseHandler.class));
-   }
-
-   protected DateService createDateParser() {
-      return injector.getInstance(DateService.class);
-   }
-
-   @Test
-   public void testParseResponseFromGetServer() {
-      ParseSax<Server> parser = createParser();
-
-      Server actual = parser.parse(payloadFromResource("/server/server.xml"));
-      assertNotNull(actual, "Parsed content returned null");
-
-      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.iso8601DateOrSecondsDateParse("2014-12-04T07:09:23.138Z"))
-              .lastModificationTime(dateParser.iso8601DateOrSecondsDateParse("2014-12-12T03:08:35.629Z"))
-              .osType(OsType.LINUX)
-              .availabilityZone(AvailabilityZone.AUTO)
-              .isCpuHotPlug(true)
-              .isRamHotPlug(true)
-              .isNicHotPlug(true)
-              .isNicHotUnPlug(true)
-              .isDiscVirtioHotPlug(true)
-              .isDiscVirtioHotUnPlug(true)
-              .loadBalanced(true)
-              .balancedNicId("qswdefrg-qaws-qaws-defe-rgrgdsvcxbrh")
-              .storages(ImmutableList.<Storage>of(
-                              Storage.builder()
-                              .bootDevice(Boolean.TRUE)
-                              .busType(Storage.BusType.VIRTIO)
-                              .deviceNumber(1)
-                              .size(40f)
-                              .id("qswdefrg-qaws-qaws-defe-rgrgdsvcxbrh")
-                              .name("facebook-storage")
-                              .build()
-                      )
-              )
-              .nics(ImmutableList.<Nic>of(
-                              Nic.builder()
-                              .dataCenterId("aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee")
-                              .id("qwqwqwqw-wewe-erer-rtrt-tytytytytyty")
-                              .lanId(1)
-                              .internetAccess(true)
-                              .serverId("qwertyui-qwer-qwer-qwer-qwertyyuiiop")
-                              .ips(ImmutableList.of("173.252.120.6"))
-                              .macAddress("02:01:09:cd:f0:b0")
-                              .firewall(Firewall.builder()
-                                      .active(false)
-                                      .id("wqwqwqwq-ewew-rere-trtr-ytytytytytyt")
-                                      .nicId("qwqwqwqw-wewe-erer-rtrt-tytytytytyty")
-                                      .state(ProvisioningState.AVAILABLE)
-                                      .build())
-                              .dhcpActive(true)
-                              .gatewayIp("173.252.120.1")
-                              .state(ProvisioningState.AVAILABLE)
-                              .build()
-                      ))
-              .build();
-
-      assertEquals(actual, expected);
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/93aff921/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/server/ServerListResponseHandlerTest.java
----------------------------------------------------------------------
diff --git a/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/server/ServerListResponseHandlerTest.java b/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/server/ServerListResponseHandlerTest.java
deleted file mode 100644
index 95c7923..0000000
--- a/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/server/ServerListResponseHandlerTest.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * 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.http.parser.server;
-
-import com.google.common.collect.ImmutableList;
-
-import java.util.List;
-
-import org.jclouds.http.functions.ParseSax;
-import org.jclouds.profitbricks.domain.AvailabilityZone;
-import org.jclouds.profitbricks.domain.OsType;
-import org.jclouds.profitbricks.domain.ProvisioningState;
-import org.jclouds.profitbricks.domain.Server;
-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;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "ServerListResponseHandlerTest")
-public class ServerListResponseHandlerTest extends BaseResponseHandlerTest<List<Server>> {
-
-   @Override
-   protected ParseSax<List<Server>> createParser() {
-      return factory.create(injector.getInstance(ServerListResponseHandler.class));
-   }
-
-   protected DateService createDateParser() {
-      return injector.getInstance(DateService.class);
-   }
-
-   @Test
-   public void testParseResponseFromGetAllServers() {
-      ParseSax<List<Server>> parser = createParser();
-
-      List<Server> actual = parser.parse(payloadFromResource("/server/servers.xml"));
-      assertNotNull(actual, "Parsed content returned null");
-
-      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)
-              .ram(4096)
-              .hasInternetAccess(true)
-              .state(ProvisioningState.AVAILABLE)
-              .status(Server.Status.RUNNING)
-              .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)
-              .isRamHotPlug(true)
-              .isNicHotPlug(true)
-              .isNicHotUnPlug(true)
-              .isDiscVirtioHotPlug(true)
-              .isDiscVirtioHotUnPlug(true)
-              .loadBalanced(true)
-              .balancedNicId("qswdefrg-qaws-qaws-defe-rgrgdsvcxbrh")
-              .storages(ImmutableList.<Storage>of(
-                              Storage.builder()
-                              .bootDevice(Boolean.TRUE)
-                              .busType(Storage.BusType.VIRTIO)
-                              .deviceNumber(1)
-                              .size(40f)
-                              .id("qswdefrg-qaws-qaws-defe-rgrgdsvcxbrh")
-                              .name("facebook-storage")
-                              .build()
-                      )
-              )
-              .nics(ImmutableList.<Nic>of(
-                              Nic.builder()
-                              .dataCenterId("aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee")
-                              .id("qwqwqwqw-wewe-erer-rtrt-tytytytytyty")
-                              .lanId(1)
-                              .internetAccess(true)
-                              .serverId("qwertyui-qwer-qwer-qwer-qwertyyuiiop")
-                              .ips(ImmutableList.of("173.252.120.6"))
-                              .macAddress("02:01:09:cd:f0:b0")
-                              .firewall(Firewall.builder()
-                                      .active(false)
-                                      .id("wqwqwqwq-ewew-rere-trtr-ytytytytytyt")
-                                      .nicId("qwqwqwqw-wewe-erer-rtrt-tytytytytyty")
-                                      .state(ProvisioningState.AVAILABLE)
-                                      .build())
-                              .dhcpActive(true)
-                              .gatewayIp("173.252.120.1")
-                              .state(ProvisioningState.AVAILABLE)
-                              .build()
-                      )
-              )
-              .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)
-              .ram(1024)
-              .hasInternetAccess(false)
-              .state(ProvisioningState.AVAILABLE)
-              .status(Server.Status.RUNNING)
-              .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)
-              .isRamHotPlug(true)
-              .isNicHotPlug(true)
-              .isNicHotUnPlug(true)
-              .isDiscVirtioHotPlug(true)
-              .isDiscVirtioHotUnPlug(true)
-              .loadBalanced(true)
-              .balancedNicId("qswdefrg-qaws-qaws-defe-rgrgdsvcxbrh")
-              .storages(ImmutableList.<Storage>of(
-                              Storage.builder()
-                              .bootDevice(Boolean.TRUE)
-                              .busType(Storage.BusType.VIRTIO)
-                              .deviceNumber(1)
-                              .size(5f)
-                              .id("asfasfle-f23n-cu89-klfr-njkdsvwllkfa")
-                              .name("google-disk")
-                              .build()
-                      )
-              )
-              .nics(ImmutableList.<Nic>of(
-                              Nic.builder()
-                              .dataCenterId("qqqqqqqq-wwww-rrrr-tttt-yyyyyyyyyyyy")
-                              .id("mkl45h5e-sdgb-h6rh-235r-rfweshdfhreh")
-                              .lanId(3)
-                              .internetAccess(false)
-                              .serverId("asdfghjk-asdf-asdf-asdf-asdfghjklkjl")
-                              .ips(ImmutableList.of("202.69.181.241"))
-                              .macAddress("02:01:9e:5e:35:1e")
-                              .firewall(Firewall.builder()
-                                      .active(false)
-                                      .id("cvvdsgbd-sdgj-eger-h56j-wet43gvsgeg4")
-                                      .nicId("mkl45h5e-sdgb-h6rh-235r-rfweshdfhreh")
-                                      .state(ProvisioningState.INPROCESS)
-                                      .build())
-                              .dhcpActive(false)
-                              .gatewayIp("202.69.181.1")
-                              .state(ProvisioningState.AVAILABLE)
-                              .build()
-                      )
-              )
-              .build()
-      );
-
-      assertEquals(actual, expected);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/93aff921/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/snapshot/SnapshotListResponseHandlerTest.java
----------------------------------------------------------------------
diff --git a/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/snapshot/SnapshotListResponseHandlerTest.java b/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/snapshot/SnapshotListResponseHandlerTest.java
deleted file mode 100644
index 37cdb96..0000000
--- a/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/snapshot/SnapshotListResponseHandlerTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * 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.http.parser.snapshot;
-
-import com.google.common.collect.Lists;
-
-import java.util.List;
-
-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")
-public class SnapshotListResponseHandlerTest extends BaseResponseHandlerTest<List<Snapshot>> {
-
-   @Override
-   protected ParseSax<List<Snapshot>> createParser() {
-      return factory.create(injector.getInstance(SnapshotListResponseHandler.class));
-   }
-
-   protected DateService createDateParser() {
-      return injector.getInstance(DateService.class);
-   }
-
-   @Test
-   public void testParseResponseFromGetSnapshot() {
-      ParseSax<List<Snapshot>> parser = createParser();
-
-      List<Snapshot> actual = parser.parse(payloadFromResource("/snapshot/snapshots.xml"));
-      assertNotNull(actual);
-
-      DateService dateParser = createDateParser();
-
-      List<Snapshot> expected = Lists.newArrayList();
-
-      expected.add(Snapshot.builder()
-              .id("aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee")
-              .description("description")
-              .size(1024f)
-              .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(1024f)
-              .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-labs/blob/93aff921/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/snapshot/SnapshotResponseHandlerTest.java
----------------------------------------------------------------------
diff --git a/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/snapshot/SnapshotResponseHandlerTest.java b/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/snapshot/SnapshotResponseHandlerTest.java
deleted file mode 100644
index 1a73c9f..0000000
--- a/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/snapshot/SnapshotResponseHandlerTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * 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.http.parser.snapshot;
-
-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")
-public class SnapshotResponseHandlerTest extends BaseResponseHandlerTest<Snapshot> {
-
-   @Override
-   protected ParseSax<Snapshot> createParser() {
-      return factory.create(injector.getInstance(SnapshotResponseHandler.class));
-   }
-
-   protected DateService createDateParser() {
-      return injector.getInstance(DateService.class);
-   }
-
-   @Test
-   public void testParseResponseFromGetSnapshot() {
-      ParseSax<Snapshot> parser = createParser();
-
-      Snapshot actual = parser.parse(payloadFromResource("/snapshot/snapshot.xml"));
-      assertNotNull(actual, "Parsed content returned null");
-
-      DateService dateParser = createDateParser();
-
-      Snapshot expected = Snapshot.builder()
-              .id("qswdefrg-qaws-qaws-defe-rgrgdsvcxbrh")
-              .description("description")
-              .size(1024f)
-              .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-labs/blob/93aff921/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/state/GetProvisioningStateResponseHandlerTest.java
----------------------------------------------------------------------
diff --git a/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/state/GetProvisioningStateResponseHandlerTest.java b/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/state/GetProvisioningStateResponseHandlerTest.java
deleted file mode 100644
index 3bd2755..0000000
--- a/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/state/GetProvisioningStateResponseHandlerTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * 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.http.parser.state;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.jclouds.http.functions.ParseSax;
-import org.jclouds.profitbricks.domain.ProvisioningState;
-import org.jclouds.profitbricks.http.parser.BaseResponseHandlerTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "GetProvisioningStateResponseHandlerTest")
-public class GetProvisioningStateResponseHandlerTest extends BaseResponseHandlerTest<ProvisioningState> {
-
-   @Override
-   protected ParseSax<ProvisioningState> createParser() {
-      return factory.create(injector.getInstance(GetProvisioningStateResponseHandler.class));
-   }
-
-   @Test
-   public void testParseResponseFromGetProvisioningState() {
-      ParseSax<ProvisioningState> parser = createParser();
-
-      for (Map.Entry<ProvisioningState, String> pair : sampleResponses.entrySet()) {
-         ProvisioningState actual = parser.parse(pair.getValue());
-         assertNotNull(actual, "Parsed content returned null");
-
-         assertEquals(pair.getKey(), actual);
-      }
-
-   }
-
-   private final Map<ProvisioningState, String> sampleResponses = new LinkedHashMap<ProvisioningState, String>() {
-      {
-         put(ProvisioningState.INACTIVE,
-                 "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:ws=\"http://ws.api.profitbricks.com/\">\n"
-                 + "   <soapenv:Header/>\n"
-                 + "   <soapenv:Body>\n"
-                 + "      <ws:getDataCenterStateResponse>\n"
-                 + "         <return>INACTIVE</return>\n"
-                 + "      </ws:getDataCenterStateResponse>\n"
-                 + "   </soapenv:Body>\n"
-                 + "</soapenv:Envelope>");
-         put(ProvisioningState.INPROCESS,
-                 "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:ws=\"http://ws.api.profitbricks.com/\">\n"
-                 + "   <soapenv:Header/>\n"
-                 + "   <soapenv:Body>\n"
-                 + "      <ws:getDataCenterStateResponse>\n"
-                 + "         <return>INPROCESS</return>\n"
-                 + "      </ws:getDataCenterStateResponse>\n"
-                 + "   </soapenv:Body>\n"
-                 + "</soapenv:Envelope>");
-         put(ProvisioningState.AVAILABLE,
-                 "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:ws=\"http://ws.api.profitbricks.com/\">\n"
-                 + "   <soapenv:Header/>\n"
-                 + "   <soapenv:Body>\n"
-                 + "      <ws:getDataCenterStateResponse>\n"
-                 + "         <return>AVAILABLE</return>\n"
-                 + "      </ws:getDataCenterStateResponse>\n"
-                 + "   </soapenv:Body>\n"
-                 + "</soapenv:Envelope>");
-         put(ProvisioningState.DELETED,
-                 "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:ws=\"http://ws.api.profitbricks.com/\">\n"
-                 + "   <soapenv:Header/>\n"
-                 + "   <soapenv:Body>\n"
-                 + "      <ws:getDataCenterStateResponse>\n"
-                 + "         <return>DELETED</return>\n"
-                 + "      </ws:getDataCenterStateResponse>\n"
-                 + "   </soapenv:Body>\n"
-                 + "</soapenv:Envelope>");
-         put(ProvisioningState.ERROR,
-                 "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:ws=\"http://ws.api.profitbricks.com/\">\n"
-                 + "   <soapenv:Header/>\n"
-                 + "   <soapenv:Body>\n"
-                 + "      <ws:getDataCenterStateResponse>\n"
-                 + "         <return>ERROR</return>\n"
-                 + "      </ws:getDataCenterStateResponse>\n"
-                 + "   </soapenv:Body>\n"
-                 + "</soapenv:Envelope>");
-         put(ProvisioningState.UNRECOGNIZED,
-                 "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:ws=\"http://ws.api.profitbricks.com/\">\n"
-                 + "   <soapenv:Header/>\n"
-                 + "   <soapenv:Body>\n"
-                 + "      <ws:getDataCenterStateResponse>\n"
-                 + "         <return>MEH</return>\n"
-                 + "      </ws:getDataCenterStateResponse>\n"
-                 + "   </soapenv:Body>\n"
-                 + "</soapenv:Envelope>");
-      }
-   };
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/93aff921/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/storage/StorageIdOnlyResponseHandlerTest.java
----------------------------------------------------------------------
diff --git a/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/storage/StorageIdOnlyResponseHandlerTest.java b/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/storage/StorageIdOnlyResponseHandlerTest.java
deleted file mode 100644
index def23b6..0000000
--- a/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/storage/StorageIdOnlyResponseHandlerTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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.http.parser.storage;
-
-import static org.testng.Assert.assertEquals;
-
-import org.jclouds.http.functions.ParseSax;
-import org.jclouds.profitbricks.http.parser.BaseResponseHandlerTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "StorageIdOnlyResponseHandlerTest")
-public class StorageIdOnlyResponseHandlerTest extends BaseResponseHandlerTest<String> {
-
-   @Override
-   protected ParseSax<String> createParser() {
-      return factory.create(injector.getInstance(StorageIdOnlyResponseHandler.class));
-   }
-
-   @Test
-   public void testParseResponseFromCreateStorage() {
-      ParseSax<String> parser = createParser();
-
-      String storageId = parser.parse(payloadFromResource("/storage/storage-create.xml"));
-
-      assertEquals("qswdefrg-qaws-qaws-defe-rgrgdsvcxbrh", storageId);
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/93aff921/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/storage/StorageInfoResponseHandlerTest.java
----------------------------------------------------------------------
diff --git a/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/storage/StorageInfoResponseHandlerTest.java b/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/storage/StorageInfoResponseHandlerTest.java
deleted file mode 100644
index 411865f..0000000
--- a/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/storage/StorageInfoResponseHandlerTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * 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.http.parser.storage;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-
-import org.jclouds.date.DateService;
-import org.jclouds.http.functions.ParseSax;
-import org.jclouds.profitbricks.domain.ProvisioningState;
-import org.jclouds.profitbricks.domain.Storage;
-import org.jclouds.profitbricks.http.parser.BaseResponseHandlerTest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-
-@Test(groups = "unit", testName = "StorageInfoResponseHandlerTest")
-public class StorageInfoResponseHandlerTest extends BaseResponseHandlerTest<Storage> {
-
-   @Override
-   protected ParseSax<Storage> createParser() {
-      return factory.create(injector.getInstance(StorageInfoResponseHandler.class));
-   }
-
-   protected DateService createDateParser() {
-      return injector.getInstance(DateService.class);
-   }
-
-   @Test
-   public void testParseResponseFromGetStorage() {
-      ParseSax<Storage> parser = createParser();
-
-      Storage actual = parser.parse(payloadFromResource("/storage/storage.xml"));
-      assertNotNull(actual, "Parsed content returned null");
-
-      DateService dateParser = createDateParser();
-
-      Storage expected = Storage.builder()
-              .id("qswdefrg-qaws-qaws-defe-rgrgdsvcxbrh")
-              .size(40)
-              .name("hdd-1")
-              .state(ProvisioningState.AVAILABLE)
-              .serverIds(ImmutableList.<String>of("qwertyui-qwer-qwer-qwer-qwertyyuiiop"))
-              .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-labs/blob/93aff921/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/storage/StorageListResponseHandlerTest.java
----------------------------------------------------------------------
diff --git a/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/storage/StorageListResponseHandlerTest.java b/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/storage/StorageListResponseHandlerTest.java
deleted file mode 100644
index 9ac696d..0000000
--- a/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/storage/StorageListResponseHandlerTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * 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.http.parser.storage;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-
-import com.google.common.collect.ImmutableList;
-
-import java.util.List;
-
-import org.jclouds.date.DateService;
-import org.jclouds.http.functions.ParseSax;
-import org.jclouds.profitbricks.domain.ProvisioningState;
-import org.jclouds.profitbricks.domain.Storage;
-import org.jclouds.profitbricks.http.parser.BaseResponseHandlerTest;
-
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "StorageListResponseHandlerTest")
-public class StorageListResponseHandlerTest extends BaseResponseHandlerTest<List<Storage>> {
-
-   @Override
-   protected ParseSax<List<Storage>> createParser() {
-      return factory.create(injector.getInstance(StorageListResponseHandler.class));
-   }
-
-   protected DateService createDateParser() {
-      return injector.getInstance(DateService.class);
-   }
-
-   @Test
-   public void testParseResponseFromGetAllStorages() {
-      ParseSax<List<Storage>> parser = createParser();
-
-      List<Storage> actual = parser.parse(payloadFromResource("/storage/storages.xml"));
-      assertNotNull(actual, "Parsed content returned null");
-
-      DateService dateParser = createDateParser();
-
-      List<Storage> expected = ImmutableList.<Storage>of(
-              Storage.builder()
-              .id("qswdefrg-qaws-qaws-defe-rgrgdsvcxbrh")
-              .size(40f)
-              .name("hdd-1")
-              .state(ProvisioningState.AVAILABLE)
-              .serverIds(ImmutableList.<String>of("qwertyui-qwer-qwer-qwer-qwertyyuiiop"))
-              .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")
-              .size(100f)
-              .name("hdd-2")
-              .state(ProvisioningState.INPROCESS)
-              .serverIds(ImmutableList.<String>of("asdfghjk-asdf-asdf-asdf-asdfghjklkjl"))
-              .creationTime(dateParser.iso8601DateOrSecondsDateParse("2014-11-04T07:09:23.138Z"))
-              .lastModificationTime(dateParser.iso8601DateOrSecondsDateParse("2014-11-12T03:14:48.316Z"))
-              .build()
-      );
-
-      assertEquals(actual, expected);
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/93aff921/profitbricks/src/test/java/org/jclouds/profitbricks/internal/BaseProfitBricksMockTest.java
----------------------------------------------------------------------
diff --git a/profitbricks/src/test/java/org/jclouds/profitbricks/internal/BaseProfitBricksMockTest.java b/profitbricks/src/test/java/org/jclouds/profitbricks/internal/BaseProfitBricksMockTest.java
deleted file mode 100644
index d5883a6..0000000
--- a/profitbricks/src/test/java/org/jclouds/profitbricks/internal/BaseProfitBricksMockTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * 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.internal;
-
-import static org.jclouds.util.Strings2.toStringAndClose;
-import static org.testng.Assert.assertEquals;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.Properties;
-import java.util.Set;
-
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.ContextBuilder;
-import org.jclouds.http.filters.BasicAuthentication;
-import org.jclouds.profitbricks.ProfitBricksApi;
-
-import com.google.common.base.Charsets;
-import com.google.common.base.Throwables;
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Module;
-import com.squareup.okhttp.mockwebserver.MockWebServer;
-import com.squareup.okhttp.mockwebserver.RecordedRequest;
-
-/**
- * Base class for all ProfitBricks mock test
- */
-public class BaseProfitBricksMockTest {
-
-   protected static final String authHeader = BasicAuthentication.basic("username", "password");
-   protected static final String provider = "profitbricks";
-   protected static final String rootUrl = "/1.3";
-
-   private static final String SOAP_PREFIX
-           = "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:ws=\"http://ws.api.profitbricks.com/\">"
-           + "<soapenv:Header/>"
-           + "<soapenv:Body>";
-
-   private static final String SOAP_SUFFIX = "</soapenv:Body></soapenv:Envelope>";
-
-   private final Set<Module> modules = ImmutableSet.<Module>of();
-
-   public BaseProfitBricksMockTest() {
-   }
-
-   public ProfitBricksApi api(URL url) {
-      return ContextBuilder.newBuilder(provider)
-              .credentials("username", "password")
-              .endpoint(url.toString())
-              .modules(modules)
-              .overrides(setupProperties())
-              .buildApi(ProfitBricksApi.class);
-   }
-
-   protected Properties setupProperties() {
-      return new Properties();
-   }
-
-   public static MockWebServer mockWebServer() throws IOException {
-      MockWebServer server = new MockWebServer();
-      server.play();
-      return server;
-   }
-
-   public byte[] payloadFromResource(String resource) {
-      try {
-         return toStringAndClose(getClass().getResourceAsStream(resource)).getBytes(Charsets.UTF_8);
-      } catch (IOException e) {
-         throw Throwables.propagate(e);
-      }
-   }
-
-   protected static String payloadSoapWithBody(String body) {
-      return SOAP_PREFIX.concat(body).concat(SOAP_SUFFIX);
-   }
-
-   protected static void assertRequestHasCommonProperties(final RecordedRequest request) {
-      assertEquals(request.getMethod(), "POST");
-      assertEquals(request.getPath(), rootUrl);
-      assertEquals(request.getHeader(HttpHeaders.AUTHORIZATION), authHeader);
-      assertEquals(request.getHeader(HttpHeaders.ACCEPT), MediaType.TEXT_XML);
-   }
-
-   protected static void assertRequestHasCommonProperties(final RecordedRequest request, String content) {
-      assertEquals(new String(request.getBody()), payloadSoapWithBody(content));
-      assertRequestHasCommonProperties(request);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/93aff921/profitbricks/src/test/java/org/jclouds/profitbricks/util/MacAddressesTest.java
----------------------------------------------------------------------
diff --git a/profitbricks/src/test/java/org/jclouds/profitbricks/util/MacAddressesTest.java b/profitbricks/src/test/java/org/jclouds/profitbricks/util/MacAddressesTest.java
deleted file mode 100644
index 1f0ae7a..0000000
--- a/profitbricks/src/test/java/org/jclouds/profitbricks/util/MacAddressesTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.MacAddresses.isMacAddress;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "MacAddressesTest")
-public class MacAddressesTest {
-
-   private final List<String> expectedValidAddresses = ImmutableList.of(
-           "aa:bb:cc:dd:ee:ff", "11:22:33:44:55:66"
-   );
-   private final List<String> expectedInvalidAddresses = ImmutableList.of(
-           "AA:BB:CC:DD:EE:FF", "aa-bb-cc-dd-ee-ff", "", "aabbccddeeff",
-           "aa:bb:cc:dd:ff", "gg:aa:bb:cc:dd:ee"
-   );
-
-   @Test
-   public void testIsMacAddress() {
-      for (String addr : expectedValidAddresses)
-         assertTrue(isMacAddress(addr));
-
-      for (String addr : expectedInvalidAddresses)
-         assertFalse(isMacAddress(addr));
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/93aff921/profitbricks/src/test/java/org/jclouds/profitbricks/util/PasswordsTest.java
----------------------------------------------------------------------
diff --git a/profitbricks/src/test/java/org/jclouds/profitbricks/util/PasswordsTest.java b/profitbricks/src/test/java/org/jclouds/profitbricks/util/PasswordsTest.java
deleted file mode 100644
index fc7be1f..0000000
--- a/profitbricks/src/test/java/org/jclouds/profitbricks/util/PasswordsTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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-labs/blob/93aff921/profitbricks/src/test/resources/datacenter/datacenter-cleared.xml
----------------------------------------------------------------------
diff --git a/profitbricks/src/test/resources/datacenter/datacenter-cleared.xml b/profitbricks/src/test/resources/datacenter/datacenter-cleared.xml
deleted file mode 100644
index 5b85c96..0000000
--- a/profitbricks/src/test/resources/datacenter/datacenter-cleared.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<S:Envelope xmlns:S="http://schemas.xmlsoap.org/soap/envelope/">
-    <S:Body>
-        <ns2:clearDataCenterResponse xmlns:ns2="http://ws.api.profitbricks.com/">
-            <return>
-                <requestId>1143191</requestId>
-                <dataCenterId>aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee</dataCenterId>
-                <dataCenterVersion>3</dataCenterVersion>
-            </return>
-        </ns2:clearDataCenterResponse>
-    </S:Body>
-</S:Envelope>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/93aff921/profitbricks/src/test/resources/datacenter/datacenter-created.xml
----------------------------------------------------------------------
diff --git a/profitbricks/src/test/resources/datacenter/datacenter-created.xml b/profitbricks/src/test/resources/datacenter/datacenter-created.xml
deleted file mode 100644
index 92ef01d..0000000
--- a/profitbricks/src/test/resources/datacenter/datacenter-created.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ws="http://ws.api.profitbricks.com/">
-    <soapenv:Body>
-        <ws:createDataCenterResponse>
-            <return>
-                <requestId>102456</requestId>
-                <dataCenterId>aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee</dataCenterId>
-                <dataCenterVersion>1</dataCenterVersion>
-                <location>de/fra</location>
-            </return>
-        </ws:createDataCenterResponse>
-    </soapenv:Body>
-</soapenv:Envelope>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/93aff921/profitbricks/src/test/resources/datacenter/datacenter-deleted.xml
----------------------------------------------------------------------
diff --git a/profitbricks/src/test/resources/datacenter/datacenter-deleted.xml b/profitbricks/src/test/resources/datacenter/datacenter-deleted.xml
deleted file mode 100644
index 531ed53..0000000
--- a/profitbricks/src/test/resources/datacenter/datacenter-deleted.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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:Envelope>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/93aff921/profitbricks/src/test/resources/datacenter/datacenter-not-found.xml
----------------------------------------------------------------------
diff --git a/profitbricks/src/test/resources/datacenter/datacenter-not-found.xml b/profitbricks/src/test/resources/datacenter/datacenter-not-found.xml
deleted file mode 100644
index e4a9701..0000000
--- a/profitbricks/src/test/resources/datacenter/datacenter-not-found.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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:Envelope>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/93aff921/profitbricks/src/test/resources/datacenter/datacenter-state-inprocess.xml
----------------------------------------------------------------------
diff --git a/profitbricks/src/test/resources/datacenter/datacenter-state-inprocess.xml b/profitbricks/src/test/resources/datacenter/datacenter-state-inprocess.xml
deleted file mode 100644
index 722c653..0000000
--- a/profitbricks/src/test/resources/datacenter/datacenter-state-inprocess.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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:Envelope>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/93aff921/profitbricks/src/test/resources/datacenter/datacenter-state.xml
----------------------------------------------------------------------
diff --git a/profitbricks/src/test/resources/datacenter/datacenter-state.xml b/profitbricks/src/test/resources/datacenter/datacenter-state.xml
deleted file mode 100644
index 3327c82..0000000
--- a/profitbricks/src/test/resources/datacenter/datacenter-state.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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:Envelope>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/93aff921/profitbricks/src/test/resources/datacenter/datacenter-updated.xml
----------------------------------------------------------------------
diff --git a/profitbricks/src/test/resources/datacenter/datacenter-updated.xml b/profitbricks/src/test/resources/datacenter/datacenter-updated.xml
deleted file mode 100644
index f0c84d4..0000000
--- a/profitbricks/src/test/resources/datacenter/datacenter-updated.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<S:Envelope xmlns:S="http://schemas.xmlsoap.org/soap/envelope/">
-    <S:Body>
-        <ns2:updateDataCenterResponse xmlns:ns2="http://ws.api.profitbricks.com/">
-            <return>
-                <requestId>1143190</requestId>
-                <dataCenterId>aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee</dataCenterId>
-                <dataCenterVersion>2</dataCenterVersion>
-            </return>
-        </ns2:updateDataCenterResponse>
-    </S:Body>
-</S:Envelope>

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/93aff921/profitbricks/src/test/resources/datacenter/datacenter.xml
----------------------------------------------------------------------
diff --git a/profitbricks/src/test/resources/datacenter/datacenter.xml b/profitbricks/src/test/resources/datacenter/datacenter.xml
deleted file mode 100644
index 3df1f8b..0000000
--- a/profitbricks/src/test/resources/datacenter/datacenter.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<S:Envelope xmlns:S="http://schemas.xmlsoap.org/soap/envelope/">
-    <S:Body>
-        <ns2:getDataCenterResponse xmlns:ns2="http://ws.api.profitbricks.com/">
-            <return>
-                <requestId>10933055</requestId>
-                <dataCenterId>12345678-abcd-efgh-ijkl-987654321000</dataCenterId>
-                <dataCenterVersion>10</dataCenterVersion>
-                <dataCenterName>JClouds-DC</dataCenterName>
-                <servers>
-                    <dataCenterId>12345678-abcd-efgh-ijkl-987654321000</dataCenterId>
-                    <dataCenterVersion>10</dataCenterVersion>
-                    <serverId>qqqqqqqq-wwww-eeee-rrrr-tttttttttttt</serverId>
-                    <serverName>jnode1</serverName>
-                    <cores>4</cores>
-                    <ram>4096</ram>
-                    <internetAccess>true</internetAccess>
-                    <ips>202.94.38.12</ips>
-                    <connectedStorages>
-                        <bootDevice>true</bootDevice>
-                        <busType>VIRTIO</busType>
-                        <deviceNumber>1</deviceNumber>
-                        <size>40</size>
-                        <storageId>ssssssss-aaaa-ffff-gggg-hhhhhhhhhhhh</storageId>
-                        <storageName>jnode1-disk1</storageName>
-                    </connectedStorages>
-                    <nics>
-                        <dataCenterId>12345678-abcd-efgh-ijkl-987654321000</dataCenterId>
-                        <dataCenterVersion>10</dataCenterVersion>
-                        <nicId>zzzzzzzz-xxxx-cccc-vvvv-bbbbbbbbbbbb</nicId>
-                        <lanId>1</lanId>
-                        <internetAccess>true</internetAccess>
-                        <serverId>qqqqqqqq-wwww-eeee-rrrr-tttttttttttt</serverId>
-                        <ips>202.94.38.12</ips>
-                        <macAddress>02:01:09:cd:f0:b0</macAddress>
-                        <firewall>
-                            <active>false</active>
-                            <firewallId>llllllll-kkkk-jjjj-hhhh-gggggggggggg</firewallId>
-                            <nicId>zzzzzzzz-xxxx-cccc-vvvv-bbbbbbbbbbbb</nicId>
-                            <provisioningState>AVAILABLE</provisioningState>
-                        </firewall>
-                        <dhcpActive>true</dhcpActive>
-                        <gatewayIp>202.94.38.1</gatewayIp>
-                        <provisioningState>AVAILABLE</provisioningState>
-                    </nics>
-                    <provisioningState>AVAILABLE</provisioningState>
-                    <virtualMachineState>RUNNING</virtualMachineState>
-                    <creationTime>2014-12-04T07:09:23.138Z</creationTime>
-                    <lastModificationTime>2014-12-12T03:08:35.629Z</lastModificationTime>
-                    <osType>LINUX</osType>
-                    <availabilityZone>AUTO</availabilityZone>
-                    <cpuHotPlug>true</cpuHotPlug>
-                    <ramHotPlug>true</ramHotPlug>
-                    <nicHotPlug>true</nicHotPlug>
-                    <nicHotUnPlug>true</nicHotUnPlug>
-                    <discVirtioHotPlug>true</discVirtioHotPlug>
-                    <discVirtioHotUnPlug>true</discVirtioHotUnPlug>
-                </servers>
-                <storages>
-                    <dataCenterId>12345678-abcd-efgh-ijkl-987654321000</dataCenterId>
-                    <dataCenterVersion>10</dataCenterVersion>
-                    <storageId>ssssssss-aaaa-ffff-gggg-hhhhhhhhhhhh</storageId>
-                    <size>40</size>
-                    <storageName>jnode1-disk1</storageName>
-                    <mountImage>
-                        <imageId>f0a59a5c-7940-11e4-8053-52540066fee9</imageId>
-                        <imageName>Ubuntu-14.04-LTS-server-2014-12-01</imageName>
-                    </mountImage>
-                    <serverIds>qqqqqqqq-wwww-eeee-rrrr-tttttttttttt</serverIds>
-                    <provisioningState>AVAILABLE</provisioningState>
-                    <creationTime>2014-12-04T07:09:23.138Z</creationTime>
-                    <lastModificationTime>2014-12-12T03:14:48.316Z</lastModificationTime>
-                </storages>
-                <provisioningState>AVAILABLE</provisioningState>
-                <location>us/las</location>
-            </return>
-        </ns2:getDataCenterResponse>
-    </S:Body>
-</S:Envelope>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/93aff921/profitbricks/src/test/resources/datacenter/datacenters.xml
----------------------------------------------------------------------
diff --git a/profitbricks/src/test/resources/datacenter/datacenters.xml b/profitbricks/src/test/resources/datacenter/datacenters.xml
deleted file mode 100644
index b3b7bc3..0000000
--- a/profitbricks/src/test/resources/datacenter/datacenters.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<S:Envelope xmlns:S="http://schemas.xmlsoap.org/soap/envelope/">
-    <S:Body>
-        <ns2:getAllDataCentersResponse xmlns:ns2="http://ws.api.profitbricks.com/">
-            <return>
-                <dataCenterId>aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee</dataCenterId>
-                <dataCenterName>JClouds-DC</dataCenterName>
-                <dataCenterVersion>10</dataCenterVersion>
-                <provisioningState>AVAILABLE</provisioningState>
-            </return>
-            <return>
-                <dataCenterId>qqqqqqqq-wwww-rrrr-tttt-yyyyyyyyyyyy</dataCenterId>
-                <dataCenterName>Random DC</dataCenterName>
-                <dataCenterVersion>238</dataCenterVersion>
-                <provisioningState>INPROCESS</provisioningState>
-            </return>
-        </ns2:getAllDataCentersResponse>
-    </S:Body>
-</S:Envelope>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/93aff921/profitbricks/src/test/resources/drives/drives-add.xml
----------------------------------------------------------------------
diff --git a/profitbricks/src/test/resources/drives/drives-add.xml b/profitbricks/src/test/resources/drives/drives-add.xml
deleted file mode 100644
index 52a04f5..0000000
--- a/profitbricks/src/test/resources/drives/drives-add.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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:Envelope>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/93aff921/profitbricks/src/test/resources/drives/drives-remove.xml
----------------------------------------------------------------------
diff --git a/profitbricks/src/test/resources/drives/drives-remove.xml b/profitbricks/src/test/resources/drives/drives-remove.xml
deleted file mode 100644
index 699b359..0000000
--- a/profitbricks/src/test/resources/drives/drives-remove.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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:Envelope>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/93aff921/profitbricks/src/test/resources/fault-400.xml
----------------------------------------------------------------------
diff --git a/profitbricks/src/test/resources/fault-400.xml b/profitbricks/src/test/resources/fault-400.xml
deleted file mode 100644
index 9648b2a..0000000
--- a/profitbricks/src/test/resources/fault-400.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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>RAM of requested server too small, 256 Mb is minimum</faultstring>
-            <detail>
-                <ns2:ProfitbricksServiceFault xmlns:ns2="http://ws.api.profitbricks.com/">
-                    <faultCode>BAD_REQUEST</faultCode>
-                    <httpCode>400</httpCode>
-                    <message>RAM of requested server too small, 256 Mb is minimum</message>
-                    <requestId>1045</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-labs/blob/93aff921/profitbricks/src/test/resources/fault-401.html
----------------------------------------------------------------------
diff --git a/profitbricks/src/test/resources/fault-401.html b/profitbricks/src/test/resources/fault-401.html
deleted file mode 100644
index ecadab1..0000000
--- a/profitbricks/src/test/resources/fault-401.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" lang="en"/>
-        <title>Profitbricks | 401 Unauthorized</title>
-        <base href="/"/>
-        <link rel="stylesheet" type="text/css" href="css/style.css"/>
-        <link rel="stylesheet" type="text/css" href="css/content.css"/>
-        <link rel="stylesheet" type="text/css" href="css/recent_additions.css"/>
-        <link rel="shortcut icon" href="favicon.ico" type="image/x-icon"/>
-    </head>
-    <body>
-        <div class="head1 h_bg"/>
-        <div class="head2 h_bg"/>
-        <div class="head3 h_bg"/>
-        <div id="wrapper">
-            <div class="wrapper_inner">
-                <div id="header">
-                    <a id="logo" href="#">
-                        <img alt="Profitbricks" src="img/logo.png"/>
-                    </a>
-                </div>
-                <div id="main">
-                    <div id="right" style="min-height: 550px;">
-                        <div class="article msg">
-                            <h1>Unauthorized</h1>
-                            <img title="" alt="message error" src="img/msg_error.png" class="msg_sign" style="margin: 10px;" height="49" width="49"/>
-                            <div class="container" style="margin:20px 80px !important;">
-                                <p class="bigmargin">This request requires authentication.</p>
-                            </div>
-                        </div>
-                    </div>
-                    <br class="clear"/>
-                </div>
-            </div>
-        </div>
-        <div id="footer">
-            <div class="bottom">
-                <div class="inner"></div>
-            </div>
-        </div>
-    </body>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/93aff921/profitbricks/src/test/resources/fault-404.xml
----------------------------------------------------------------------
diff --git a/profitbricks/src/test/resources/fault-404.xml b/profitbricks/src/test/resources/fault-404.xml
deleted file mode 100644
index 1875102..0000000
--- a/profitbricks/src/test/resources/fault-404.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 : 16370720. [VDC-6-404] The requested resource 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 : 16370720. [VDC-6-404] The requested resource does not exist or already deleted by the users. ResourceId random-non-existing-id</message>
-                    <requestId>16370720</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-labs/blob/93aff921/profitbricks/src/test/resources/fault-413.xml
----------------------------------------------------------------------
diff --git a/profitbricks/src/test/resources/fault-413.xml b/profitbricks/src/test/resources/fault-413.xml
deleted file mode 100644
index b4d5f79..0000000
--- a/profitbricks/src/test/resources/fault-413.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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>New request exceeds the current capacity settings of this user contract.  Please refer to Request Id : 16503940. [VDC-5-1020] Server  has 12,800 MiB configured RAM. Your personal limit is 10,240 MiB per server.</faultstring>
-            <detail>
-                <ns2:ProfitbricksServiceFault xmlns:ns2="http://ws.api.profitbricks.com/">
-                    <faultCode>OVER_LIMIT_SETTING</faultCode>
-                    <httpCode>413</httpCode>
-                    <message>New request exceeds the current capacity settings of this user contract.  Please refer to Request Id : 16503940. [VDC-5-1020] Server  has 12,800 MiB configured RAM. Your personal limit is 10,240 MiB per server.</message>
-                    <requestId>16503940</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-labs/blob/93aff921/profitbricks/src/test/resources/firewall/firewall-activate.xml
----------------------------------------------------------------------
diff --git a/profitbricks/src/test/resources/firewall/firewall-activate.xml b/profitbricks/src/test/resources/firewall/firewall-activate.xml
deleted file mode 100644
index 16e32b9..0000000
--- a/profitbricks/src/test/resources/firewall/firewall-activate.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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:Envelope>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/93aff921/profitbricks/src/test/resources/firewall/firewall-addtonic.xml
----------------------------------------------------------------------
diff --git a/profitbricks/src/test/resources/firewall/firewall-addtonic.xml b/profitbricks/src/test/resources/firewall/firewall-addtonic.xml
deleted file mode 100644
index 740c042..0000000
--- a/profitbricks/src/test/resources/firewall/firewall-addtonic.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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:Envelope>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/93aff921/profitbricks/src/test/resources/firewall/firewall-deactivate.xml
----------------------------------------------------------------------
diff --git a/profitbricks/src/test/resources/firewall/firewall-deactivate.xml b/profitbricks/src/test/resources/firewall/firewall-deactivate.xml
deleted file mode 100644
index 0adaabd..0000000
--- a/profitbricks/src/test/resources/firewall/firewall-deactivate.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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:Envelope>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/93aff921/profitbricks/src/test/resources/firewall/firewall-delete.xml
----------------------------------------------------------------------
diff --git a/profitbricks/src/test/resources/firewall/firewall-delete.xml b/profitbricks/src/test/resources/firewall/firewall-delete.xml
deleted file mode 100644
index 26371a9..0000000
--- a/profitbricks/src/test/resources/firewall/firewall-delete.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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:Envelope>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/93aff921/profitbricks/src/test/resources/firewall/firewall-remove.xml
----------------------------------------------------------------------
diff --git a/profitbricks/src/test/resources/firewall/firewall-remove.xml b/profitbricks/src/test/resources/firewall/firewall-remove.xml
deleted file mode 100644
index 6301e6a..0000000
--- a/profitbricks/src/test/resources/firewall/firewall-remove.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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:Envelope>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/93aff921/profitbricks/src/test/resources/firewall/firewall.xml
----------------------------------------------------------------------
diff --git a/profitbricks/src/test/resources/firewall/firewall.xml b/profitbricks/src/test/resources/firewall/firewall.xml
deleted file mode 100644
index 839502c..0000000
--- a/profitbricks/src/test/resources/firewall/firewall.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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:Envelope>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/93aff921/profitbricks/src/test/resources/firewall/firewalls.xml
----------------------------------------------------------------------
diff --git a/profitbricks/src/test/resources/firewall/firewalls.xml b/profitbricks/src/test/resources/firewall/firewalls.xml
deleted file mode 100644
index 5803fbf..0000000
--- a/profitbricks/src/test/resources/firewall/firewalls.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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>
-            <return>
-                <active>true</active>
-                <firewallId>firewall-id2</firewallId>
-                <firewallRules>
-                    <firewallRuleId>firewall-rule-id2</firewallRuleId>
-                    <name>name</name>
-                    <portRangeEnd>56789</portRangeEnd>
-                    <portRangeStart>23456</portRangeStart>
-                    <protocol>TCP</protocol>
-                    <sourceIp>192.168.0.2</sourceIp>
-                    <sourceMac>aa:bb:cc:dd:ee:ff</sourceMac>
-                    <targetIp>192.168.0.3</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-labs/blob/93aff921/profitbricks/src/test/resources/image/image-not-found.xml
----------------------------------------------------------------------
diff --git a/profitbricks/src/test/resources/image/image-not-found.xml b/profitbricks/src/test/resources/image/image-not-found.xml
deleted file mode 100644
index 98c9f3e..0000000
--- a/profitbricks/src/test/resources/image/image-not-found.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 : 16361390. [VDC-6-404] The requested image 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 : 16361390. [VDC-6-404] The requested image does not exist or already deleted by the users. ResourceId random-non-existing-id</message>
-                    <requestId>16361390</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-labs/blob/93aff921/profitbricks/src/test/resources/image/image.xml
----------------------------------------------------------------------
diff --git a/profitbricks/src/test/resources/image/image.xml b/profitbricks/src/test/resources/image/image.xml
deleted file mode 100644
index 0e56bad..0000000
--- a/profitbricks/src/test/resources/image/image.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<S:Envelope xmlns:S="http://schemas.xmlsoap.org/soap/envelope/">
-    <S:Body>
-        <ns2:getImageResponse xmlns:ns2="http://ws.api.profitbricks.com/">
-            <return>
-                <bootable>true</bootable>
-                <cpuHotPlug>true</cpuHotPlug>
-                <cpuHotUnPlug>false</cpuHotUnPlug>
-                <discVirtioHotPlug>true</discVirtioHotPlug>
-                <discVirtioHotUnPlug>true</discVirtioHotUnPlug>
-                <imageId>5ad99c9e-9166-11e4-9d74-52540066fee9</imageId>
-                <imageName>Ubuntu-14.04-LTS-server-2015-01-01</imageName>
-                <imageSize>2048</imageSize>
-                <imageType>HDD</imageType>
-                <location>us/las</location>
-                <nicHotPlug>true</nicHotPlug>
-                <nicHotUnPlug>true</nicHotUnPlug>
-                <osType>LINUX</osType>
-                <public>true</public>
-                <ramHotPlug>true</ramHotPlug>
-                <ramHotUnPlug>false</ramHotUnPlug>
-                <writeable>true</writeable>
-            </return>
-        </ns2:getImageResponse>
-    </S:Body>
-</S:Envelope>
\ No newline at end of file