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/05 01:28:43 UTC

[2/7] Remove savvis-symphonyvpdc, which hasn't been published in over a year.

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b91fd46c/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/OrgHandlerTest.java
----------------------------------------------------------------------
diff --git a/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/OrgHandlerTest.java b/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/OrgHandlerTest.java
deleted file mode 100644
index f45463c..0000000
--- a/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/OrgHandlerTest.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.savvis.vpdc.xml;
-
-import static org.testng.Assert.assertEquals;
-
-import java.io.InputStream;
-import java.net.URI;
-
-import org.jclouds.http.functions.ParseSax;
-import org.jclouds.http.functions.ParseSax.Factory;
-import org.jclouds.http.functions.config.SaxParserModule;
-import org.jclouds.savvis.vpdc.domain.Link;
-import org.jclouds.savvis.vpdc.domain.Org;
-import org.testng.annotations.Test;
-
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-/**
- * Tests behavior of {@code OrgHandler}
- */
-@Test(groups = "unit")
-public class OrgHandlerTest {
-
-   public void testSavvis() {
-      InputStream is = getClass().getResourceAsStream("/org.xml");
-      Injector injector = Guice.createInjector(new SaxParserModule());
-      Factory factory = injector.getInstance(ParseSax.Factory.class);
-      Org result = factory.create(injector.getInstance(OrgHandler.class)).parse(is);
-      assertEquals(
-            result.toString(),
-            Org.builder()
-                  .name("100000.0")
-                  .description("SAVVISStation Integration Testing")
-                  .vDC(new Link("2736", "demo_vpdcname", "application/vnd.vmware.vcloud.vdc+xml", URI
-                        .create("https://api.sandbox.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736"),
-                        "down")).build().toString());
-
-   }
-   
-   public void testOrgWithoutVDC() {
-	      InputStream is = getClass().getResourceAsStream("/org_no_vdc.xml");
-	      Injector injector = Guice.createInjector(new SaxParserModule());
-	      Factory factory = injector.getInstance(ParseSax.Factory.class);
-	      Org result = factory.create(injector.getInstance(OrgHandler.class)).parse(is);
-	      assertEquals(
-	            result.toString(),
-	            Org.builder()
-	                  .name("100000.0")
-	                  .description("SAVVISStation Integration Testing").build().toString());
-
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b91fd46c/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/OrgListHandlerTest.java
----------------------------------------------------------------------
diff --git a/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/OrgListHandlerTest.java b/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/OrgListHandlerTest.java
deleted file mode 100644
index be40c7b..0000000
--- a/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/OrgListHandlerTest.java
+++ /dev/null
@@ -1,52 +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.savvis.vpdc.xml;
-
-import static org.testng.Assert.assertEquals;
-
-import java.io.InputStream;
-import java.net.URI;
-import java.util.Set;
-
-import org.jclouds.http.functions.ParseSax;
-import org.jclouds.http.functions.ParseSax.Factory;
-import org.jclouds.http.functions.config.SaxParserModule;
-import org.jclouds.savvis.vpdc.domain.Resource;
-import org.jclouds.savvis.vpdc.domain.ResourceImpl;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-/**
- * Tests behavior of {@code OrgListHandler}
- */
-@Test(groups = "unit")
-public class OrgListHandlerTest {
-
-   public void testSavvis() {
-      InputStream is = getClass().getResourceAsStream("/orglist.xml");
-      Injector injector = Guice.createInjector(new SaxParserModule());
-      Factory factory = injector.getInstance(ParseSax.Factory.class);
-      Set<Resource> result = factory.create(injector.getInstance(OrgListHandler.class)).parse(is);
-      assertEquals(result, ImmutableSet.of(new ResourceImpl("100000.0", "SAVVISStation Integration Testing",
-            "application/vnd.vmware.vcloud.org+xml", URI
-                  .create("https://api.sandbox.savvis.net/rest/api/v0.8/org/100000.0"))));
-
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b91fd46c/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/TaskHandlerTest.java
----------------------------------------------------------------------
diff --git a/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/TaskHandlerTest.java b/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/TaskHandlerTest.java
deleted file mode 100644
index 761bc6d..0000000
--- a/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/TaskHandlerTest.java
+++ /dev/null
@@ -1,262 +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.savvis.vpdc.xml;
-
-import static org.testng.Assert.assertEquals;
-
-import java.io.InputStream;
-import java.net.URI;
-
-import org.jclouds.date.DateService;
-import org.jclouds.http.functions.BaseHandlerTest;
-import org.jclouds.savvis.vpdc.domain.ResourceImpl;
-import org.jclouds.savvis.vpdc.domain.Task;
-import org.jclouds.savvis.vpdc.domain.TaskError;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-/**
- * Tests behavior of {@code TaskHandler}
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during surefire
-@Test(groups = "unit", testName = "TaskHandlerTest")
-public class TaskHandlerTest extends BaseHandlerTest {
-
-   private DateService dateService;
-
-   @BeforeTest
-   @Override
-   protected void setUpInjector() {
-      super.setUpInjector();
-      dateService = injector.getInstance(DateService.class);
-   }
-
-   public void testVAppSuccess() {
-      InputStream is = getClass().getResourceAsStream("/task-vapp.xml");
-
-      Task result = factory.create(injector.getInstance(TaskHandler.class)).parse(is);
-      Task expects = Task
-            .builder()
-            .id("21-1002")
-            .endTime(dateService.iso8601DateParse("2010-05-26T08:09:09.000+08:00"))
-            .startTime(dateService.iso8601DateParse("2010-05-26T08:08:08.000+08:00"))
-            .status(Task.Status.SUCCESS)
-            .type("application/vnd.vmware.vcloud.task+xml")
-            .href(URI.create("https://api.savvis.net/rest/api/v0.8/task/21-1002"))
-            .owner(
-                  ResourceImpl
-                        .builder()
-                        .id("2736")
-                        .name("mockVpdc8")
-                        .type("application/vnd.vmware.vcloud.vdc+xml")
-                        .href(URI
-                              .create("https://api.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736"))
-                        .build())
-            .result(
-                     ResourceImpl
-                        .builder()
-                        .id("1002")
-                        .name("mock_vpdc_item_007")
-                        .type("application/vnd.vmware.vcloud.vApp+xml")
-                        .href(URI
-                              .create("https://api.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1002"))
-                        .build()).build();
-      assertEquals(result.toString(), expects.toString());
-
-   }
-
-   public void testVMDKSuccess() {
-      InputStream is = getClass().getResourceAsStream("/task-vmdk.xml");
-
-      Task result = factory.create(injector.getInstance(TaskHandler.class)).parse(is);
-      Task expects = Task
-            .builder()
-            .id("21-1002")
-            .endTime(dateService.iso8601DateParse("2010-05-26T08:09:09.000+08:00"))
-            .startTime(dateService.iso8601DateParse("2010-05-26T08:08:08.000+08:00"))
-            .status(Task.Status.SUCCESS)
-            .type("application/vnd.vmware.vcloud.task+xml")
-            .href(URI.create("https://api.savvis.net/rest/api/v0.8/task/21-1002"))
-            .owner(
-                  ResourceImpl
-                        .builder()
-                        .id("2736")
-                        .name("mockVpdc8")
-                        .type("application/vnd.vmware.vcloud.vdc+xml")
-                        .href(URI
-                              .create("https://api.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736"))
-                        .build())
-            .result(
-                  ResourceImpl
-                        .builder()
-                        .id("1234567")
-                        .name("mock_vpdc_item_008")
-                        .type("application/vnd.vmware.vcloud.vApp+xml")
-                        .href(URI
-                              .create("https://api.savvis.net/rest/api/v0.8/vdc/2736/vmdk/1234567"))
-                        .build()).build();
-      assertEquals(result.toString(), expects.toString());
-
-   }
-
-   public void testRunning() {
-      InputStream is = getClass().getResourceAsStream("/task-running.xml");
-
-      Task result = factory.create(injector.getInstance(TaskHandler.class)).parse(is);
-      Task expects = Task
-            .builder()
-            .id("6904")
-            .startTime(dateService.iso8601DateParse("2010-05-26T08:08:08.000+08:00"))
-            .status(Task.Status.RUNNING)
-            .type("application/vnd.vmware.vcloud.task+xml")
-            .href(URI.create("https://api.savvis.net/rest/api/v0.8/task/6904"))
-            .owner(
-                  ResourceImpl
-                        .builder()
-                        .id("2736")
-                        .name("mockVpdc8")
-                        .type("application/vnd.vmware.vcloud.vdc+xml")
-                        .href(URI
-                              .create("https://api.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736"))
-                        .build())
-            .result(
-                  ResourceImpl
-                        .builder()
-                        .id("1002")
-                        .name("mock_vpdc_item_007")
-                        .type("application/vnd.vmware.vcloud.catalogItem+xml")
-                        .href(URI
-                              .create("https://api.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1002"))
-                        .build()).build();
-
-      assertEquals(result.toString(), expects.toString());
-
-   }
-
-   public void testQueued() {
-      InputStream is = getClass().getResourceAsStream("/task-queued.xml");
-
-      Task result = factory.create(injector.getInstance(TaskHandler.class)).parse(is);
-      Task expects = Task
-            .builder()
-            .id("113927-1005")
-            .startTime(dateService.iso8601DateParse("2011-03-24T20:37:34.000Z"))
-            .status(Task.Status.QUEUED)
-            .href(URI.create("https://api.savvis.net/rest/api/v0.8/task/113927-1005"))
-            .owner(
-                  ResourceImpl
-                        .builder()
-                        .id("4253")
-                        .name("Foo")
-                        .type("application/vnd.vmware.vcloud.vdc+xml")
-                        .href(URI
-                              .create("https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/4253"))
-                        .build())
-            .result(
-                  ResourceImpl
-                        .builder()
-                        .id("1005")
-                        .name("adriancole")
-                        .type("application/vnd.vmware.vcloud.vApp+xml")
-                        .href(URI
-                              .create("https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/4253/vApp/1005"))
-                        .build()).build();
-      assertEquals(result.toString(), expects.toString());
-      assertEquals(result.getError(), null);
-      assert result.getId() != null;
-   }
-
-   public void testFailed() {
-      InputStream is = getClass().getResourceAsStream("/task-failed.xml");
-
-      Task result = factory.create(injector.getInstance(TaskHandler.class)).parse(is);
-      Task expects = Task
-            .builder()
-            .id("6904-123")
-            .startTime(dateService.iso8601DateParse("2010-05-26T08:08:08.000+08:00"))
-            .endTime(dateService.iso8601DateParse("2010-05-26T08:09:09.000+08:00"))
-            .status(Task.Status.ERROR)
-            .type("application/vnd.vmware.vcloud.task+xml")
-            .href(URI.create("https://api.savvis.net/rest/api/v0.8/task/6904-123"))
-            .owner(
-                  ResourceImpl
-                        .builder()
-                        .id("2736")
-                        .name("mockVpdc8")
-                        .type("application/vnd.vmware.vcloud.vdc+xml")
-                        .href(URI
-                              .create("https://api.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736"))
-                        .build())
-            .result(
-                  ResourceImpl
-                        .builder()
-                        .id("1002")
-                        .name("mock_vpdc_item_007")
-                        .type("application/vnd.vmware.vcloud.vApp+xml")
-                        .href(URI
-                              .create("https://api.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1002"))
-                        .build()).build();
-      assertEquals(result.toString(), expects.toString());
-
-   }
-
-   public void testError() {
-      InputStream is = getClass().getResourceAsStream("/task-error.xml");
-
-      Task result = factory.create(injector.getInstance(TaskHandler.class)).parse(is);
-      Task expects = Task
-            .builder()
-            .startTime(dateService.iso8601DateParse("2010-05-26T08:08:08.000+08:00"))
-            .endTime(dateService.iso8601DateParse("2010-05-26T08:09:09.000+08:00"))
-            .status(Task.Status.ERROR)
-            .error(
-                  TaskError
-                        .builder()
-                        .vendorSpecificErrorCode("0")
-                        .minorErrorCode(0)
-                        .majorErrorCode(0)
-                        .message(
-                              "There is an internal exception occured in System, please kindly contact savvis support team to get solution.")
-                        .build()).build();
-      assertEquals(result.toString(), expects.toString());
-
-   }
-
-   public void testUnsupported() {
-      InputStream is = getClass().getResourceAsStream("/task-unsupported.xml");
-
-      Task result = factory.create(injector.getInstance(TaskHandler.class)).parse(is);
-      Task expects = Task
-            .builder()
-            .id("3904-1002")
-            .startTime(dateService.iso8601DateParse("2010-05-26T08:08:08.000+08:00"))
-            .endTime(dateService.iso8601DateParse("2010-05-26T08:09:09.000+08:00"))
-            .status(Task.Status.NONE)
-            .type("application/vnd.vmware.vcloud.task+xml")
-            .href(URI.create("https://api.savvis.net/rest/api/v0.8/task/3904-1002"))
-            .error(
-                  TaskError
-                        .builder()
-                        .vendorSpecificErrorCode("3000")
-                        .minorErrorCode(-1)
-                        .majorErrorCode(500)
-                        .message(
-                              "your requested task id is not found. Please contact Savvis Administrator for further assistance/clarification ")
-                        .build()).build();
-      assertEquals(result.toString(), expects.toString());
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b91fd46c/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/VDCHandlerTest.java
----------------------------------------------------------------------
diff --git a/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/VDCHandlerTest.java b/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/VDCHandlerTest.java
deleted file mode 100644
index 66e31b9..0000000
--- a/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/VDCHandlerTest.java
+++ /dev/null
@@ -1,189 +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.savvis.vpdc.xml;
-
-import static org.testng.Assert.assertEquals;
-
-import java.io.InputStream;
-import java.net.URI;
-
-import org.jclouds.http.functions.ParseSax;
-import org.jclouds.http.functions.ParseSax.Factory;
-import org.jclouds.http.functions.config.SaxParserModule;
-import org.jclouds.savvis.vpdc.domain.Resource;
-import org.jclouds.savvis.vpdc.domain.ResourceImpl;
-import org.jclouds.savvis.vpdc.domain.VDC;
-import org.jclouds.savvis.vpdc.domain.VDC.Status;
-import org.jclouds.savvis.vpdc.reference.VCloudMediaType;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-/**
- * Tests behavior of {@code VDCHandler}
- */
-@Test(groups = "unit")
-public class VDCHandlerTest {
-
-   public void test() {
-      InputStream is = getClass().getResourceAsStream("/vdc.xml");
-      Injector injector = Guice.createInjector(new SaxParserModule());
-      Factory factory = injector.getInstance(ParseSax.Factory.class);
-      VDC result = factory.create(injector.getInstance(VDCHandler.class)).parse(is);
-      assertEquals(result.getName(), "demo_vpdcname");
-      assertEquals(result.getDescription(),
-               "ServiceProfileName = Balanced; ServiceLocation = North America; Email = jim@company.com;");
-      assertEquals(result.getStatus(), Status.DEPLOYED);
-      assertEquals(
-               result.getResourceEntities(),
-               ImmutableSet
-                        .<Resource> of(
-                                 new ResourceImpl(
-                                          "1001",
-                                          "DemoHost-1",
-                                          VCloudMediaType.VAPP_XML,
-                                          URI
-                                                   .create("https://api.sandbox.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1001")),
-                                 new ResourceImpl(
-                                          "1002",
-                                          "DemoHost-2",
-                                          VCloudMediaType.VAPP_XML,
-                                          URI
-                                                   .create("https://api.sandbox.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1002")),
-                                 new ResourceImpl(
-                                          "1003",
-                                          "DemoHost-3",
-                                          VCloudMediaType.VAPP_XML,
-                                          URI
-                                                   .create("https://api.sandbox.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1003")),
-                                 new ResourceImpl(
-                                          "1234",
-                                          "CustomerTemplateName",
-                                          VCloudMediaType.VAPPTEMPLATE_XML,
-                                          URI
-                                                   .create("https://api.sandbox.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vAppTemplate/1234")),
-                                 new ResourceImpl(
-                                          "FirewallService",
-                                          "firewall",
-                                          "api.savvis.net+xml",
-                                          URI
-                                                   .create("https://api.sandbox.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/FirewallService"))));
-      assertEquals(result.getAvailableNetworks(), ImmutableSet.of());
-   }
-
-   public void test1net() {
-      InputStream is = getClass().getResourceAsStream("/vdc-1net.xml");
-      Injector injector = Guice.createInjector(new SaxParserModule());
-      Factory factory = injector.getInstance(ParseSax.Factory.class);
-      VDC result = factory.create(injector.getInstance(VDCHandler.class)).parse(is);
-      assertEquals(result.getName(), "demo6");
-      assertEquals(result.getDescription(),
-               "ServiceProfileName = Essential; ServiceLocation = US_WEST; Email = red@chair.com;");
-      assertEquals(result.getStatus(), Status.DEPLOYED);
-      assertEquals(result.getResourceEntities(), ImmutableSet.of(new ResourceImpl("1001", "Host1",
-               VCloudMediaType.VAPP_XML, URI
-                        .create("https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/1619/vApp/1001")),
-               new ResourceImpl("1002", "Host2", VCloudMediaType.VAPP_XML, URI
-                        .create("https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/1619/vApp/1002")),
-               new ResourceImpl("1003", "Host3", VCloudMediaType.VAPP_XML, URI
-                        .create("https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/1619/vApp/1003")),
-               new ResourceImpl("1004", "Host4", VCloudMediaType.VAPP_XML, URI
-                        .create("https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/1619/vApp/1004"))));
-      assertEquals(result.getAvailableNetworks(), ImmutableSet.of(ResourceImpl.builder().id("VM-Tier01").name(
-               "VM Tier01").type(VCloudMediaType.NETWORK_XML).href(
-               URI.create("https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/1619/network/VM-Tier01"))
-               .build()));
-
-   }
-
-   public void testFailed() {
-      InputStream is = getClass().getResourceAsStream("/vdc-failed.xml");
-      Injector injector = Guice.createInjector(new SaxParserModule());
-      Factory factory = injector.getInstance(ParseSax.Factory.class);
-      VDC result = factory.create(injector.getInstance(VDCHandler.class)).parse(is);
-      assertEquals(result.getName(), "Demo7");
-      assertEquals(result.getDescription(),
-               "ServiceProfileName = Essential; ServiceLocation = US_WEST; Email = red@chair.com;");
-      assertEquals(result.getStatus(), Status.FAILED);
-      assertEquals(result.getResourceEntities(), ImmutableSet.of(new ResourceImpl("1001", "Host1",
-               VCloudMediaType.VAPP_XML, URI
-                        .create("https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/1641/vApp/1001"))));
-      assertEquals(result.getAvailableNetworks(), ImmutableSet.of(ResourceImpl.builder().id("VM-Tier01").name(
-               "VM Tier01").type(VCloudMediaType.NETWORK_XML).href(
-               URI.create("https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/1641/network/VM-Tier01"))
-               .build()));
-
-   }
-
-   public void testSaved() {
-      InputStream is = getClass().getResourceAsStream("/vdc-saved.xml");
-      Injector injector = Guice.createInjector(new SaxParserModule());
-      Factory factory = injector.getInstance(ParseSax.Factory.class);
-      VDC result = factory.create(injector.getInstance(VDCHandler.class)).parse(is);
-      assertEquals(result.getName(), "CloudBurst1");
-      assertEquals(result.getDescription(),
-               "ServiceProfileName = Essential; ServiceLocation = US_WEST; Email = me@my.com;");
-      assertEquals(result.getStatus(), Status.SAVED);
-      assertEquals(
-               result.getResourceEntities(),
-               ImmutableSet
-                        .of(
-                                 ResourceImpl
-                                          .builder()
-                                          .name("templateHost")
-                                          .type("application/vnd.vmware.vcloud.vApp+xml")
-                                          .id("1001")
-                                          .href(
-                                                   URI
-                                                            .create("https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/2555/vApp/1001"))
-                                          .build(),
-                                 ResourceImpl
-                                          .builder()
-                                          .name("host-c501")
-                                          .type("application/vnd.vmware.vcloud.vApp+xml")
-                                          .id("1037")
-                                          .href(
-                                                   URI
-                                                            .create("https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/2555/vApp/1037"))
-                                          .build(),
-                                 ResourceImpl
-                                          .builder()
-                                          .name("host-c501")
-                                          .type("application/vnd.vmware.vcloud.vApp+xml")
-                                          .id("1038")
-                                          .href(
-                                                   URI
-                                                            .create("https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/2555/vApp/1038"))
-                                          .build(),
-                                 ResourceImpl
-                                          .builder()
-                                          .name("host-c601")
-                                          .type("application/vnd.vmware.vcloud.vApp+xml")
-                                          .id("1039")
-                                          .href(
-                                                   URI
-                                                            .create("https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/2555/vApp/1039"))
-                                          .build()));
-      assertEquals(result.getAvailableNetworks(), ImmutableSet.of(ResourceImpl.builder().id("VM-Tier01").name(
-               "VM Tier01").type(VCloudMediaType.NETWORK_XML).href(
-               URI.create("https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/2555/network/VM-Tier01"))
-               .build()));
-
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b91fd46c/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/VMHandlerTest.java
----------------------------------------------------------------------
diff --git a/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/VMHandlerTest.java b/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/VMHandlerTest.java
deleted file mode 100644
index a8fd20c..0000000
--- a/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/xml/VMHandlerTest.java
+++ /dev/null
@@ -1,146 +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.savvis.vpdc.xml;
-
-import static org.testng.Assert.assertEquals;
-
-import java.io.InputStream;
-import java.net.URI;
-
-import org.jclouds.cim.ResourceAllocationSettingData;
-import org.jclouds.cim.VirtualSystemSettingData;
-import org.jclouds.cim.ResourceAllocationSettingData.ResourceType;
-import org.jclouds.http.functions.ParseSax;
-import org.jclouds.http.functions.ParseSax.Factory;
-import org.jclouds.http.functions.config.SaxParserModule;
-import org.jclouds.ovf.OperatingSystemSection;
-import org.jclouds.ovf.ProductSection;
-import org.jclouds.ovf.Property;
-import org.jclouds.ovf.VirtualHardwareSection;
-import org.jclouds.savvis.vpdc.domain.NetworkConfigSection;
-import org.jclouds.savvis.vpdc.domain.NetworkConnectionSection;
-import org.jclouds.savvis.vpdc.domain.VM;
-import org.testng.annotations.Test;
-
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-/**
- * Tests behavior of {@code VMHandler}
- */
-@Test(groups = "unit")
-public class VMHandlerTest {
-   public void testVCloud1_0() {
-      InputStream is = getClass().getResourceAsStream("/vm.xml");
-      Injector injector = Guice.createInjector(new SaxParserModule());
-      Factory factory = injector.getInstance(ParseSax.Factory.class);
-      VM result = factory.create(injector.getInstance(VMHandler.class)).parse(is);
-
-      VM expected = VM
-               .builder()
-               .id("1001")
-               .status(VM.Status.ON)
-               .name("znHost2")
-               .type("application/vnd.vmware.vcloud.vApp+xml")
-               .href(
-                        URI
-                                 .create("https://api.sandbox.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1001"))
-               .networkConfigSection(
-                        NetworkConfigSection.builder().network("VM Tier01").gateway("0.0.0.0").netmask("0.0.0.0").info(
-                                 "MAC=00:00:00:00:00:00").fenceMode("allowInOut").dhcp(true).internalToExternalNATRule(
-                                 "10.76.2.4", "206.24.124.1").build())
-               .networkConnectionSection(
-                        NetworkConnectionSection.builder().network("VM Tier01").info(
-                                 "Read only description of a network connection to a deployed vApp").ipAddress(
-                                 "10.76.0.5").build())
-               .operatingSystemSection(
-                        OperatingSystemSection.builder().id(80).info("Specifies the operating system installed")
-                                 .description("Red Hat Enterprise Linux 5.x 64bit").build())
-               .productSection(
-                        ProductSection
-                                 .builder()
-                                 .info("vCenter Information")
-                                 .property(
-                                          Property.builder().value("false").key("vmwareToolsEnabled").label(
-                                                   "VMWare Tools Enabled status").description(
-                                                   "VMWare Tools Enabled status").build())
-                                 .property(
-
-                                          Property.builder().value("10.12.46.171").key("vmwareESXHost").label(
-                                                   "VMWare ESXHost Ipaddress").description("VMWare ESXHost Ipaddress")
-                                                   .build())
-                                 .property(
-
-                                          Property.builder().value("cussl01s01c01alun088bal,cussl01s01c01alun089bal")
-                                                   .key("datastores").label("Datastore Name").description(
-                                                            "Datastore Name").build())
-                                 .property(
-                                          Property
-                                                   .builder()
-                                                   .value("[Totalcapacity=1335915184128,UsedCapacity=549755813888]")
-                                                   .key("cussl01s01c01alun088bal")
-                                                   .label("Datastore Capacity")
-                                                   .description(
-                                                            "Datastore cussl01s01c01alun088bal Total Capacity, Used Capacity in comma separated")
-                                                   .build())
-                                 .property(
-
-                                          Property
-                                                   .builder()
-                                                   .value("[Totalcapacity=1335915184129,UsedCapacity=549755813889]")
-                                                   .key("cussl01s01c01alun089bal")
-                                                   .label("Datastore Capacity")
-                                                   .description(
-                                                            "Datastore cussl01s01c01alun089bal Total Capacity, Used Capacity in comma separated")
-                                                   .build()).property(
-
-                                          Property.builder().value(
-                                                   "[name=3282176-1949-bal-tier01,ip=0.0.0.0,mac=00:50:56:8c:3f:3c]")
-                                                   .key("customerPortprofile").label("customerPortprofile")
-                                                   .description("customerPortprofile").build()).property(
-
-                                          Property.builder().value(
-                                                   "[name=vm-server-mgmt,ip=0.0.0.0,mac=00:50:56:8c:39:75]").key(
-                                                   "savvisPortprofile").label("savvisPortprofile").description(
-                                                   "savvisPortprofile").build()).build()).virtualHardwareSection(
-                        VirtualHardwareSection.builder().info("UUID=52254cd2-d848-4e7d-b8f3-3d257fed7666").system(
-                                 VirtualSystemSettingData.builder().description("Virtual Hardware Family").elementName(
-                                          "znHost2").instanceID("1").virtualSystemIdentifier("znHost2").build()).item(
-                                 ResourceAllocationSettingData.builder().allocationUnits("3 GHz").description(
-                                          "Number of Virtual CPUs").elementName("1 CPU").instanceID("2").resourceType(
-                                          ResourceType.PROCESSOR).virtualQuantity(1l).build()).item(
-                                 ResourceAllocationSettingData.builder().allocationUnits("Gigabytes").description(
-                                          "Memory Size").elementName("Memory").instanceID("3").resourceType(
-                                          ResourceType.MEMORY).virtualQuantity(2l).build()).item(
-                                 ResourceAllocationSettingData.builder().connection("VM Tier01").elementName("Network")
-                                          .instanceID("4").resourceType(ResourceType.ETHERNET_ADAPTER).virtualQuantity(
-                                                   1l).build()).item(
-                                 ResourceAllocationSettingData.builder().allocationUnits("Gigabytes")
-                                          .caption("1234567").description("Hard Disk").elementName("C:\\")
-                                          .hostResource("boot").instanceID("5").resourceType(
-                                                   ResourceType.BASE_PARTITIONABLE_UNIT).virtualQuantity(25l).build())
-                                 .item(
-                                          ResourceAllocationSettingData.builder().allocationUnits("Gigabytes").caption(
-                                                   "1234568").description("Hard Disk").elementName("D:\\")
-                                                   .hostResource("data").instanceID("6").resourceType(
-                                                            ResourceType.PARTITIONABLE_UNIT).virtualQuantity(50l)
-                                                   .build()).build())
-
-               .build();
-      assertEquals(result, expected);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b91fd46c/savvis-symphonyvpdc/src/test/resources/capture-vapp-template-default.xml
----------------------------------------------------------------------
diff --git a/savvis-symphonyvpdc/src/test/resources/capture-vapp-template-default.xml b/savvis-symphonyvpdc/src/test/resources/capture-vapp-template-default.xml
deleted file mode 100644
index ffc4ebb..0000000
--- a/savvis-symphonyvpdc/src/test/resources/capture-vapp-template-default.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><CaptureVAppParams xmlns="http://schemas.api.sandbox.savvis.net/vpdci" name="CaptureTemplate"><Description>Save Template</Description><Source href="https://api.savvis.net/vpdc/v1.0/org/100000.0/vdc/2736/vApp/1001"/></CaptureVAppParams>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b91fd46c/savvis-symphonyvpdc/src/test/resources/cloneVApp-default.xml
----------------------------------------------------------------------
diff --git a/savvis-symphonyvpdc/src/test/resources/cloneVApp-default.xml b/savvis-symphonyvpdc/src/test/resources/cloneVApp-default.xml
deleted file mode 100644
index e9cc88e..0000000
--- a/savvis-symphonyvpdc/src/test/resources/cloneVApp-default.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><CloneVAppParams xmlns="http://www.vmware.com/vcloud/v0.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" deploy="true" name="clonedvm" powerOn="true" xsi:schemaLocation="http://www.vmware.com/vcloud/v0.8 https://api.savvis.net/ns/vcloud.xsd"><Description>VM Tier01</Description><VApp href="https://api.savvis.net/vpdc/v1.0/org/100000.0/vdc/2736/vApp/" type="application/vnd.vmware.vcloud.vApp+xml"/></CloneVAppParams>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b91fd46c/savvis-symphonyvpdc/src/test/resources/firewallService-default.xml
----------------------------------------------------------------------
diff --git a/savvis-symphonyvpdc/src/test/resources/firewallService-default.xml b/savvis-symphonyvpdc/src/test/resources/firewallService-default.xml
deleted file mode 100644
index 9f837a2..0000000
--- a/savvis-symphonyvpdc/src/test/resources/firewallService-default.xml
+++ /dev/null
@@ -1 +0,0 @@
-<svvs:FirewallService xmlns:svvs="http://schemas.api.sandbox.savvis.net/vpdci" xmlns:common="http://schemas.dmtf.org/wbem/wscim/1/common" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vApp="http://www.vmware.com/vcloud/v0.8" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"><svvs:FirewallRule><svvs:IsEnabled>true</svvs:IsEnabled><svvs:Description>Server Tier Firewall Rule</svvs:Description><svvs:Type>SERVER_TIER_FIREWALL</svvs:Type><svvs:Log>no</svvs:Log><svvs:Policy>allow</svvs:Policy><svvs:Protocols><svvs:Tcp>true</svvs:Tcp></svvs:Protocols><svvs:Port>22</svvs:Port><svvs:Destination>VM Tier01</svvs:Destination><svvs:Source>internet</svvs:Source></svvs:FirewallRule></svvs:FirewallService>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b91fd46c/savvis-symphonyvpdc/src/test/resources/firewallService.xml
----------------------------------------------------------------------
diff --git a/savvis-symphonyvpdc/src/test/resources/firewallService.xml b/savvis-symphonyvpdc/src/test/resources/firewallService.xml
deleted file mode 100644
index 4b4ae33..0000000
--- a/savvis-symphonyvpdc/src/test/resources/firewallService.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<svvs:FirewallService xmlns:common="http://schemas.dmtf.org/wbem/wscim/1/common"
-                      xmlns:vApp="http://www.vmware.com/vcloud/v0.8"
-                      xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData"
-                      xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"
-                      xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1"
-                      xmlns:svvs="http://schemas.api.sandbox.savvis.net/vpdci">
-    <svvs:IsEnabled>false</svvs:IsEnabled>
-    <svvs:FirewallRule>
-        <svvs:IsEnabled>true</svvs:IsEnabled>
-        <svvs:Description>Server Tier Firewall Rule</svvs:Description>
-        <svvs:Type>SERVER_TIER_FIREWALL</svvs:Type>
-        <svvs:Log>no</svvs:Log>
-        <svvs:Policy>allow</svvs:Policy>
-        <svvs:Protocols>
-            <svvs:Tcp>true</svvs:Tcp>
-        </svvs:Protocols>
-        <svvs:Port>22</svvs:Port>
-        <svvs:Destination>VM Tier01</svvs:Destination>
-        <svvs:Source>internet</svvs:Source>
-    </svvs:FirewallRule>
-    <svvs:FirewallRule>
-        <svvs:IsEnabled>true</svvs:IsEnabled>
-        <svvs:Description>Server Tier Firewall Rule</svvs:Description>
-        <svvs:Type>SERVER_TIER_FIREWALL</svvs:Type>
-        <svvs:Log>no</svvs:Log>
-        <svvs:Policy>allow</svvs:Policy>
-        <svvs:Protocols>
-            <svvs:Icmp-ping>true</svvs:Icmp-ping>
-        </svvs:Protocols>
-        <svvs:Port></svvs:Port>
-        <svvs:Destination>VM Tier03</svvs:Destination>
-        <svvs:Source>VM Tier03</svvs:Source>
-    </svvs:FirewallRule>
-</svvs:FirewallService>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b91fd46c/savvis-symphonyvpdc/src/test/resources/log4j.xml
----------------------------------------------------------------------
diff --git a/savvis-symphonyvpdc/src/test/resources/log4j.xml b/savvis-symphonyvpdc/src/test/resources/log4j.xml
deleted file mode 100644
index 63810d3..0000000
--- a/savvis-symphonyvpdc/src/test/resources/log4j.xml
+++ /dev/null
@@ -1,151 +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">
-
-    <!-- A time/date based rolling appender -->
-    <appender name="WIREFILE" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="File" value="target/test-data/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>
-
-    <!-- A time/date based rolling appender -->
-    <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="File" value="target/test-data/jclouds.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="COMPUTEFILE" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="File" value="target/test-data/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="SSHFILE" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="File" value="target/test-data/jclouds-ssh.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="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>
-
-    <!-- ================ -->
-    <!-- Limit categories -->
-    <!-- ================ -->
-
-    <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>
-    <!-- ======================= -->
-    <!-- Setup the Root category -->
-    <!-- ======================= -->
-
-    <root>
-        <priority value="WARN" />
-    </root>
-
-</log4j:configuration>

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b91fd46c/savvis-symphonyvpdc/src/test/resources/network-nat.xml
----------------------------------------------------------------------
diff --git a/savvis-symphonyvpdc/src/test/resources/network-nat.xml b/savvis-symphonyvpdc/src/test/resources/network-nat.xml
deleted file mode 100644
index 0de09a6..0000000
--- a/savvis-symphonyvpdc/src/test/resources/network-nat.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<vApp:Network xmlns:common="http://schemas.dmtf.org/wbem/wscim/1/common" xmlns:vApp="http://www.vmware.com/vcloud/v0.8"
-              xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData"
-              xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"
-              xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" name="VM Tier01"
-              type="application/vnd.vmware.vcloud.network+xml">
-    <vApp:Configuration>
-        <vApp:Gateway>1.1.1.1</vApp:Gateway>
-        <vApp:Netmask>2.2.2.2</vApp:Netmask>
-    </vApp:Configuration>
-    <vApp:Features>
-        <vApp:FenceMode>allowInOut</vApp:FenceMode>
-        <vApp:Nat>
-            <vApp:NatRule internalIP="3.3.3.3" externalIP="4.4.4.4"/>
-            <vApp:NatRule internalIP="3.3.3.4" externalIP="4.4.4.5"/>
-        </vApp:Nat>
-    </vApp:Features>
-</vApp:Network>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b91fd46c/savvis-symphonyvpdc/src/test/resources/network-unused.xml
----------------------------------------------------------------------
diff --git a/savvis-symphonyvpdc/src/test/resources/network-unused.xml b/savvis-symphonyvpdc/src/test/resources/network-unused.xml
deleted file mode 100644
index 5cade31..0000000
--- a/savvis-symphonyvpdc/src/test/resources/network-unused.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<vApp:Network xmlns:common="http://schemas.dmtf.org/wbem/wscim/1/common" xmlns:vApp="http://www.vmware.com/vcloud/v0.8"
-              xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData"
-              xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"
-              xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" name="VM Tier01"
-              type="application/vnd.vmware.vcloud.network+xml">
-    <vApp:Configuration>
-        <vApp:Gateway>0.0.0.0</vApp:Gateway>
-        <vApp:Netmask>0.0.0.0</vApp:Netmask>
-    </vApp:Configuration>
-    <vApp:Features>
-        <vApp:FenceMode>allowInOut</vApp:FenceMode>
-    </vApp:Features>
-</vApp:Network>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b91fd46c/savvis-symphonyvpdc/src/test/resources/network.xml
----------------------------------------------------------------------
diff --git a/savvis-symphonyvpdc/src/test/resources/network.xml b/savvis-symphonyvpdc/src/test/resources/network.xml
deleted file mode 100644
index 43b568b..0000000
--- a/savvis-symphonyvpdc/src/test/resources/network.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<vApp:Network xmlns:common="http://schemas.dmtf.org/wbem/wscim/1/common" xmlns:vApp="http://www.vmware.com/vcloud/v0.8" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" name="VM-Tier01" type="application/vnd.vmware.vcloud.network+xml">
-  <vApp:Configuration>
-    <vApp:Gateway>1.1.1.1</vApp:Gateway>
-    <vApp:Netmask>255.255.255.240</vApp:Netmask>
-  </vApp:Configuration>
-  <vApp:Features>
-    <vApp:FenceMode>allowInOut</vApp:FenceMode>
-  </vApp:Features>
-</vApp:Network>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b91fd46c/savvis-symphonyvpdc/src/test/resources/networkconfigsection.xml
----------------------------------------------------------------------
diff --git a/savvis-symphonyvpdc/src/test/resources/networkconfigsection.xml b/savvis-symphonyvpdc/src/test/resources/networkconfigsection.xml
deleted file mode 100644
index a1f7cd7..0000000
--- a/savvis-symphonyvpdc/src/test/resources/networkconfigsection.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-    <ovf:Section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="vApp:NetworkConfigSectionType"
-                 Network="VM Tier01" Gateway="0.0.0.0" Netmask="0.0.0.0">
-        <ovf:Info>MAC=00:00:00:00:00:00</ovf:Info>
-        <vApp:NetworkConfig>
-            <vApp:Features>
-                <vApp:FenceMode>allowInOut</vApp:FenceMode>
-                <vApp:Dhcp>true</vApp:Dhcp>
-                <vApp:Nat>
-                    <vApp:NatRule internalIP="10.76.2.4" externalIP="206.24.124.1"/>
-                </vApp:Nat>
-            </vApp:Features>
-        </vApp:NetworkConfig>
-    </ovf:Section>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b91fd46c/savvis-symphonyvpdc/src/test/resources/networkconnectionsection.xml
----------------------------------------------------------------------
diff --git a/savvis-symphonyvpdc/src/test/resources/networkconnectionsection.xml b/savvis-symphonyvpdc/src/test/resources/networkconnectionsection.xml
deleted file mode 100644
index c241b04..0000000
--- a/savvis-symphonyvpdc/src/test/resources/networkconnectionsection.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-    <ovf:Section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="vApp:NetworkConnectionType"
-                 Network="VM Tier01">
-        <ovf:Info>Read only description of a network connection to a deployed vApp</ovf:Info>
-        <vApp:IpAddress>10.76.0.5</vApp:IpAddress>
-    </ovf:Section>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b91fd46c/savvis-symphonyvpdc/src/test/resources/org.xml
----------------------------------------------------------------------
diff --git a/savvis-symphonyvpdc/src/test/resources/org.xml b/savvis-symphonyvpdc/src/test/resources/org.xml
deleted file mode 100644
index 090c043..0000000
--- a/savvis-symphonyvpdc/src/test/resources/org.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<vApp:Org xmlns:common="http://schemas.dmtf.org/wbem/wscim/1/common" xmlns:vApp="http://www.vmware.com/vcloud/v0.8" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" name="100000.0">
-  <vApp:Link name="demo_vpdcname" type="application/vnd.vmware.vcloud.vdc+xml" href="https://api.sandbox.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736" rel="down"/>
-  <vApp:Description>SAVVISStation Integration Testing</vApp:Description>
-</vApp:Org>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b91fd46c/savvis-symphonyvpdc/src/test/resources/org_no_vdc.xml
----------------------------------------------------------------------
diff --git a/savvis-symphonyvpdc/src/test/resources/org_no_vdc.xml b/savvis-symphonyvpdc/src/test/resources/org_no_vdc.xml
deleted file mode 100644
index 5c41ab6..0000000
--- a/savvis-symphonyvpdc/src/test/resources/org_no_vdc.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<vApp:Org xmlns:common="http://schemas.dmtf.org/wbem/wscim/1/common" xmlns:vApp="http://www.vmware.com/vcloud/v0.8" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" name="100000.0">
-	<vApp:Description>SAVVISStation Integration Testing</vApp:Description>
-</vApp:Org>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b91fd46c/savvis-symphonyvpdc/src/test/resources/orglist.xml
----------------------------------------------------------------------
diff --git a/savvis-symphonyvpdc/src/test/resources/orglist.xml b/savvis-symphonyvpdc/src/test/resources/orglist.xml
deleted file mode 100644
index 10834ac..0000000
--- a/savvis-symphonyvpdc/src/test/resources/orglist.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<vApp:OrgList xmlns:vApp="http://www.vmware.com/vcloud/v0.8">
-  <vApp:Org name="SAVVISStation Integration Testing" type="application/vnd.vmware.vcloud.org+xml" href="https://api.sandbox.savvis.net/rest/api/v0.8/org/100000.0"/>
-</vApp:OrgList>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b91fd46c/savvis-symphonyvpdc/src/test/resources/task-error.xml
----------------------------------------------------------------------
diff --git a/savvis-symphonyvpdc/src/test/resources/task-error.xml b/savvis-symphonyvpdc/src/test/resources/task-error.xml
deleted file mode 100644
index 32ef2b6..0000000
--- a/savvis-symphonyvpdc/src/test/resources/task-error.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<vApp:TasksList xmlns:common="http://schemas.dmtf.org/wbem/wscim/1/common"
-                xmlns:vApp="http://www.vmware.com/vcloud/v0.8"
-                xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData"
-                xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"
-                xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1">
-    <vApp:Task endTime="2010-05-26T08:09:09.000+08:00" startTime="2010-05-26T08:08:08.000+08:00" status="error">
-        <vApp:Error vendorSpecificErrorCode="0" minorErrorCode="0" majorErrorCode="0"
-                    message="There is an internal exception occured in System, please kindly contact savvis support team to get solution."/>
-    </vApp:Task>
-</vApp:TasksList>

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b91fd46c/savvis-symphonyvpdc/src/test/resources/task-failed.xml
----------------------------------------------------------------------
diff --git a/savvis-symphonyvpdc/src/test/resources/task-failed.xml b/savvis-symphonyvpdc/src/test/resources/task-failed.xml
deleted file mode 100644
index 8e27779..0000000
--- a/savvis-symphonyvpdc/src/test/resources/task-failed.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<vApp:TasksList xmlns:common="http://schemas.dmtf.org/wbem/wscim/1/common"
-                xmlns:vApp="http://www.vmware.com/vcloud/v0.8"
-                xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData"
-                xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"
-                xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1">
-    <vApp:Task endTime="2010-05-26T08:09:09.000+08:00" startTime="2010-05-26T08:08:08.000+08:00" status="error"
-               type="application/vnd.vmware.vcloud.task+xml" href="https://api.savvis.net/rest/api/v0.8/task/6904-123">
-        <vApp:Owner name="mockVpdc8" type="application/vnd.vmware.vcloud.vdc+xml"
-                    href="https://api.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736"/>
-        <vApp:Result name="mock_vpdc_item_007" type="application/vnd.vmware.vcloud.vApp+xml"
-                    href="https://api.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1002"/>
-    </vApp:Task>
-</vApp:TasksList>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b91fd46c/savvis-symphonyvpdc/src/test/resources/task-invalidsize.xml
----------------------------------------------------------------------
diff --git a/savvis-symphonyvpdc/src/test/resources/task-invalidsize.xml b/savvis-symphonyvpdc/src/test/resources/task-invalidsize.xml
deleted file mode 100644
index 7b57719..0000000
--- a/savvis-symphonyvpdc/src/test/resources/task-invalidsize.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><vApp:TasksList xmlns:common="http://schemas.dmtf.org/wbem/wscim/1/common" xmlns:vApp="http://www.vmware.com/vcloud/v0.8" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1"><vApp:Task status="error"><vApp:Error vendorSpecificErrorCode="1016" minorErrorCode="471" majorErrorCode="500" message="The vApp CPU : {3 GHz * 1} and Memory : {1} is not to be supported."/></vApp:Task></vApp:TasksList>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b91fd46c/savvis-symphonyvpdc/src/test/resources/task-queued.xml
----------------------------------------------------------------------
diff --git a/savvis-symphonyvpdc/src/test/resources/task-queued.xml b/savvis-symphonyvpdc/src/test/resources/task-queued.xml
deleted file mode 100644
index c37e1db..0000000
--- a/savvis-symphonyvpdc/src/test/resources/task-queued.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<vApp:TasksList xmlns:common="http://schemas.dmtf.org/wbem/wscim/1/common" xmlns:vApp="http://www.vmware.com/vcloud/v0.8" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1">
-  <vApp:Task startTime="2011-03-24T20:37:34.000Z" status="queued" href="https://api.savvis.net/rest/api/v0.8/task/113927-1005">
-    <vApp:Owner name="Foo" type="application/vnd.vmware.vcloud.vdc+xml" href="https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/4253"/>
-    <vApp:Result name="adriancole" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/4253/vApp/1005"/>
-  </vApp:Task>
-</vApp:TasksList>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b91fd46c/savvis-symphonyvpdc/src/test/resources/task-running.xml
----------------------------------------------------------------------
diff --git a/savvis-symphonyvpdc/src/test/resources/task-running.xml b/savvis-symphonyvpdc/src/test/resources/task-running.xml
deleted file mode 100644
index 7150acc..0000000
--- a/savvis-symphonyvpdc/src/test/resources/task-running.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<vApp:TasksList xmlns:common="http://schemas.dmtf.org/wbem/wscim/1/common"
-                xmlns:vApp="http://www.vmware.com/vcloud/v0.8"
-                xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData"
-                xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"
-                xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1">
-                <!--If Task status is running, Savvis is not displaying endTime.-->
-    <vApp:Task startTime="2010-05-26T08:08:08.000+08:00" status="running" type="application/vnd.vmware.vcloud.task+xml"
-               href="https://api.savvis.net/rest/api/v0.8/task/6904">
-        <vApp:Owner name="mockVpdc8" type="application/vnd.vmware.vcloud.vdc+xml"
-                    href="https://api.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736"/>
-        <vApp:Result name="mock_vpdc_item_007" type="application/vnd.vmware.vcloud.catalogItem+xml"
-                    href="https://api.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1002"/>
-    </vApp:Task>
-</vApp:TasksList>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b91fd46c/savvis-symphonyvpdc/src/test/resources/task-undeployedvdc.xml
----------------------------------------------------------------------
diff --git a/savvis-symphonyvpdc/src/test/resources/task-undeployedvdc.xml b/savvis-symphonyvpdc/src/test/resources/task-undeployedvdc.xml
deleted file mode 100644
index 26b6438..0000000
--- a/savvis-symphonyvpdc/src/test/resources/task-undeployedvdc.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><vApp:TasksList xmlns:common="http://schemas.dmtf.org/wbem/wscim/1/common" xmlns:vApp="http://www.vmware.com/vcloud/v0.8" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1"><vApp:Task status="error"><vApp:Error vendorSpecificErrorCode="-1" minorErrorCode="0" majorErrorCode="500" message="Please finish your previously deployment for vpdcId:1619"/></vApp:Task></vApp:TasksList>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b91fd46c/savvis-symphonyvpdc/src/test/resources/task-unsupported.xml
----------------------------------------------------------------------
diff --git a/savvis-symphonyvpdc/src/test/resources/task-unsupported.xml b/savvis-symphonyvpdc/src/test/resources/task-unsupported.xml
deleted file mode 100644
index 9987b40..0000000
--- a/savvis-symphonyvpdc/src/test/resources/task-unsupported.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<vApp:TasksList xmlns:common="http://schemas.dmtf.org/wbem/wscim/1/common"
-                xmlns:vApp="http://www.vmware.com/vcloud/v0.8"
-                xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData"
-                xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"
-                xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1">
-    <vApp:Task endTime="2010-05-26T08:09:09.000+08:00" startTime="2010-05-26T08:08:08.000+08:00" status="None"
-               type="application/vnd.vmware.vcloud.task+xml" href="https://api.savvis.net/rest/api/v0.8/task/3904-1002">
-        <vApp:Error vendorSpecificErrorCode="3000" minorErrorCode="-1" majorErrorCode="500"
-                    message="your requested task id is not found. Please contact Savvis Administrator for further assistance/clarification "/>
-    </vApp:Task>
-</vApp:TasksList>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b91fd46c/savvis-symphonyvpdc/src/test/resources/task-vapp.xml
----------------------------------------------------------------------
diff --git a/savvis-symphonyvpdc/src/test/resources/task-vapp.xml b/savvis-symphonyvpdc/src/test/resources/task-vapp.xml
deleted file mode 100644
index 0cd66df..0000000
--- a/savvis-symphonyvpdc/src/test/resources/task-vapp.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<vApp:TasksList xmlns:common="http://schemas.dmtf.org/wbem/wscim/1/common"
-                xmlns:vApp="http://www.vmware.com/vcloud/v0.8"
-                xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData"
-                xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"
-                xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1">
-    <vApp:Task endTime="2010-05-26T08:09:09.000+08:00" startTime="2010-05-26T08:08:08.000+08:00" status="success"
-               type="application/vnd.vmware.vcloud.task+xml" href="https://api.savvis.net/rest/api/v0.8/task/21-1002">
-        <vApp:Owner name="mockVpdc8" type="application/vnd.vmware.vcloud.vdc+xml"
-                    href="https://api.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736"/>
-        <vApp:Result name="mock_vpdc_item_007" type="application/vnd.vmware.vcloud.vApp+xml"
-                     href="https://api.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1002"/>
-    </vApp:Task>
-</vApp:TasksList>

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b91fd46c/savvis-symphonyvpdc/src/test/resources/task-vmdk.xml
----------------------------------------------------------------------
diff --git a/savvis-symphonyvpdc/src/test/resources/task-vmdk.xml b/savvis-symphonyvpdc/src/test/resources/task-vmdk.xml
deleted file mode 100644
index b687c78..0000000
--- a/savvis-symphonyvpdc/src/test/resources/task-vmdk.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<vApp:TasksList xmlns:common="http://schemas.dmtf.org/wbem/wscim/1/common"
-                xmlns:vApp="http://www.vmware.com/vcloud/v0.8"
-                xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData"
-                xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"
-                xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1">
-    <vApp:Task endTime="2010-05-26T08:09:09.000+08:00" startTime="2010-05-26T08:08:08.000+08:00" status="success"
-               type="application/vnd.vmware.vcloud.task+xml" href="https://api.savvis.net/rest/api/v0.8/task/21-1002">
-        <vApp:Owner name="mockVpdc8" type="application/vnd.vmware.vcloud.vdc+xml"
-                    href="https://api.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736"/>
-        <vApp:Result name="mock_vpdc_item_008" type="application/vnd.vmware.vcloud.vApp+xml"
-                     href="https://api.savvis.net/rest/api/v0.8/vdc/2736/vmdk/1234567"/>
-     </vApp:Task>
-</vApp:TasksList>

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b91fd46c/savvis-symphonyvpdc/src/test/resources/vdc-1net.xml
----------------------------------------------------------------------
diff --git a/savvis-symphonyvpdc/src/test/resources/vdc-1net.xml b/savvis-symphonyvpdc/src/test/resources/vdc-1net.xml
deleted file mode 100644
index 5d18579..0000000
--- a/savvis-symphonyvpdc/src/test/resources/vdc-1net.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<vApp:Vdc xmlns:common="http://schemas.dmtf.org/wbem/wscim/1/common" xmlns:vApp="http://www.vmware.com/vcloud/v0.8" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" name="demo6" type="application/vnd.vmware.vcloud.vdc+xml">
-  <vApp:Description>ServiceProfileName = Essential; ServiceLocation = US_WEST; Email = red@chair.com;</vApp:Description>
-  <vApp:OfferingTag>Deployed</vApp:OfferingTag>
-  <vApp:ResourceEntities>
-    <vApp:ResourceEntity name="Host1" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/1619/vApp/1001"/>
-    <vApp:ResourceEntity name="Host2" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/1619/vApp/1002"/>
-    <vApp:ResourceEntity name="Host3" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/1619/vApp/1003"/>
-    <vApp:ResourceEntity name="Host4" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/1619/vApp/1004"/>
-  </vApp:ResourceEntities>
-  <vApp:AvailableNetworks>
-    <vApp:Network name="VM Tier01" type="application/vnd.vmware.vcloud.network+xml" href="https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/1619/network/VM-Tier01"/>
-  </vApp:AvailableNetworks>
-</vApp:Vdc>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b91fd46c/savvis-symphonyvpdc/src/test/resources/vdc-failed.xml
----------------------------------------------------------------------
diff --git a/savvis-symphonyvpdc/src/test/resources/vdc-failed.xml b/savvis-symphonyvpdc/src/test/resources/vdc-failed.xml
deleted file mode 100644
index a995dbe..0000000
--- a/savvis-symphonyvpdc/src/test/resources/vdc-failed.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<vApp:Vdc xmlns:common="http://schemas.dmtf.org/wbem/wscim/1/common" xmlns:vApp="http://www.vmware.com/vcloud/v0.8" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" name="Demo7" type="application/vnd.vmware.vcloud.vdc+xml">
-  <vApp:Description>ServiceProfileName = Essential; ServiceLocation = US_WEST; Email = red@chair.com;</vApp:Description>
-  <vApp:OfferingTag>Failed</vApp:OfferingTag>
-  <vApp:ResourceEntities>
-    <vApp:ResourceEntity name="Host1" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/1641/vApp/1001"/>
-  </vApp:ResourceEntities>
-  <vApp:AvailableNetworks>
-    <vApp:Network name="VM Tier01" type="application/vnd.vmware.vcloud.network+xml" href="https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/1641/network/VM-Tier01"/>
-  </vApp:AvailableNetworks>
-</vApp:Vdc>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b91fd46c/savvis-symphonyvpdc/src/test/resources/vdc-saved.xml
----------------------------------------------------------------------
diff --git a/savvis-symphonyvpdc/src/test/resources/vdc-saved.xml b/savvis-symphonyvpdc/src/test/resources/vdc-saved.xml
deleted file mode 100644
index 990e384..0000000
--- a/savvis-symphonyvpdc/src/test/resources/vdc-saved.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<vApp:Vdc xmlns:common="http://schemas.dmtf.org/wbem/wscim/1/common" xmlns:vApp="http://www.vmware.com/vcloud/v0.8" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" name="CloudBurst1" type="application/vnd.vmware.vcloud.vdc+xml">
-  <vApp:Description>ServiceProfileName = Essential; ServiceLocation = US_WEST; Email = me@my.com;</vApp:Description>
-  <vApp:OfferingTag>Saved</vApp:OfferingTag>
-  <vApp:ResourceEntities>
-    <vApp:ResourceEntity name="templateHost" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/2555/vApp/1001"/>
-    <vApp:ResourceEntity name="host-c501" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/2555/vApp/1037"/>
-    <vApp:ResourceEntity name="host-c501" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/2555/vApp/1038"/>
-    <vApp:ResourceEntity name="host-c601" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/2555/vApp/1039"/>
-  </vApp:ResourceEntities>
-  <vApp:AvailableNetworks>
-    <vApp:Network name="VM Tier01" type="application/vnd.vmware.vcloud.network+xml" href="https://api.savvis.net/rest/api/v0.8/org/606677.0/vdc/2555/network/VM-Tier01"/>
-  </vApp:AvailableNetworks>
-</vApp:Vdc>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b91fd46c/savvis-symphonyvpdc/src/test/resources/vdc.xml
----------------------------------------------------------------------
diff --git a/savvis-symphonyvpdc/src/test/resources/vdc.xml b/savvis-symphonyvpdc/src/test/resources/vdc.xml
deleted file mode 100644
index fc74367..0000000
--- a/savvis-symphonyvpdc/src/test/resources/vdc.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<vApp:Vdc xmlns:common="http://schemas.dmtf.org/wbem/wscim/1/common" xmlns:vApp="http://www.vmware.com/vcloud/v0.8" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" name="demo_vpdcname" type="application/vnd.vmware.vcloud.vdc+xml">
-  <vApp:Description>ServiceProfileName = Balanced; ServiceLocation = North America; Email = jim@company.com;</vApp:Description>
-  <vApp:OfferingTag>Deployed</vApp:OfferingTag>
-  <vApp:ResourceEntities>
-    <vApp:ResourceEntity name="DemoHost-1" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.sandbox.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1001"/>
-    <vApp:ResourceEntity name="DemoHost-2" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.sandbox.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1002"/>
-    <vApp:ResourceEntity name="DemoHost-3" type="application/vnd.vmware.vcloud.vApp+xml" href="https://api.sandbox.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vApp/1003"/>
-    <vApp:ResourceEntity name="CustomerTemplateName" type="application/vnd.vmware.vcloud.vAppTemplate+xml" href="https://api.sandbox.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/vAppTemplate/1234"/>
-    <vApp:ResourceEntity name="firewall" type="api.savvis.net+xml" href="https://api.sandbox.savvis.net/rest/api/v0.8/org/100000.0/vdc/2736/FirewallService"/>
-  </vApp:ResourceEntities>
-  <vApp:AvailableNetworks/>
-</vApp:Vdc>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b91fd46c/savvis-symphonyvpdc/src/test/resources/vm-default.xml
----------------------------------------------------------------------
diff --git a/savvis-symphonyvpdc/src/test/resources/vm-default.xml b/savvis-symphonyvpdc/src/test/resources/vm-default.xml
deleted file mode 100644
index 271ddcf..0000000
--- a/savvis-symphonyvpdc/src/test/resources/vm-default.xml
+++ /dev/null
@@ -1 +0,0 @@
-<vApp:VApp xmlns:vApp="http://www.vmware.com/vcloud/v0.8" xmlns:common="http://schemas.dmtf.org/wbem/wscim/1/common" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" href="" name="DemoHost-1" type="application/vnd.vmware.vcloud.vApp+xml"><ovf:OperatingSystemSection ovf:id="80"><ovf:Info>Specifies the operating system installed</ovf:Info><ovf:Description>Red Hat Enterprise Linux 5.x 64bit</ovf:Description></ovf:OperatingSystemSection><ovf:VirtualHardwareSection><ovf:Info>Virtual Hardware</ovf:Info><ovf:System><vssd:Description>Virtual Hardware Family</vssd:Description><vssd:ElementName>DemoHost-1</vssd:ElementName><vssd:InstanceID>1</vssd:InstanceID><vssd:VirtualSystemIdentifier>DemoHost-1</vssd:VirtualSystemIdentifier></ovf:System><ovf:Item><rasd:AllocationUnits>3 GHz</rasd:AllocationUnits><rasd
 :Description>Number of Virtual CPUs</rasd:Description><rasd:ElementName>1 CPU</rasd:ElementName><rasd:InstanceID>1</rasd:InstanceID><rasd:ResourceType>3</rasd:ResourceType><rasd:VirtualQuantity>1</rasd:VirtualQuantity></ovf:Item><ovf:Item><rasd:AllocationUnits>Gigabytes</rasd:AllocationUnits><rasd:Description>Memory Size</rasd:Description><rasd:ElementName>Memory</rasd:ElementName><rasd:InstanceID>2</rasd:InstanceID><rasd:ResourceType>4</rasd:ResourceType><rasd:VirtualQuantity>1</rasd:VirtualQuantity></ovf:Item><ovf:Item><rasd:Caption>false</rasd:Caption><rasd:Connection>VM Tier01</rasd:Connection><rasd:ElementName>Network</rasd:ElementName><rasd:InstanceID>3</rasd:InstanceID><rasd:ResourceType>10</rasd:ResourceType><rasd:VirtualQuantity>1</rasd:VirtualQuantity></ovf:Item><ovf:Item><rasd:AllocationUnits>Gigabytes</rasd:AllocationUnits><rasd:Caption/><rasd:Description>Hard Disk</rasd:Description><rasd:ElementName>/</rasd:ElementName><rasd:HostResource>boot</rasd:HostResource><rasd:In
 stanceID>4</rasd:InstanceID><rasd:ResourceType>27</rasd:ResourceType><rasd:VirtualQuantity>25</rasd:VirtualQuantity></ovf:Item></ovf:VirtualHardwareSection></vApp:VApp>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b91fd46c/savvis-symphonyvpdc/src/test/resources/vm-multiple-default.xml
----------------------------------------------------------------------
diff --git a/savvis-symphonyvpdc/src/test/resources/vm-multiple-default.xml b/savvis-symphonyvpdc/src/test/resources/vm-multiple-default.xml
deleted file mode 100644
index c3f8c4d..0000000
--- a/savvis-symphonyvpdc/src/test/resources/vm-multiple-default.xml
+++ /dev/null
@@ -1 +0,0 @@
-<vApp:VApp xmlns:vApp="http://www.vmware.com/vcloud/v0.8" xmlns:common="http://schemas.dmtf.org/wbem/wscim/1/common" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" name=""><vApp:Children><vApp:VApp name="Test VM" type="application/vnd.vmware.vcloud.vApp+xml"><ovf:OperatingSystemSection ovf:id="80"><ovf:Info>Specifies the operating system installed</ovf:Info><ovf:Description>Red Hat Enterprise Linux 5.x 64bit</ovf:Description></ovf:OperatingSystemSection><ovf:VirtualHardwareSection><ovf:Info>Virtual Hardware</ovf:Info><ovf:System><vssd:Description>Virtual Hardware Family</vssd:Description><vssd:ElementName>Test VM</vssd:ElementName><vssd:InstanceID>1</vssd:InstanceID><vssd:VirtualSystemIdentifier>Test VM</vssd:VirtualSystemIdentifier></ovf:System><ovf:Item><rasd:AllocationUnits>3 GHz</rasd:Allo
 cationUnits><rasd:Description>Number of Virtual CPUs</rasd:Description><rasd:ElementName>1 CPU</rasd:ElementName><rasd:InstanceID>1</rasd:InstanceID><rasd:ResourceType>3</rasd:ResourceType><rasd:VirtualQuantity>1</rasd:VirtualQuantity></ovf:Item><ovf:Item><rasd:AllocationUnits>Gigabytes</rasd:AllocationUnits><rasd:Description>Memory Size</rasd:Description><rasd:ElementName>Memory</rasd:ElementName><rasd:InstanceID>2</rasd:InstanceID><rasd:ResourceType>4</rasd:ResourceType><rasd:VirtualQuantity>1</rasd:VirtualQuantity></ovf:Item><ovf:Item><rasd:Caption>false</rasd:Caption><rasd:Connection>VM Tier01</rasd:Connection><rasd:ElementName>Network</rasd:ElementName><rasd:InstanceID>3</rasd:InstanceID><rasd:ResourceType>10</rasd:ResourceType><rasd:VirtualQuantity>1</rasd:VirtualQuantity></ovf:Item><ovf:Item><rasd:AllocationUnits>Gigabytes</rasd:AllocationUnits><rasd:Caption/><rasd:Description>Hard Disk</rasd:Description><rasd:ElementName>/</rasd:ElementName><rasd:HostResource>boot</rasd:Host
 Resource><rasd:InstanceID>4</rasd:InstanceID><rasd:ResourceType>27</rasd:ResourceType><rasd:VirtualQuantity>25</rasd:VirtualQuantity></ovf:Item></ovf:VirtualHardwareSection></vApp:VApp></vApp:Children></vApp:VApp>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b91fd46c/savvis-symphonyvpdc/src/test/resources/vm-withdisks.xml
----------------------------------------------------------------------
diff --git a/savvis-symphonyvpdc/src/test/resources/vm-withdisks.xml b/savvis-symphonyvpdc/src/test/resources/vm-withdisks.xml
deleted file mode 100644
index 0de09a6..0000000
--- a/savvis-symphonyvpdc/src/test/resources/vm-withdisks.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<vApp:Network xmlns:common="http://schemas.dmtf.org/wbem/wscim/1/common" xmlns:vApp="http://www.vmware.com/vcloud/v0.8"
-              xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData"
-              xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"
-              xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" name="VM Tier01"
-              type="application/vnd.vmware.vcloud.network+xml">
-    <vApp:Configuration>
-        <vApp:Gateway>1.1.1.1</vApp:Gateway>
-        <vApp:Netmask>2.2.2.2</vApp:Netmask>
-    </vApp:Configuration>
-    <vApp:Features>
-        <vApp:FenceMode>allowInOut</vApp:FenceMode>
-        <vApp:Nat>
-            <vApp:NatRule internalIP="3.3.3.3" externalIP="4.4.4.4"/>
-            <vApp:NatRule internalIP="3.3.3.4" externalIP="4.4.4.5"/>
-        </vApp:Nat>
-    </vApp:Features>
-</vApp:Network>
\ No newline at end of file