You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ad...@apache.org on 2014/10/24 06:10:35 UTC

[2/8] JCLOUDS-757 drop fgcp provider.

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/SystemTemplateApiExpectTest.java
----------------------------------------------------------------------
diff --git a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/SystemTemplateApiExpectTest.java b/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/SystemTemplateApiExpectTest.java
deleted file mode 100644
index b023fa1..0000000
--- a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/SystemTemplateApiExpectTest.java
+++ /dev/null
@@ -1,96 +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.fujitsu.fgcp.services;
-
-import static org.testng.Assert.assertNotNull;
-
-import org.jclouds.fujitsu.fgcp.domain.VSystemDescriptor;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "SystemTemplateApiExpectTest", singleThreaded = true)
-public class SystemTemplateApiExpectTest extends BaseFGCPRestApiExpectTest {
-
-   public void testGet() {
-      HttpRequest request = buildGETWithQuery("Action=GetVSYSDescriptorConfiguration"
-            + "&vsysDescriptorId=3-tier%20Skeleton");
-      HttpResponse response = HttpResponse
-            .builder()
-            .statusCode(200)
-            .payload(
-                  payloadFromResource("/GetVSYSDescriptorConfiguration-response.xml"))
-            .build();
-      SystemTemplateApi client = requestSendsResponse(request, response)
-            .getSystemTemplateApi();
-
-      VSystemDescriptor desc = client.get("3-tier Skeleton");
-      assertNotNull(desc, "desc");
-//      assertEquals(desc.)
-   }
-
-
-   public void testUpdate() {
-      HttpRequest request = buildGETWithQuery("Action=UpdateVSYSDescriptorAttribute"
-            + "&vsysDescriptorId=3-tier%20Skeleton"
-            + "&updateLcId=en" + "&attributeName=updateName"
-            + "&attributeValue=new-name");
-      HttpResponse response = HttpResponse
-            .builder()
-            .statusCode(200)
-            .payload(
-                  payloadFromResource("/UpdateVSYSDescriptorAttribute-response.xml"))
-            .build();
-
-      SystemTemplateApi api = requestSendsResponse(request, response)
-            .getSystemTemplateApi();
-
-      api.update("3-tier Skeleton", "en", "updateName", "new-name");
-   }
-
-   public void testDeregister() {
-      HttpRequest request = buildGETWithQuery("Action=UnregisterVSYSDescriptor"
-            + "&vsysDescriptorId=3-tier%20Skeleton");
-      HttpResponse response = HttpResponse
-            .builder()
-            .statusCode(200)
-            .payload(
-                  payloadFromResource("/UnregisterVSYSDescriptor-response.xml"))
-            .build();
-
-      SystemTemplateApi api = requestSendsResponse(request, response)
-            .getSystemTemplateApi();
-
-      api.deregister("3-tier Skeleton");
-   }
-
-   public void testDeregisterPrivateTemplate() {
-      HttpRequest request = buildGETWithQuery("Action=UnregisterPrivateVSYSDescriptor"
-            + "&vsysDescriptorId=3-tier%20Skeleton");
-      HttpResponse response = HttpResponse
-            .builder()
-            .statusCode(200)
-            .payload(
-                  payloadFromResource("/UnregisterPrivateVSYSDescriptor-response.xml"))
-            .build();
-
-      SystemTemplateApi api = requestSendsResponse(request, response)
-            .getSystemTemplateApi();
-
-      api.deregisterPrivateTemplate("3-tier Skeleton");
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/VirtualDCApiExpectTest.java
----------------------------------------------------------------------
diff --git a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/VirtualDCApiExpectTest.java b/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/VirtualDCApiExpectTest.java
deleted file mode 100644
index abdc492..0000000
--- a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/VirtualDCApiExpectTest.java
+++ /dev/null
@@ -1,202 +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.fujitsu.fgcp.services;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-
-import java.util.Map;
-import java.util.Set;
-
-import org.jclouds.fujitsu.fgcp.domain.AddressRange;
-import org.jclouds.fujitsu.fgcp.domain.DiskImage;
-import org.jclouds.fujitsu.fgcp.domain.EventLog;
-import org.jclouds.fujitsu.fgcp.domain.PublicIP;
-import org.jclouds.fujitsu.fgcp.domain.ServerType;
-import org.jclouds.fujitsu.fgcp.domain.VSystem;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "VirtualDCApiExpectTest", singleThreaded = true)
-public class VirtualDCApiExpectTest extends BaseFGCPRestApiExpectTest {
-
-   public void testListVirtualSystems() {
-      HttpRequest request = buildGETWithQuery("Action=ListVSYS");
-      HttpResponse response = HttpResponse.builder()
-            .statusCode(200)
-            .payload(payloadFromResource("/ListVSYS-response.xml"))
-            .build();
-
-      VirtualDCApi api = requestSendsResponse(request, response).getVirtualDCApi();
-
-      Set<VSystem> vsysSet = api.listVirtualSystems();
-      assertEquals(vsysSet.size(), 2);
-   }
-
-   public void testCreateVirtualSystem() {
-      HttpRequest request = buildGETWithQuery("Action=CreateVSYS&vsysDescriptorId=myDescId&vsysName=myVSYS");
-      HttpResponse response = HttpResponse.builder()
-            .statusCode(200)
-            .payload(payloadFromResource("/CreateVSYS-response.xml"))
-            .build();
-      VirtualDCApi api = requestSendsResponse(request, response)
-            .getVirtualDCApi();
-
-      String vsysId = api.createVirtualSystem("myDescId", "myVSYS");
-      assertEquals(vsysId, "CONTRACT-VSYS00001", "vsysId: " + vsysId);
-   }
-
-
-   public void testListServerTypes() {
-      HttpRequest request = buildGETWithQuery("Action=ListServerType&diskImageId=dummy");
-      HttpResponse response = HttpResponse.builder()
-            .statusCode(200)
-            .payload(payloadFromResource("/ListServerType-response.xml"))
-            .build();
-      VirtualDCApi api = requestSendsResponse(request, response)
-            .getVirtualDCApi();
-
-      Set<ServerType> serverTypes = api.listServerTypes();
-      assertNotNull(serverTypes, "serverTypes");
-      assertEquals(serverTypes.size(), 4,
-            "Unexpected number of server types: " + serverTypes.size());
-   }
-
-   public void testListPublicIPs() {
-      HttpRequest request = buildGETWithQuery("Action=ListPublicIP");
-      HttpResponse response = HttpResponse.builder()
-            .statusCode(200)
-            .payload(payloadFromResource("/ListPublicIP-response.xml"))
-            .build();
-      VirtualDCApi api = requestSendsResponse(request, response)
-            .getVirtualDCApi();
-
-      Map<PublicIP, String> ips = api.listPublicIPs();
-
-      assertNotNull(ips, "ips");
-      assertEquals(ips.size(), 2, "Unexpected number of ips: " + ips.size());
-      assertEquals(ips.keySet().size(), 2, "Unexpected number of ips: " + ips.size());
-      assertTrue(ips.containsValue("ABCDEFGH-A123B456CE"), "missing system id");
-      assertEquals(ips.keySet().iterator().next().getVersion(), PublicIP.Version.IPv4);
-   }
-
-   public void testListDiskImages() {
-      HttpRequest request = buildGETWithQuery("Action=ListDiskImage");
-      HttpResponse response = HttpResponse.builder()
-            .statusCode(200)
-            .payload(payloadFromResource("/ListDiskImages-response.xml"))
-            .build();
-      VirtualDCApi api = requestSendsResponse(request, response)
-            .getVirtualDCApi();
-
-      Set<DiskImage> images = api.listDiskImages();
-
-      assertNotNull(images, "images");
-      assertTrue(images.size() > 5, "Unexpected number of images: " + images.size());
-   }
-
-   public void testListDiskImage() {
-      HttpRequest request = buildGETWithQuery("Action=ListDiskImage&vsysDescriptorId=IMG_A1B2C3_1234567890ABCD");
-      HttpResponse response = HttpResponse.builder()
-            .statusCode(200)
-            .payload(payloadFromResource("/ListDiskImage-response.xml"))
-            .build();
-      VirtualDCApi api = requestSendsResponse(request, response)
-            .getVirtualDCApi();
-
-      Set<DiskImage> images = api.listDiskImages(null, "IMG_A1B2C3_1234567890ABCD");
-
-      assertNotNull(images, "images");
-      assertEquals(1, images.size(), "Unexpected number of images: " + images.size());
-   }
-
-   public void testGetAddressRange() {
-      HttpRequest request = buildGETWithQuery("Action=GetAddressRange");
-      HttpResponse response = HttpResponse.builder()
-            .statusCode(200)
-            .payload(payloadFromResource("/GetAddressRange-response.xml"))
-            .build();
-      VirtualDCApi api = requestSendsResponse(request, response)
-            .getVirtualDCApi();
-
-      Set<AddressRange> range = api.getAddressRange();
-      assertNotNull(range);
-      assertEquals(range.size(), 1);
-   }
-
-   public void testAddAddressRange() {
-      HttpRequest request = buildGETWithQuery("Action=AddAddressRange"
-            + "&pipFrom=192.168.0.0"
-            + "&pipTo=192.168.30.0");
-      HttpResponse response = HttpResponse.builder()
-            .statusCode(200)
-            .payload(payloadFromResource("/AddAddressRange-response.xml"))
-            .build();
-      VirtualDCApi api = requestSendsResponse(request, response)
-            .getVirtualDCApi();
-
-      api.addAddressRange("192.168.0.0", "192.168.30.0");
-   }
-
-   public void testDeleteAddressRange() {
-      HttpRequest request = buildGETWithQuery("Action=DeleteAddressRange"
-            + "&pipFrom=192.168.0.0"
-            + "&pipTo=192.168.30.0");
-      HttpResponse response = HttpResponse.builder()
-            .statusCode(200)
-            .payload(payloadFromResource("/DeleteAddressRange-response.xml"))
-            .build();
-      VirtualDCApi api = requestSendsResponse(request, response)
-            .getVirtualDCApi();
-
-      api.deleteAddressRange("192.168.0.0", "192.168.30.0");
-   }
-
-   public void testCreateAddressPool() {
-      HttpRequest request = buildGETWithQuery("Action=CreateAddressPool"
-            + "&pipFrom=192.168.0.0"
-            + "&pipTo=192.168.30.0");
-      HttpResponse response = HttpResponse.builder()
-            .statusCode(200)
-            .payload(payloadFromResource("/CreateAddressPool-response.xml"))
-            .build();
-      VirtualDCApi api = requestSendsResponse(request, response)
-            .getVirtualDCApi();
-
-      api.createAddressPool("192.168.0.0", "192.168.30.0");
-   }
-
-   public void testGetEventLog() {
-      HttpRequest request = buildGETWithQuery("Action=GetEventLog");
-      HttpResponse response = HttpResponse.builder()
-            .statusCode(200)
-            .payload(payloadFromResource("/GetEventLog-response.xml"))
-            .build();
-      VirtualDCApi api = requestSendsResponse(request, response)
-            .getVirtualDCApi();
-
-      Set<EventLog> logs = api.getEventLogs();
-      assertNotNull(logs);
-      //TODO: get one with several
-//      assertEquals(logs.size(), 1);
-   }
-
-
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/VirtualDCApiLiveTest.java
----------------------------------------------------------------------
diff --git a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/VirtualDCApiLiveTest.java b/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/VirtualDCApiLiveTest.java
deleted file mode 100644
index ed9a6c4..0000000
--- a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/VirtualDCApiLiveTest.java
+++ /dev/null
@@ -1,64 +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.fujitsu.fgcp.services;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-
-import java.util.Set;
-
-import org.jclouds.fujitsu.fgcp.domain.ServerType;
-import org.jclouds.fujitsu.fgcp.domain.VSystem;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", enabled = true, singleThreaded = true, testName = "VirtualDCApiLiveTest")
-public class VirtualDCApiLiveTest extends BaseFGCPApiLiveTest {
-
-   public void testListVirtualSystems() {
-/*      Properties overrides = setupProperties();
-      RestContext<FGCPClient, FGCPAsyncClientTest> context = new RestContextFactory().createContext(provider, ImmutableSet.<Module> of(new Log4JLoggingModule()),
-            overrides);*/
-
-      Set<VSystem> vsysSet = api.getVirtualDCApi().listVirtualSystems();
-      assertNotNull(vsysSet, "vsysSet");
-      assertTrue(!vsysSet.isEmpty(), "vsysSet.size() should be greater than 0");
-      for (VSystem vsys : vsysSet) {
-         System.out.println(vsys);
-      }
-   }
-
-/*   public void testCreateVirtualSystem() {
-      String vsysId = vdcApi.createVirtualSystem("abc", "def");
-
-      assertNotNull(vsysId, "vsysId");
-      assertNotEquals("", vsysId, "vsysId is empty (\"\")");
-      System.out.println("vsysId: " + vsysId);
-   }*/
-
-   public void testListServerTypes() {
-      Set<ServerType> serverTypes = api.getVirtualDCApi().listServerTypes();
-
-      assertNotNull(serverTypes, "serverTypes");
-      assertEquals(4, serverTypes.size(), "serverTypes.size should return 4, not " + serverTypes.size());
-
-//      System.out.println("listServerTypes: " + serverTypes);
-   }
-
-
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/VirtualServerApiExpectTest.java
----------------------------------------------------------------------
diff --git a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/VirtualServerApiExpectTest.java b/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/VirtualServerApiExpectTest.java
deleted file mode 100644
index 678924e..0000000
--- a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/VirtualServerApiExpectTest.java
+++ /dev/null
@@ -1,216 +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.fujitsu.fgcp.services;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.AssertJUnit.assertNotNull;
-
-import org.jclouds.fujitsu.fgcp.domain.VServerStatus;
-import org.jclouds.fujitsu.fgcp.domain.VServerWithDetails;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "VirtualServerApiExpectTest", singleThreaded = true)
-public class VirtualServerApiExpectTest extends BaseFGCPRestApiExpectTest {
-
-   public void testStart() {
-      HttpRequest request = buildGETWithQuery("Action=StartVServer"
-            + "&vserverId=CONTRACT-VSYS00001-S-0005"
-            + "&vsysId=CONTRACT-VSYS00001");
-      HttpResponse response = HttpResponse.builder().statusCode(200)
-            .payload(payloadFromResource("/StartVServer-response.xml"))
-            .build();
-
-      VirtualServerApi api = requestSendsResponse(request, response)
-            .getVirtualServerApi();
-
-      api.start("CONTRACT-VSYS00001-S-0005");
-   }
-
-   public void testStop() {
-      HttpRequest request = buildGETWithQuery("Action=StopVServer"
-            + "&vserverId=CONTRACT-VSYS00001-S-0005"
-            + "&vsysId=CONTRACT-VSYS00001");
-      HttpResponse response = HttpResponse.builder().statusCode(200)
-            .payload(payloadFromResource("/StopVServer-response.xml"))
-            .build();
-
-      VirtualServerApi api = requestSendsResponse(request, response)
-            .getVirtualServerApi();
-
-      api.stop("CONTRACT-VSYS00001-S-0005");
-   }
-
-   public void testStopForcefully() {
-      HttpRequest request = buildGETWithQuery("Action=StopVServer"
-            + "&force=true"
-            + "&vserverId=CONTRACT-VSYS00001-S-0005"
-            + "&vsysId=CONTRACT-VSYS00001");
-      HttpResponse response = HttpResponse.builder().statusCode(200)
-            .payload(payloadFromResource("/StopVServer-response.xml"))
-            .build();
-
-      VirtualServerApi api = requestSendsResponse(request, response)
-            .getVirtualServerApi();
-
-      api.stopForcefully("CONTRACT-VSYS00001-S-0005");
-   }
-
-   public void testDestroy() {
-      HttpRequest request = buildGETWithQuery("Action=DestroyVServer"
-            + "&vserverId=CONTRACT-VSYS00001-S-0005"
-            + "&vsysId=CONTRACT-VSYS00001");
-      HttpResponse response = HttpResponse.builder().statusCode(200)
-            .payload(payloadFromResource("/DestroyVServer-response.xml"))
-            .build();
-
-      VirtualServerApi api = requestSendsResponse(request, response)
-            .getVirtualServerApi();
-
-      api.destroy("CONTRACT-VSYS00001-S-0005");
-   }
-
-   public void testGet() {
-      HttpRequest request = buildGETWithQuery("Action=GetVServerAttributes"
-            + "&vserverId=CONTRACT-VSYS00001-S-0005"
-            + "&vsysId=CONTRACT-VSYS00001");
-      HttpResponse response = HttpResponse
-            .builder()
-            .statusCode(200)
-            .payload(
-                  payloadFromResource("/GetVServerAttributes-response.xml"))
-            .build();
-
-      VirtualServerApi api = requestSendsResponse(request, response)
-            .getVirtualServerApi();
-
-      assertNotNull(api.get("CONTRACT-VSYS00001-S-0005"));
-   }
-
-   public void testGetDetails() {
-      HttpRequest request = buildGETWithQuery("Action=GetVServerConfiguration"
-            + "&vserverId=CONTRACT-VSYS00001-S-0005"
-            + "&vsysId=CONTRACT-VSYS00001");
-      HttpResponse response = HttpResponse
-            .builder()
-            .statusCode(200)
-            .payload(
-                  payloadFromResource("/GetVServerConfiguration-response.xml"))
-            .build();
-
-      VirtualServerApi api = requestSendsResponse(request, response)
-            .getVirtualServerApi();
-
-      VServerWithDetails server = api.getDetails("CONTRACT-VSYS00001-S-0005");
-      assertNotNull(server);
-      assertEquals(server.getId(), "CONTRACT-VSYS00001-S-0005");
-      assertEquals(server.getVnics().iterator().next().getNicNo(), 0);
-      assertEquals(server.getVnics().iterator().next().getPrivateIp(), "192.168.4.13");
-      assertEquals(server.getVnics().iterator().next().getNetworkId(), "CONTRACT-VSYS00001-N-DMZ");
-      assertEquals(server.getImage().getId(), "IMG_A1B2C3_1234567890ABCD");
-      assertEquals(server.getImage().getSysvolSize(), 10.0f);
-   }
-
-   public void testGetStatus() {
-      HttpRequest request = buildGETWithQuery("Action=GetVServerStatus"
-            + "&vserverId=CONTRACT-VSYS00001-S-0005"
-            + "&vsysId=CONTRACT-VSYS00001");
-      HttpResponse response = HttpResponse
-            .builder()
-            .statusCode(200)
-            .payload(
-                  payloadFromResource("/GetVServerStatus-response.xml"))
-            .build();
-
-      VirtualServerApi api = requestSendsResponse(request, response)
-            .getVirtualServerApi();
-
-      assertEquals(api.getStatus("CONTRACT-VSYS00001-S-0005"), VServerStatus.STOPPED);
-   }
-
-   public void testInitialPassword() {
-      HttpRequest request = buildGETWithQuery("Action=GetVServerInitialPassword"
-            + "&vserverId=CONTRACT-VSYS00001-S-0005"
-            + "&vsysId=CONTRACT-VSYS00001");
-      HttpResponse response = HttpResponse
-            .builder()
-            .statusCode(200)
-            .payload(
-                  payloadFromResource("/GetVServerInitialPassword-response.xml"))
-            .build();
-
-      VirtualServerApi api = requestSendsResponse(request, response)
-            .getVirtualServerApi();
-
-      assertEquals(api.getInitialPassword("CONTRACT-VSYS00001-S-0005"), "mySecretpwd1");
-   }
-
-   public void testUpdate() {
-      HttpRequest request = buildGETWithQuery("Action=UpdateVServerAttribute"
-            + "&vserverId=CONTRACT-VSYS00001-S-0005"
-            + "&attributeName=vserverName"
-            + "&attributeValue=new%20name"
-            + "&vsysId=CONTRACT-VSYS00001");
-      HttpResponse response = HttpResponse
-            .builder()
-            .statusCode(200)
-            .payload(
-                  payloadFromResource("/UpdateVServerAttribute-response.xml"))
-            .build();
-
-      VirtualServerApi api = requestSendsResponse(request, response)
-            .getVirtualServerApi();
-
-      api.update("CONTRACT-VSYS00001-S-0005", "vserverName", "new name");
-   }
-
-   public void testAttachDisk() {
-      HttpRequest request = buildGETWithQuery("Action=AttachVDisk"
-            + "&vserverId=CONTRACT-VSYS00001-S-0005"
-            + "&vdiskId=CONTRACT-VSYS00001-D-0001"
-            + "&vsysId=CONTRACT-VSYS00001");
-      HttpResponse response = HttpResponse.builder().statusCode(200)
-            .payload(payloadFromResource("/AttachVDisk-response.xml"))
-            .build();
-
-      VirtualServerApi api = requestSendsResponse(request, response)
-            .getVirtualServerApi();
-
-      api.attachDisk("CONTRACT-VSYS00001-S-0005", "CONTRACT-VSYS00001-D-0001");
-   }
-
-/*   public void testGetPerformanceInformation() {
-      HttpRequest request = buildGETWithQuery("Action=GetPerformanceInformation"
-            + "&serverId=CONTRACT-VSYS00001-S-0005"
-            + "&interval=10minute"
-            + "&vsysId=CONTRACT-VSYS00001");
-      HttpResponse response = HttpResponse
-            .builder()
-            .statusCode(200)
-            .payload(
-                  payloadFromResource("/GetPerformanceInformation-response.xml"))
-            .build();
-
-      VirtualServerApi api = requestSendsResponse(request, response)
-            .getVirtualServerApi();
-
-      assertNotNull(api.getPerformanceInformation(
-            "CONTRACT-VSYS00001-S-0005", "10minute"));
-   }
-*/
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/VirtualSystemApiExpectTest.java
----------------------------------------------------------------------
diff --git a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/VirtualSystemApiExpectTest.java b/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/VirtualSystemApiExpectTest.java
deleted file mode 100644
index 618ba38..0000000
--- a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/services/VirtualSystemApiExpectTest.java
+++ /dev/null
@@ -1,252 +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.fujitsu.fgcp.services;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-
-import java.util.Set;
-
-import org.jclouds.fujitsu.fgcp.domain.BuiltinServer;
-import org.jclouds.fujitsu.fgcp.domain.PublicIP;
-import org.jclouds.fujitsu.fgcp.domain.VDisk;
-import org.jclouds.fujitsu.fgcp.domain.VServer;
-import org.jclouds.fujitsu.fgcp.domain.VSystem;
-import org.jclouds.fujitsu.fgcp.domain.VSystemStatus;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "VirtualSystemApiExpectTest", singleThreaded = true)
-public class VirtualSystemApiExpectTest extends BaseFGCPRestApiExpectTest {
-
-   public void testGet() {
-      HttpRequest request = buildGETWithQuery("Action=GetVSYSAttributes&vsysId=ABCDEFGH-A123B456CE");
-      HttpResponse response = HttpResponse
-            .builder()
-            .statusCode(200)
-            .payload(
-                  payloadFromResource("/GetVSYSAttributes-response.xml"))
-            .build();
-      VirtualSystemApi api = requestSendsResponse(request, response)
-            .getVirtualSystemApi();
-
-      VSystem system = api.get("ABCDEFGH-A123B456CE");
-      assertNotNull(system, "system");
-   }
-
-   public void testGetDetails() {
-      HttpRequest request = buildGETWithQuery("Action=GetVSYSConfiguration&vsysId=ABCDEFGH-A123B456CE");
-      HttpResponse response = HttpResponse
-            .builder()
-            .statusCode(200)
-            .payload(
-                  payloadFromResource("/GetVSYSConfiguration-response.xml"))
-            .build();
-      VirtualSystemApi api = requestSendsResponse(request, response)
-            .getVirtualSystemApi();
-
-      VSystem system = api.getDetails("ABCDEFGH-A123B456CE");
-      assertNotNull(system, "system");
-   }
-
-   public void testGetStatus() {
-      HttpRequest request = buildGETWithQuery("Action=GetVSYSStatus"
-            + "&vsysId=ABCDEFGH-A123B456CE");
-      HttpResponse response = HttpResponse.builder().statusCode(200)
-            .payload(payloadFromResource("/GetVSYSStatus-response.xml"))
-            .build();
-      VirtualSystemApi api = requestSendsResponse(request, response)
-            .getVirtualSystemApi();
-
-      assertEquals(api.getStatus("ABCDEFGH-A123B456CE"), VSystemStatus.NORMAL);
-   }
-
-   public void testUpdate() {
-      HttpRequest request = buildGETWithQuery("Action=UpdateVSYSAttribute"
-            + "&vsysId=ABCDEFGH-A123B456CE"
-            + "&attributeName=updateName" + "&attributeValue=new-name");
-      HttpResponse response = HttpResponse
-            .builder()
-            .statusCode(200)
-            .payload(
-                  payloadFromResource("/UpdateVDiskAttribute-response.xml"))
-            .build();
-
-      VirtualSystemApi api = requestSendsResponse(request, response)
-            .getVirtualSystemApi();
-
-      api.update("ABCDEFGH-A123B456CE", "updateName", "new-name");
-   }
-
-   public void testListPublicIPs() {
-      HttpRequest request = buildGETWithQuery("Action=ListPublicIP"
-            + "&vsysId=ABCDEFGH-A123B456CE");
-      HttpResponse response = HttpResponse
-            .builder()
-            .statusCode(200)
-            .payload(
-                  payloadFromResource("/ListPublicIP_one_vsys-response.xml"))
-            .build();
-      VirtualSystemApi api = requestSendsResponse(request, response)
-            .getVirtualSystemApi();
-
-      Set<PublicIP> ips = api.listPublicIPs("ABCDEFGH-A123B456CE");
-      assertNotNull(ips, "ips");
-      assertEquals(2, ips.size(), "Unexpected number of ips: " + ips.size());
-      assertEquals(ips.iterator().next().getVersion(), PublicIP.Version.IPv4);
-   }
-
-   public void testListServers() {
-      HttpRequest request = buildGETWithQuery("Action=ListVServer"
-            + "&vsysId=ABCDEFGH-A123B456CE");
-      HttpResponse response = HttpResponse
-            .builder()
-            .statusCode(200)
-            .payload(
-                  payloadFromResource("/ListVServer-response.xml"))
-            .build();
-      VirtualSystemApi api = requestSendsResponse(request, response)
-            .getVirtualSystemApi();
-
-      Set<VServer> servers = api.listServers("ABCDEFGH-A123B456CE");
-      assertNotNull(servers, "servers");
-      assertEquals(servers.size(), 2);
-   }
-
-   public void testDisks() {
-      HttpRequest request = buildGETWithQuery("Action=ListVDisk"
-            + "&vsysId=ABCDEFGH-A123B456CE");
-      HttpResponse response = HttpResponse
-            .builder()
-            .statusCode(200)
-            .payload(
-                  payloadFromResource("/ListVDisk-response.xml"))
-            .build();
-      VirtualSystemApi api = requestSendsResponse(request, response)
-            .getVirtualSystemApi();
-
-      Set<VDisk> disks = api.listDisks("ABCDEFGH-A123B456CE");
-      assertNotNull(disks, "disks");
-      assertEquals(disks.size(), 1);
-   }
-
-   public void testListBuiltinServers() {
-      HttpRequest request = buildGETWithQuery("Action=ListEFM"
-            + "&vsysId=ABCDEFGH-A123B456CE" + "&efmType=FW");
-      HttpResponse response = HttpResponse
-            .builder()
-            .statusCode(200)
-            .payload(
-                  payloadFromResource("/ListEFM-response.xml"))
-            .build();
-      VirtualSystemApi api = requestSendsResponse(request, response)
-            .getVirtualSystemApi();
-
-      Set<BuiltinServer> fws = api.listBuiltinServers("ABCDEFGH-A123B456CE", "FW");
-      assertNotNull(fws, "fws");
-      assertEquals(fws.size(), 1);
-   }
-
-   public void testAllocatePublicIP() {
-      HttpRequest request = buildGETWithQuery("Action=AllocatePublicIP&vsysId=ABCDEFGH-A123B456CE");
-      HttpResponse response = HttpResponse
-            .builder()
-            .statusCode(200)
-            .payload(
-                  payloadFromResource("/AllocatePublicIP-response.xml"))
-            .build();
-      VirtualSystemApi api = requestSendsResponse(request, response)
-            .getVirtualSystemApi();
-
-      api.allocatePublicIP("ABCDEFGH-A123B456CE");
-   }
-
-   public void testCreateBuiltinServer() {
-      HttpRequest request = buildGETWithQuery("Action=CreateEFM"
-            + "&efmType=SLB"
-            + "&efmName=web%20load%20balancer"
-            + "&networkId=ABCDEFGH-A123B456CE-N-DMZ"
-            + "&vsysId=ABCDEFGH-A123B456CE");
-      HttpResponse response = HttpResponse
-            .builder()
-            .statusCode(200)
-            .payload(
-                  payloadFromResource("/CreateEFM-response.xml"))
-            .build();
-      VirtualSystemApi api = requestSendsResponse(request, response)
-            .getVirtualSystemApi();
-
-      String id = api.createBuiltinServer("web load balancer",
-            "ABCDEFGH-A123B456CE-N-DMZ");
-      assertEquals(id, "CONTRACT-EFM00001");
-   }
-
-   public void testCreateServer() {
-      HttpRequest request = buildGETWithQuery("Action=CreateVServer"
-            + "&vserverName=vm1"
-            + "&vserverType=economy"
-            + "&diskImageId=IMG_A1B2C3_1234567890ABCD"
-            + "&networkId=ABCDEFGH-A123B456CE-N-DMZ"
-            + "&vsysId=ABCDEFGH-A123B456CE");
-      HttpResponse response = HttpResponse
-            .builder()
-            .statusCode(200)
-            .payload(
-                  payloadFromResource("/CreateVServer-response.xml"))
-            .build();
-      VirtualSystemApi api = requestSendsResponse(request, response)
-            .getVirtualSystemApi();
-
-      String id = api.createServer("vm1", "economy", "IMG_A1B2C3_1234567890ABCD",
-            "ABCDEFGH-A123B456CE-N-DMZ");
-      assertEquals(id, "ABCDEFGH-A123B456CE-S-0007");
-   }
-
-   public void testCreateDisk() {
-      HttpRequest request = buildGETWithQuery("Action=CreateVDisk"
-            + "&vsysId=ABCDEFGH-A123B456CE" + "&vdiskName=disk1"
-            + "&size=10");
-      HttpResponse response = HttpResponse
-            .builder()
-            .statusCode(200)
-            .payload(
-                  payloadFromResource("/CreateVDisk-response.xml"))
-            .build();
-      VirtualSystemApi api = requestSendsResponse(request, response)
-            .getVirtualSystemApi();
-
-      String id = api.createDisk("ABCDEFGH-A123B456CE", "disk1", 10);
-      assertEquals(id, "ABCDEFGH-A123B456CE-S-0006");
-   }
-
-/*
-   public void testRegisterAsPrivateImage() {
-      HttpRequest request = buildGETWithQuery("Action=AllocatePublicIP&vsysId=ABCDEFGH-A123B456CE");
-      HttpResponse response = HttpResponse
-            .builder()
-            .statusCode(200)
-            .payload(
-                  payloadFromResource("/AllocatePublicIP-response.xml"))
-            .build();
-      VirtualSystemApi api = requestSendsResponse(request, response)
-            .getVirtualSystemApi();
-
-      api.registerAsPrivateVSYSDescriptor("ABCDEFGH-A123B456CE");
-   }
-*/
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/certs/jclouds-test-fgcp.p12
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/certs/jclouds-test-fgcp.p12 b/fgcp/src/test/resources/certs/jclouds-test-fgcp.p12
deleted file mode 100644
index 6ff5786..0000000
Binary files a/fgcp/src/test/resources/certs/jclouds-test-fgcp.p12 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/certs/jclouds-test-fgcp.pem
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/certs/jclouds-test-fgcp.pem b/fgcp/src/test/resources/certs/jclouds-test-fgcp.pem
deleted file mode 100644
index 33da396..0000000
--- a/fgcp/src/test/resources/certs/jclouds-test-fgcp.pem
+++ /dev/null
@@ -1,35 +0,0 @@
-Bag Attributes
-    friendlyName: test-fgcp
-    localKeyID: 54 69 6D 65 20 31 33 32 36 36 38 34 30 33 32 34 35 31 
-Key Attributes: <No Attributes>
------BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQCHj9j4voqoMfTVvsAUjxoJYCz9cXpmRzkPwoxOOP99bc+xnIEe
-K8jOVrlCy0Zwr0fr+PZT15RX8tAzg69kP7WLiVBqYeW7TKZ+9b+HgxUvDd6aaj1C
-SVdgHyQPmpcBLe2E2ADvbeEWYFiqhm5ms8Qes/Hb7S5Ct/Ux4R9UUrDnYQIDAQAB
-AoGABkxrs1r/DEON8aR0PkBL4GWkkX4FRt1GTHIonLXPQR+qB8GSyjkUkmm7H9xc
-AH5UZCVkJI8eqFtyywHyU0EWiTyd3pjkXIuWPcmtydTN3LwY6UZww07g7cAjQNsw
-cSXDXfmpAWNoavJWsjd7EUQ1VnnJMDo8A3Jj8BgvF7mTlZUCQQDdMmmOJNBRmbZP
-i9jfuggupIHNoJEyI8hQM1LQdyDYMojFZ/hz09vzuWzO1J4XpHtCa2Vuxq9hvC5R
-6jKmcTI3AkEAnOQkvv2/2x7T6+7zx53xqFuGjHeNjuaHqTENoT2Gh0oug4IX0HPE
-PTw9yVDqDCQe72jeSZZDLpejdF9tcyNHJwJBAIOkC/PfbucRXtGqfdBwK4xutR2G
-UMMRTpaEZOXR8Aca1BD/1npAfKdpFBtnqAqUBhM6TSyHLDszPjHb+nbZ6TMCQGEM
-Mrq9xd6qDBbmQX+Z8LDepLThAvyBFyuOP0sc/slTFsCcSVTVN29VgzazSYNnGIep
-S88jFr2MaTyEBvTwvoMCQE9ZWyYcmpkHxH5X5j6Bpf+ksY6eLnlH/YSOa9Hw8vZY
-SR2RvvhAa4UovUoyYJ3p0U/pO/h/W0p5TxIA3V+y7CY=
------END RSA PRIVATE KEY-----
-Bag Attributes
-    friendlyName: CN=localhost
-    localKeyID: 54 69 6D 65 20 31 33 32 36 36 38 34 30 33 32 34 35 31 
-subject=/CN=localhost
-issuer=/CN=localhost
------BEGIN CERTIFICATE-----
-MIIBnzCCAQigAwIBAgIETxOXgDANBgkqhkiG9w0BAQUFADAUMRIwEAYDVQQDEwls
-b2NhbGhvc3QwHhcNMTIwMTE2MDMyMDMyWhcNMjcwMTEyMDMyMDMyWjAUMRIwEAYD
-VQQDEwlsb2NhbGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAIeP2Pi+
-iqgx9NW+wBSPGglgLP1xemZHOQ/CjE44/31tz7GcgR4ryM5WuULLRnCvR+v49lPX
-lFfy0DODr2Q/tYuJUGph5btMpn71v4eDFS8N3ppqPUJJV2AfJA+alwEt7YTYAO9t
-4RZgWKqGbmazxB6z8dvtLkK39THhH1RSsOdhAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-gYEANbfXtBVCUIZiQCU5LP/vKoKZMpE5X6s+kDqTJ3vntuczkN0qFWKIi9WABwAa
-/Aq2IffJIu6rZgWchJqhN7+PeVOTfh9xRWE7QFHDrsuBYaicrki7RB1kKCQLtUpD
-aZB5xlm5FhT2Hzkgkawdo5keD/+OcDqKVK2fEK8W6r61Spc=
------END CERTIFICATE-----

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/log4j.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/log4j.xml b/fgcp/src/test/resources/log4j.xml
deleted file mode 100644
index eb276c1..0000000
--- a/fgcp/src/test/resources/log4j.xml
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!--
-    For more configuration infromation and examples see the Apache
-    Log4j website: http://logging.apache.org/log4j/
--->
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
-    <!-- ================================= -->
-    <!-- Preserve messages in A local file -->
-    <!-- ================================= -->
-
-    <!-- A time/date based rolling appender -->
-    <appender name="WIREFILE" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="File" value="/opt/jclouds-wire.log"/>
-        <param name="Append" value="true"/>
-
-        <!-- Rollover at midnight each day -->
-        <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
-        <param name="Threshold" value="TRACE"/>
-
-        <layout class="org.apache.log4j.PatternLayout">
-            <!-- The default pattern: Date Priority [Category] Message\n -->
-            <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n"/>
-
-            <!--
-                The full pattern: Date MS Priority [Category]
-                (Thread:NDC) Message\n <param name="ConversionPattern"
-                value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
-            -->
-        </layout>
-    </appender>
-
-    <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
-
-        <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler"/>
-        <param name="File" value="/opt/fgcp.log"/>
-        <param name="Append" value="true"/>
-
-        <param name="Threshold" value="TRACE"/>
-
-        <!-- Rollover at midnight each day -->
-        <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
-        <layout class="org.apache.log4j.PatternLayout">
-            <!-- The default pattern: Date Priority [Category] Message\n -->
-            <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
-
-        </layout>
-    </appender>
-
-    <appender name="SSHFILE" class="org.apache.log4j.DailyRollingFileAppender">
-
-        <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler"/>
-        <param name="File" value="/opt/fgcp-ssh.log"/>
-        <param name="Append" value="true"/>
-
-        <param name="Threshold" value="TRACE"/>
-
-        <!-- Rollover at midnight each day -->
-        <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
-        <layout class="org.apache.log4j.PatternLayout">
-            <!-- The default pattern: Date Priority [Category] Message\n -->
-            <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
-
-        </layout>
-    </appender>
-
-    <!-- ============================== -->
-    <!-- Append messages to the console -->
-    <!-- ============================== -->
-
-    <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-        <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler"/>
-        <param name="Target" value="System.out"/>
-        <param name="Threshold" value="DEBUG"/>
-
-        <layout class="org.apache.log4j.PatternLayout">
-            <!-- The default pattern: Date Priority [Category] Message\n -->
-            <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-        </layout>
-    </appender>
-
-    <!-- A time/date based rolling appender -->
-    <appender name="COMPUTEFILE" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="File" value="/opt/jclouds-compute.log"/>
-        <param name="Append" value="true"/>
-
-        <!-- Rollover at midnight each day -->
-        <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
-        <param name="Threshold" value="TRACE"/>
-
-        <layout class="org.apache.log4j.PatternLayout">
-            <!-- The default pattern: Date Priority [Category] Message\n -->
-            <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n"/>
-
-            <!--
-                The full pattern: Date MS Priority [Category]
-                (Thread:NDC) Message\n <param name="ConversionPattern"
-                value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
-            -->
-        </layout>
-    </appender>
-
-    <!-- A time/date based rolling appender -->
-    <appender name="GOOGLEINJECTFILE" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="File" value="/opt/jclouds-google-inject.log"/>
-        <param name="Append" value="true"/>
-
-        <!-- Rollover at midnight each day -->
-        <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
-        <param name="Threshold" value="TRACE"/>
-
-        <layout class="org.apache.log4j.PatternLayout">
-            <!-- The default pattern: Date Priority [Category] Message\n -->
-            <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n"/>
-
-        </layout>
-    </appender>
-
-    <appender name="ASYNCCOMPUTE" class="org.apache.log4j.AsyncAppender">
-        <appender-ref ref="COMPUTEFILE"/>
-    </appender>
-
-    <appender name="ASYNCSSH" class="org.apache.log4j.AsyncAppender">
-        <appender-ref ref="SSHFILE"/>
-    </appender>
-
-    <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
-        <appender-ref ref="FILE"/>
-    </appender>
-
-    <appender name="ASYNCWIRE" class="org.apache.log4j.AsyncAppender">
-        <appender-ref ref="WIREFILE"/>
-    </appender>
-
-    <appender name="GOOGLEINJECT" class="org.apache.log4j.AsyncAppender">
-        <appender-ref ref="GOOGLEINJECTFILE"/>
-    </appender>
-
-    <!-- ================ -->
-    <!-- Limit categories -->
-    <!-- ================ -->
-
-    <category name="org.jclouds.logging.internal">
-        <priority value="WARN"/>
-    </category>
-    <category name="org.apache.commons.httpclient">
-        <priority value="WARN"/>
-    </category>
-
-    <category name="org.jclouds">
-        <priority value="DEBUG"/>
-        <appender-ref ref="ASYNC"/>
-    </category>
-
-    <category name="jclouds.headers">
-        <priority value="DEBUG"/>
-        <appender-ref ref="ASYNCWIRE"/>
-    </category>
-
-    <category name="jclouds.ssh">
-        <priority value="DEBUG"/>
-        <appender-ref ref="ASYNCSSH"/>
-    </category>
-    <category name="jclouds.wire">
-        <priority value="DEBUG"/>
-        <appender-ref ref="ASYNCWIRE"/>
-    </category>
-    <category name="jclouds.compute">
-        <priority value="TRACE"/>
-        <appender-ref ref="ASYNCCOMPUTE"/>
-    </category>
-
-    <category name="com.google.inject">
-        <priority value="ALL"/>
-        <appender-ref ref="GOOGLEINJECT"/>
-    </category>
-
-    <!-- ======================= -->
-    <!-- Setup the Root category -->
-    <!-- ======================= -->
-
-    <root>
-        <appender-ref ref="FILE"/>
-        <appender-ref ref="CONSOLE"/>
-    </root>
-
-</log4j:configuration>

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/logback.xml b/fgcp/src/test/resources/logback.xml
deleted file mode 100644
index a4a6a3f..0000000
--- a/fgcp/src/test/resources/logback.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-<configuration scan="false" >
-    <appender name="FILE" class="ch.qos.logback.core.FileAppender">
-        <file>target/test-data/jclouds.log</file>
-
-        <encoder>
-            <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
-        </encoder>
-    </appender>
-
-    <appender name="WIREFILE" class="ch.qos.logback.core.FileAppender">
-        <file>target/test-data/jclouds-wire.log</file>
-
-        <encoder>
-            <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
-        </encoder>
-    </appender>
-
-    <appender name="COMPUTEFILE" class="ch.qos.logback.core.FileAppender">
-        <file>target/test-data/jclouds-compute.log</file>
-
-        <encoder>
-            <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
-        </encoder>
-    </appender>
-    
-    <appender name="SSHFILE" class="ch.qos.logback.core.FileAppender">
-        <file>target/test-data/jclouds-ssh.log</file>
-
-        <encoder>
-            <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
-        </encoder>
-    </appender>
-
-    <root>
-        <level value="warn" />
-    </root>
-
-    <logger name="org.jclouds">
-        <level value="DEBUG" />
-        <appender-ref ref="FILE" />
-    </logger>
-
-    <logger name="jclouds.wire">
-        <level value="DEBUG" />
-        <appender-ref ref="WIREFILE" />
-    </logger>
-
-    <logger name="jclouds.headers">
-        <level value="DEBUG" />
-        <appender-ref ref="WIREFILE" />
-    </logger>
-
-    <logger name="jclouds.compute">
-        <level value="DEBUG" />
-        <appender-ref ref="COMPUTEFILE" />
-    </logger>
-    
-    <logger name="jclouds.ssh">
-        <level value="DEBUG" />
-        <appender-ref ref="SSHFILE" />
-    </logger>
-
-</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/requests/CreateVSYS-request.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/requests/CreateVSYS-request.xml b/fgcp/src/test/resources/requests/CreateVSYS-request.xml
deleted file mode 100644
index 8dd318b..0000000
--- a/fgcp/src/test/resources/requests/CreateVSYS-request.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<OViSSRequest>
-  <Action>CreateVSYS</Action>
-  <vsysDescriptorId>myDescId</vsysDescriptorId>
-  <vsysName>myVSYS</vsysName>
-  <Version>2011-01-31</Version>
-  <Locale>en</Locale>
-  <AccessKeyId>R01ULTA5OjAwJjEyMzQ1Njc4OTAmMS4wJlNIQTF3aXRoUlNB</AccessKeyId>
-  <Signature>G2rGfLAkbq0IURQfXIWYxj3BnMGbjRk4KPnZLAze3Lt4SMMRt8lkjqKvR5Cm+nFpDN7J6IprVCCsIrRq5BqPeXT6xtWyb6qMNds2BAr1h/JePGs0UosOh2tgPUMSFlZwLVjgNyrSa2zeHA3AEHjF6H1jqcWXXqfCAD4SOHaNavk=</Signature>
-</OViSSRequest>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/AddAddressRange-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/AddAddressRange-response.xml b/fgcp/src/test/resources/responses/AddAddressRange-response.xml
deleted file mode 100644
index 81265be..0000000
--- a/fgcp/src/test/resources/responses/AddAddressRange-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<AddAddressRangeResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-</AddAddressRangeResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/AllocatePublicIP-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/AllocatePublicIP-response.xml b/fgcp/src/test/resources/responses/AllocatePublicIP-response.xml
deleted file mode 100644
index 4411beb..0000000
--- a/fgcp/src/test/resources/responses/AllocatePublicIP-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<AllocatePublicIPResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-</AllocatePublicIPResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/AttachPublicIP-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/AttachPublicIP-response.xml b/fgcp/src/test/resources/responses/AttachPublicIP-response.xml
deleted file mode 100644
index bcc457f..0000000
--- a/fgcp/src/test/resources/responses/AttachPublicIP-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<AttachPublicIPResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-</AttachPublicIPResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/AttachVDisk-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/AttachVDisk-response.xml b/fgcp/src/test/resources/responses/AttachVDisk-response.xml
deleted file mode 100644
index 0a38583..0000000
--- a/fgcp/src/test/resources/responses/AttachVDisk-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<AttachVDiskResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-</AttachVDiskResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/Auth_UserNotInSelectData-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/Auth_UserNotInSelectData-response.xml b/fgcp/src/test/resources/responses/Auth_UserNotInSelectData-response.xml
deleted file mode 100644
index 5f1011e..0000000
--- a/fgcp/src/test/resources/responses/Auth_UserNotInSelectData-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateVServerResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <responseMessage>User not found in selectData. searchKey:userid</responseMessage>
-  <responseStatus>ERROR</responseStatus>
-</CreateVServerResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/BackupEFM-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/BackupEFM-response.xml b/fgcp/src/test/resources/responses/BackupEFM-response.xml
deleted file mode 100644
index 39e69e3..0000000
--- a/fgcp/src/test/resources/responses/BackupEFM-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<BackupEFMResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-</BackupEFMResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/BackupVDisk-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/BackupVDisk-response.xml b/fgcp/src/test/resources/responses/BackupVDisk-response.xml
deleted file mode 100644
index 0018289..0000000
--- a/fgcp/src/test/resources/responses/BackupVDisk-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<BackupVDiskResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-</BackupVDiskResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/CreateAddressPool-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/CreateAddressPool-response.xml b/fgcp/src/test/resources/responses/CreateAddressPool-response.xml
deleted file mode 100644
index 17988f5..0000000
--- a/fgcp/src/test/resources/responses/CreateAddressPool-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateAddressPoolResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-</CreateAddressPoolResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/CreateEFM-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/CreateEFM-response.xml b/fgcp/src/test/resources/responses/CreateEFM-response.xml
deleted file mode 100644
index bd20f9a..0000000
--- a/fgcp/src/test/resources/responses/CreateEFM-response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateEFMResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-  <efmId>CONTRACT-EFM00001</efmId>
-</CreateEFMResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/CreateVDisk-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/CreateVDisk-response.xml b/fgcp/src/test/resources/responses/CreateVDisk-response.xml
deleted file mode 100644
index ae7d8a3..0000000
--- a/fgcp/src/test/resources/responses/CreateVDisk-response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateVDiskResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-  <vdiskId>ABCDEFGH-A123B456CE-S-0006</vdiskId>
-</CreateVDiskResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/CreateVSYS-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/CreateVSYS-response.xml b/fgcp/src/test/resources/responses/CreateVSYS-response.xml
deleted file mode 100644
index 425cbc7..0000000
--- a/fgcp/src/test/resources/responses/CreateVSYS-response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateVSYSResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-  <vsysId>CONTRACT-VSYS00001</vsysId>
-</CreateVSYSResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/CreateVServer-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/CreateVServer-response.xml b/fgcp/src/test/resources/responses/CreateVServer-response.xml
deleted file mode 100644
index 81c51b9..0000000
--- a/fgcp/src/test/resources/responses/CreateVServer-response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateVServerResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-  <vserverId>ABCDEFGH-A123B456CE-S-0007</vserverId>
-</CreateVServerResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/DeleteAddressRange-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/DeleteAddressRange-response.xml b/fgcp/src/test/resources/responses/DeleteAddressRange-response.xml
deleted file mode 100644
index e3cdd50..0000000
--- a/fgcp/src/test/resources/responses/DeleteAddressRange-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DeleteAddressRangeResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-</DeleteAddressRangeResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/DestroyEFM-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/DestroyEFM-response.xml b/fgcp/src/test/resources/responses/DestroyEFM-response.xml
deleted file mode 100644
index aa8e374..0000000
--- a/fgcp/src/test/resources/responses/DestroyEFM-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DestroyEFMResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-</DestroyEFMResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/DestroyEFMBackup-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/DestroyEFMBackup-response.xml b/fgcp/src/test/resources/responses/DestroyEFMBackup-response.xml
deleted file mode 100644
index a2da3c4..0000000
--- a/fgcp/src/test/resources/responses/DestroyEFMBackup-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DestroyEFMBackupResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-</DestroyEFMBackupResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/DestroyVDisk-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/DestroyVDisk-response.xml b/fgcp/src/test/resources/responses/DestroyVDisk-response.xml
deleted file mode 100644
index c66a6a9..0000000
--- a/fgcp/src/test/resources/responses/DestroyVDisk-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DestroyVDiskResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-</DestroyVDiskResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/DestroyVDiskBackup-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/DestroyVDiskBackup-response.xml b/fgcp/src/test/resources/responses/DestroyVDiskBackup-response.xml
deleted file mode 100644
index af0088f..0000000
--- a/fgcp/src/test/resources/responses/DestroyVDiskBackup-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DestroyVDiskBackupResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-</DestroyVDiskBackupResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/DestroyVServer-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/DestroyVServer-response.xml b/fgcp/src/test/resources/responses/DestroyVServer-response.xml
deleted file mode 100644
index c9fbbd2..0000000
--- a/fgcp/src/test/resources/responses/DestroyVServer-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DestroyVServerResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-</DestroyVServerResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/DetachPublicIP-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/DetachPublicIP-response.xml b/fgcp/src/test/resources/responses/DetachPublicIP-response.xml
deleted file mode 100644
index ee99b2e..0000000
--- a/fgcp/src/test/resources/responses/DetachPublicIP-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DetachPublicIPResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-</DetachPublicIPResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/DetachVDisk-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/DetachVDisk-response.xml b/fgcp/src/test/resources/responses/DetachVDisk-response.xml
deleted file mode 100644
index 877cb74..0000000
--- a/fgcp/src/test/resources/responses/DetachVDisk-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DetachVDiskResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-</DetachVDiskResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/FreePublicIP-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/FreePublicIP-response.xml b/fgcp/src/test/resources/responses/FreePublicIP-response.xml
deleted file mode 100644
index 7644e11..0000000
--- a/fgcp/src/test/resources/responses/FreePublicIP-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<FreePublicIPResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-</FreePublicIPResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/GetAddressRange-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/GetAddressRange-response.xml b/fgcp/src/test/resources/responses/GetAddressRange-response.xml
deleted file mode 100644
index 2eb92bd..0000000
--- a/fgcp/src/test/resources/responses/GetAddressRange-response.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GetAddressRangeResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <addressranges>
-    <addressrange>
-      <from>192.168.0.0</from>
-      <range>MANUAL</range>
-      <to>192.168.255.255</to>
-    </addressrange>
-  </addressranges>
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-</GetAddressRangeResponse>

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/GetDiskImageAttributes-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/GetDiskImageAttributes-response.xml b/fgcp/src/test/resources/responses/GetDiskImageAttributes-response.xml
deleted file mode 100644
index 044d31d..0000000
--- a/fgcp/src/test/resources/responses/GetDiskImageAttributes-response.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GetDiskImageAttributesResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <diskimage>
-    <creatorName>ABCDEFGH</creatorName>
-    <description />
-    <diskimageId>IMG_A1B2C3_1234567890ABCD</diskimageId>
-    <diskimageName>CentOS 6.0 64bit(EN)</diskimageName>
-    <licenseInfo />
-    <osName>CentOS 6.0 64bit (English)</osName>
-    <osType>pv</osType>
-    <registrant>ABCDEFGH</registrant>
-    <size>10.0</size>
-  </diskimage>
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-</GetDiskImageAttributesResponse>

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/GetEFMAttributes-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/GetEFMAttributes-response.xml b/fgcp/src/test/resources/responses/GetEFMAttributes-response.xml
deleted file mode 100644
index 02f7bfe..0000000
--- a/fgcp/src/test/resources/responses/GetEFMAttributes-response.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GetEFMAttributesResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <efm>
-    <creator>CONTRACT-VSYS00001</creator>
-    <efmId>CONTRACT-VSYS00001-S-0001</efmId>
-    <efmName>Firewall</efmName>
-    <efmType>FW</efmType>
-  </efm>
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-</GetEFMAttributesResponse>

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/GetEFMStatus-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/GetEFMStatus-response.xml b/fgcp/src/test/resources/responses/GetEFMStatus-response.xml
deleted file mode 100644
index 960d939..0000000
--- a/fgcp/src/test/resources/responses/GetEFMStatus-response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GetEFMStatusResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-  <efmStatus>RUNNING</efmStatus>
-</GetEFMStatusResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/GetEventLog-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/GetEventLog-response.xml b/fgcp/src/test/resources/responses/GetEventLog-response.xml
deleted file mode 100644
index 6d757f9..0000000
--- a/fgcp/src/test/resources/responses/GetEventLog-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GetEventLogResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-</GetEventLogResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/GetPerformanceInformation-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/GetPerformanceInformation-response.xml b/fgcp/src/test/resources/responses/GetPerformanceInformation-response.xml
deleted file mode 100644
index f34995a..0000000
--- a/fgcp/src/test/resources/responses/GetPerformanceInformation-response.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GetPerformanceInformationResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <interval>10minute</interval>
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-  <serverId>CONTRACT-VSYS00001-S-0001</serverId>
-  <serverName>my server</serverName>
-  <serverType>GENERAL</serverType>
-</GetPerformanceInformationResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/GetPublicIPAttributes-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/GetPublicIPAttributes-response.xml b/fgcp/src/test/resources/responses/GetPublicIPAttributes-response.xml
deleted file mode 100644
index c9cc639..0000000
--- a/fgcp/src/test/resources/responses/GetPublicIPAttributes-response.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GetPublicIPAttributesResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <publicips>
-    <publicip>
-      <address>123.45.67.89</address>
-      <v4v6Flag>IPv4</v4v6Flag>
-    </publicip>
-  </publicips>
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-</GetPublicIPAttributesResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/GetPublicIPStatus-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/GetPublicIPStatus-response.xml b/fgcp/src/test/resources/responses/GetPublicIPStatus-response.xml
deleted file mode 100644
index d8eb549..0000000
--- a/fgcp/src/test/resources/responses/GetPublicIPStatus-response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GetPublicIPStatusResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <publicipStatus>ATTACHED</publicipStatus>
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-</GetPublicIPStatusResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/GetVDiskAttributes-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/GetVDiskAttributes-response.xml b/fgcp/src/test/resources/responses/GetVDiskAttributes-response.xml
deleted file mode 100644
index b0faecc..0000000
--- a/fgcp/src/test/resources/responses/GetVDiskAttributes-response.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GetVDiskAttributesResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-  <vdisk>
-    <attachedTo>CONTRACT-VSYS00001-D-0001</attachedTo>
-    <creator>CONTRACT</creator>
-    <size>10.0</size>
-    <vdiskId>CONTRACT-VSYS00001-S-0006</vdiskId>
-    <vdiskName>disk1</vdiskName>
-  </vdisk>
-</GetVDiskAttributesResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/GetVDiskStatus-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/GetVDiskStatus-response.xml b/fgcp/src/test/resources/responses/GetVDiskStatus-response.xml
deleted file mode 100644
index 5a0709a..0000000
--- a/fgcp/src/test/resources/responses/GetVDiskStatus-response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GetVDiskStatusResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-  <vdiskStatus>STOPPED</vdiskStatus>
-</GetVDiskStatusResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/GetVSYSAttributes-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/GetVSYSAttributes-response.xml b/fgcp/src/test/resources/responses/GetVSYSAttributes-response.xml
deleted file mode 100644
index 8f1044f..0000000
--- a/fgcp/src/test/resources/responses/GetVSYSAttributes-response.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GetVSYSAttributesResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-  <vsys>
-    <baseDescriptor>2-tier Skeleton</baseDescriptor>
-    <creator>ABCDEFGH</creator>
-    <description>2-tier Skeleton</description>
-    <vsysId>ABCDEFGH-I123J456K</vsysId>
-    <vsysName>my virtual system</vsysName>
-  </vsys>
-</GetVSYSAttributesResponse>

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/GetVSYSConfiguration-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/GetVSYSConfiguration-response.xml b/fgcp/src/test/resources/responses/GetVSYSConfiguration-response.xml
deleted file mode 100644
index 352b46c..0000000
--- a/fgcp/src/test/resources/responses/GetVSYSConfiguration-response.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GetVSYSConfigurationResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-  <vsys>
-    <baseDescriptor>2-tier Skeleton</baseDescriptor>
-    <cloudCategory>NONE</cloudCategory>
-    <creator>ABCDEFGH</creator>
-    <description>2-tier Skeleton</description>
-    <vdisks>
-      <vdisk>
-        <creator>ABCDEFGH</creator>
-        <size>10.0</size>
-        <vdiskId>ABCDEFGH-I123J456K-D-0001</vdiskId>
-        <vdiskName>DISK1</vdiskName>
-      </vdisk>
-    </vdisks>
-    <vnets>
-      <vnet>
-        <networkId>ABCDEFGH-I123J456K-N-DMZ</networkId>
-      </vnet>
-      <vnet>
-        <networkId>ABCDEFGH-I123J456K-N-SECURE1</networkId>
-      </vnet>
-    </vnets>
-    <vservers>
-      <vserver>
-        <creator>ABCDEFGH</creator>
-        <diskimageId>IMG_A1B2C3_1234567890ABCD</diskimageId>
-        <vnics>
-          <vnic>
-            <networkId>ABCDEFGH-I123J456K-N-DMZ</networkId>
-            <nicNo>4</nicNo>
-            <privateIp>192.168.32.11</privateIp>
-          </vnic>
-          <vnic>
-            <networkId>ABCDEFGH-I123J456K-N-SECURE1</networkId>
-            <nicNo>5</nicNo>
-            <privateIp>192.168.33.11</privateIp>
-          </vnic>
-        </vnics>
-        <vserverId>ABCDEFGH-I123J456K-S-0001</vserverId>
-        <vserverName>Firewall</vserverName>
-        <vserverType>firewall</vserverType>
-      </vserver>
-      <vserver>
-        <creator>ABCDEFGH</creator>
-        <diskimageId>IMG_A1B2C3_1234567890ABCD</diskimageId>
-        <vnics>
-          <vnic>
-            <networkId>ABCDEFGH-I123J456K-N-DMZ</networkId>
-            <nicNo>0</nicNo>
-            <privateIp>192.168.32.13</privateIp>
-          </vnic>
-        </vnics>
-        <vserverId>ABCDEFGH-I123J456K-S-0003</vserverId>
-        <vserverName>CentOS 6.3 32bit(EN)1</vserverName>
-        <vserverType>economy</vserverType>
-      </vserver>
-      <vserver>
-        <creator>ABCDEFGH</creator>
-        <diskimageId>IMG_A1B2C3_1234567890ABCD</diskimageId>
-        <vnics>
-          <vnic>
-            <networkId>ABCDEFGH-I123J456K-N-SECURE1</networkId>
-            <nicNo>0</nicNo>
-            <privateIp>192.168.33.12</privateIp>
-          </vnic>
-        </vnics>
-        <vserverId>ABCDEFGH-I123J456K-S-0004</vserverId>
-        <vserverName>CentOS 6.3 32bit(EN)2</vserverName>
-        <vserverType>economy</vserverType>
-      </vserver>
-    </vservers>
-    <vsysId>ABCDEFGH-I123J456K</vsysId>
-    <vsysName>system 2</vsysName>
-  </vsys>
-</GetVSYSConfigurationResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/GetVSYSDescriptorConfiguration-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/GetVSYSDescriptorConfiguration-response.xml b/fgcp/src/test/resources/responses/GetVSYSDescriptorConfiguration-response.xml
deleted file mode 100644
index 5fa9adb..0000000
--- a/fgcp/src/test/resources/responses/GetVSYSDescriptorConfiguration-response.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GetVSYSDescriptorConfigurationResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-  <vsysdescriptor>
-    <creatorName>ABCDEFGH</creatorName>
-    <description>3-tier Skeleton</description>
-    <keyword>3-tier,Skeleton</keyword>
-    <registrant>ABCDEFGH</registrant>
-    <vservers>
-      <vserver>
-        <creator>ABCDEFGH</creator>
-        <diskimageId>IMG_A1B2C3_1234567890ABCD</diskimageId>
-        <vserverName>Firewall</vserverName>
-        <vserverType>economy</vserverType>
-      </vserver>
-    </vservers>
-    <vsysdescriptorId>3-tier Skeleton</vsysdescriptorId>
-    <vsysdescriptorName>3-tier Skeleton</vsysdescriptorName>
-  </vsysdescriptor>
-</GetVSYSDescriptorConfigurationResponse>

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/GetVSYSStatus-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/GetVSYSStatus-response.xml b/fgcp/src/test/resources/responses/GetVSYSStatus-response.xml
deleted file mode 100644
index 552d4a2..0000000
--- a/fgcp/src/test/resources/responses/GetVSYSStatus-response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GetVSYSStatusResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-  <vsysStatus>NORMAL</vsysStatus>
-</GetVSYSStatusResponse>

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/GetVServerAttributes-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/GetVServerAttributes-response.xml b/fgcp/src/test/resources/responses/GetVServerAttributes-response.xml
deleted file mode 100644
index a18730e..0000000
--- a/fgcp/src/test/resources/responses/GetVServerAttributes-response.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GetVServerAttributesResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-  <vserver>
-    <creator>CONTRACT</creator>
-    <diskimageId>IMG_A1B2C3_1234567890ABCD</diskimageId>
-    <vserverId>CONTRACT-VSYS00001-S-0001</vserverId>
-    <vserverName>my VM</vserverName>
-    <vserverType>economy</vserverType>
-  </vserver>
-</GetVServerAttributesResponse>

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/GetVServerConfiguration-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/GetVServerConfiguration-response.xml b/fgcp/src/test/resources/responses/GetVServerConfiguration-response.xml
deleted file mode 100644
index 36a8574..0000000
--- a/fgcp/src/test/resources/responses/GetVServerConfiguration-response.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GetVServerConfigurationResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-  <vserver>
-    <creator>CONTRACT</creator>
-    <diskimageId>IMG_A1B2C3_1234567890ABCD</diskimageId>
-    <image>
-      <cpuBit>32</cpuBit>
-      <id>IMG_A1B2C3_1234567890ABCD</id>
-      <numOfMaxDisk>14</numOfMaxDisk>
-      <numOfMaxNic>8</numOfMaxNic>
-      <serverApplication>AP</serverApplication>
-      <serverCategory>GENERAL</serverCategory>
-      <softwares>
-        <software>
-          <category>OS</category>
-          <id>SW00000001</id>
-          <license />
-          <name>CentOS 5.4 32bit (English)</name>
-          <officialVersion>5.4</officialVersion>
-          <patch />
-          <support />
-          <version>5.4</version>
-        </software>
-      </softwares>
-      <sysvolSize>10.0</sysvolSize>
-    </image>
-    <vnics>
-      <vnic>
-        <networkId>CONTRACT-VSYS00001-N-DMZ</networkId>
-        <nicNo>0</nicNo>
-        <privateIp>192.168.4.13</privateIp>
-      </vnic>
-    </vnics>
-    <vserverId>CONTRACT-VSYS00001-S-0005</vserverId>
-    <vserverName>my VM</vserverName>
-    <vserverType>economy</vserverType>
-  </vserver>
-</GetVServerConfigurationResponse>

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/GetVServerInitialPassword-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/GetVServerInitialPassword-response.xml b/fgcp/src/test/resources/responses/GetVServerInitialPassword-response.xml
deleted file mode 100644
index c4816ed..0000000
--- a/fgcp/src/test/resources/responses/GetVServerInitialPassword-response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GetVServerInitialPasswordResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <initialPassword>mySecretpwd1</initialPassword>
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-</GetVServerInitialPasswordResponse>

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/GetVServerStatus-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/GetVServerStatus-response.xml b/fgcp/src/test/resources/responses/GetVServerStatus-response.xml
deleted file mode 100644
index d36f0fc..0000000
--- a/fgcp/src/test/resources/responses/GetVServerStatus-response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GetVServerStatusResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-  <vserverStatus>STOPPED</vserverStatus>
-</GetVServerStatusResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/IllegalState_ALREADY_STOPPED-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/IllegalState_ALREADY_STOPPED-response.xml b/fgcp/src/test/resources/responses/IllegalState_ALREADY_STOPPED-response.xml
deleted file mode 100644
index 37370a4..0000000
--- a/fgcp/src/test/resources/responses/IllegalState_ALREADY_STOPPED-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateVServerResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <responseMessage>The status of Instance[ABCDEFGH-A123B456CE-S-0004] is [STOPPED].</responseMessage>
-  <responseStatus>ALREADY_STOPPED</responseStatus>
-</CreateVServerResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/IllegalState_RECONFIG_ING-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/IllegalState_RECONFIG_ING-response.xml b/fgcp/src/test/resources/responses/IllegalState_RECONFIG_ING-response.xml
deleted file mode 100644
index 4d34395..0000000
--- a/fgcp/src/test/resources/responses/IllegalState_RECONFIG_ING-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateVServerResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <responseMessage>The status of Instance[ABCDEFGH-A123B456CE] is [RECONFIG_ING].</responseMessage>
-  <responseStatus>ILLEGAL_STATE</responseStatus>
-</CreateVServerResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/IllegalState_RUNNING-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/IllegalState_RUNNING-response.xml b/fgcp/src/test/resources/responses/IllegalState_RUNNING-response.xml
deleted file mode 100644
index b263e18..0000000
--- a/fgcp/src/test/resources/responses/IllegalState_RUNNING-response.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateVServerResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <responseMessage>The status of Instance[ABCDEFGH-A123B456CE-S-0004] is [RUNNING].</responseMessage>
-  <responseStatus>ALREADY_STARTED</responseStatus>
-</CreateVServerResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba795261/fgcp/src/test/resources/responses/ListDiskImage-response.xml
----------------------------------------------------------------------
diff --git a/fgcp/src/test/resources/responses/ListDiskImage-response.xml b/fgcp/src/test/resources/responses/ListDiskImage-response.xml
deleted file mode 100644
index 765979a..0000000
--- a/fgcp/src/test/resources/responses/ListDiskImage-response.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ListDiskImageResponse xmlns="http://apioviss.jp.fujitsu.com">
-  <diskimages>
-    <diskimage>
-      <creatorName>ABCDEFGH</creatorName>
-      <description />
-      <diskimageId>IMG_A1B2C3_1234567890ABCD</diskimageId>
-      <diskimageName>CentOS 6.0 64bit(EN)</diskimageName>
-      <licenseInfo />
-      <osName>CentOS 6.0 64bit (English)</osName>
-      <osType>pv</osType>
-      <registrant>ABCDEFGH</registrant>
-      <size>10.0</size>
-    </diskimage>
-  </diskimages>
-  <responseMessage>Processing was completed.</responseMessage>
-  <responseStatus>SUCCESS</responseStatus>
-</ListDiskImageResponse>
\ No newline at end of file