Issue 112: updated to latest hosting.com api

git-svn-id: http://jclouds.googlecode.com/svn/trunk@2442 3d8758e0-26b5-11de-8745-db77d3ebf521
2009-12-16 00:41:29 +00:00 · 2009-12-16 00:41:29 +00:00 · 2ee25b9629
parent da8206a64a
commit 2ee25b9629
14 changed files with 462 additions and 208 deletions
--- a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/Task.java
+++ b/vcloud/core/src/main/java/org/jclouds/vcloud/domain/Task.java
@ -26,7 +26,7 @@ package org.jclouds.vcloud.domain;
 import java.util.Date;

 import org.jclouds.rest.domain.Link;
-import org.jclouds.rest.domain.NamedLink;
+import org.jclouds.rest.domain.NamedResource;
 import org.jclouds.vcloud.domain.internal.TaskImpl;

 import com.google.inject.ImplementedBy;
@ -43,7 +43,7 @@ public interface Task extends Link, Comparable<Task> {

   Date getEndTime();

-   NamedLink getOwner();
+   NamedResource getOwner();

-   NamedLink getResult();
+   NamedResource getResult();
 }
--- a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/internal/TaskImpl.java
+++ b/vcloud/core/src/main/java/org/jclouds/vcloud/domain/internal/TaskImpl.java
@ -28,8 +28,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import java.net.URI;
 import java.util.Date;

-import org.jclouds.rest.domain.NamedLink;
+import org.jclouds.rest.domain.NamedResource;
 import org.jclouds.rest.domain.internal.LinkImpl;
+import org.jclouds.vcloud.VCloudMediaType;
 import org.jclouds.vcloud.domain.Task;
 import org.jclouds.vcloud.domain.TaskStatus;

@ -46,13 +47,13 @@ public class TaskImpl extends LinkImpl implements Task {
   private final Date startTime;
   @Nullable
   private final Date endTime;
-   private final NamedLink owner;
+   private final NamedResource owner;
   @Nullable
-   private final NamedLink result;
+   private final NamedResource result;

-   public TaskImpl(String type, URI location, TaskStatus status, Date startTime,
-            @Nullable Date endTime, NamedLink owner, @Nullable NamedLink result) {
-      super(type, location);
+   public TaskImpl(URI location, TaskStatus status, Date startTime, @Nullable Date endTime,
+            NamedResource owner, @Nullable NamedResource result) {
+      super(VCloudMediaType.TASK_XML, location);
      this.status = checkNotNull(status, "status");
      this.startTime = startTime;
      this.endTime = endTime;
@ -68,11 +69,11 @@ public class TaskImpl extends LinkImpl implements Task {
      return startTime;
   }

-   public NamedLink getOwner() {
+   public NamedResource getOwner() {
      return owner;
   }

-   public NamedLink getResult() {
+   public NamedResource getResult() {
      return result;
   }

--- a/vcloud/core/src/main/java/org/jclouds/vcloud/predicates/TaskSuccess.java
+++ b/vcloud/core/src/main/java/org/jclouds/vcloud/predicates/TaskSuccess.java
@ -75,7 +75,7 @@ public class TaskSuccess implements Predicate<URI> {
      } catch (InterruptedException e) {
         logger.warn(e, "%s interrupted, returning false", taskUri);
      } catch (ExecutionException e) {
-         logger.warn(e, "%s exception, returning false", taskUri);
+         throw new RuntimeException(e.getCause());
      } catch (TimeoutException e) {
         logger.warn(e, "%s timeout, returning false", taskUri);
      }
--- a/vcloud/core/src/main/java/org/jclouds/vcloud/xml/TaskHandler.java
+++ b/vcloud/core/src/main/java/org/jclouds/vcloud/xml/TaskHandler.java
@ -33,7 +33,7 @@ import org.jclouds.date.DateService;
 import org.jclouds.http.functions.ParseSax;
 import org.jclouds.logging.Logger;
 import org.jclouds.rest.domain.Link;
-import org.jclouds.rest.domain.NamedLink;
+import org.jclouds.rest.domain.NamedResource;
 import org.jclouds.rest.util.Utils;
 import org.jclouds.vcloud.domain.Task;
 import org.jclouds.vcloud.domain.TaskStatus;
@ -48,8 +48,8 @@ public class TaskHandler extends ParseSax.HandlerWithResult<Task> {
   protected final DateService dateService;

   private Link taskLink;
-   private NamedLink owner;
-   private NamedLink result;
+   private NamedResource owner;
+   private NamedResource result;
   private TaskStatus status;
   private Date startTime;
   private Date endTime;
@ -71,7 +71,7 @@ public class TaskHandler extends ParseSax.HandlerWithResult<Task> {
   public void startElement(String uri, String localName, String qName, Attributes attributes)
            throws SAXException {
      if (qName.equalsIgnoreCase("Task")) {
-         if (attributes.getIndex("type") != -1)
+         if (attributes.getIndex("href") != -1)// queued tasks may not have an href yet
            taskLink = Utils.newLink(attributes);
         status = TaskStatus.fromValue(attributes.getValue(attributes.getIndex("status")));
         if (attributes.getIndex("startTime") != -1)
@ -80,11 +80,12 @@ public class TaskHandler extends ParseSax.HandlerWithResult<Task> {
            endTime = parseDate(attributes, "endTime");
         }
      } else if (qName.equals("Owner")) {
-         owner = Utils.newNamedLink(attributes);
-      } else if (qName.equals("Link")) {
+         owner = Utils.newNamedResource(attributes);
+      } else if (qName.equals("Link") && attributes.getIndex("rel") != -1
+               && attributes.getValue(attributes.getIndex("rel")).equals("self")) {
         taskLink = Utils.newNamedLink(attributes);
      } else if (qName.equals("Result")) {
-         result = Utils.newNamedLink(attributes);
+         result = Utils.newNamedResource(attributes);
      }
   }

@ -110,8 +111,7 @@ public class TaskHandler extends ParseSax.HandlerWithResult<Task> {
   @Override
   public void endElement(String uri, String localName, String qName) throws SAXException {
      if (qName.equalsIgnoreCase("Task")) {
-         this.task = new TaskImpl(taskLink.getType(), taskLink.getLocation(), status, startTime,
-                  endTime, owner, result);
+         this.task = new TaskImpl(taskLink.getLocation(), status, startTime, endTime, owner, result);
         taskLink = null;
         status = null;
         startTime = null;
--- a/vcloud/core/src/main/java/org/jclouds/vcloud/xml/VAppHandler.java
+++ b/vcloud/core/src/main/java/org/jclouds/vcloud/xml/VAppHandler.java
@ -92,7 +92,7 @@ public class VAppHandler extends ParseSax.HandlerWithResult<VApp> {
      } else if (qName.equals("OperatingSystemSection")) {
         inOs = true;
      } else if (qName.equals("NetworkConnection")) {
-         networkName = attributes.getValue(attributes.getIndex("name"));
+         networkName = attributes.getValue(attributes.getIndex("Network"));
      } else {
         systemHandler.startElement(uri, localName, qName, attributes);
         allocationHandler.startElement(uri, localName, qName, attributes);
@ -106,7 +106,7 @@ public class VAppHandler extends ParseSax.HandlerWithResult<VApp> {
         inOs = false;
      } else if (inOs && qName.equals("Description")) {
         operatingSystemDescription = currentText.toString().trim();
-      } else if (qName.equals("IPAddress")) {
+      } else if (qName.equals("IpAddress")) {
         networkToAddresses.put(networkName, parseInetAddress(currentText.toString().trim()));
      } else if (qName.equals("System")) {
         systemHandler.endElement(uri, localName, qName);
--- a/vcloud/core/src/test/java/org/jclouds/vcloud/xml/TaskHandlerTest.java
+++ b/vcloud/core/src/test/java/org/jclouds/vcloud/xml/TaskHandlerTest.java
@ -30,7 +30,7 @@ import java.net.URI;

 import org.jclouds.date.DateService;
 import org.jclouds.http.functions.BaseHandlerTest;
-import org.jclouds.rest.domain.internal.NamedLinkImpl;
+import org.jclouds.rest.internal.NamedResourceImpl;
 import org.jclouds.vcloud.VCloudMediaType;
 import org.jclouds.vcloud.domain.Task;
 import org.jclouds.vcloud.domain.TaskStatus;
@ -60,13 +60,13 @@ public class TaskHandlerTest extends BaseHandlerTest {

      Task result = factory.create(injector.getInstance(TaskHandler.class)).parse(is);

-      Task expects = new TaskImpl(VCloudMediaType.TASK_XML, URI
+      Task expects = new TaskImpl(URI
               .create("https://services.vcloudexpress.terremark.com/api/v0.8/task/3299"),
               TaskStatus.SUCCESS, dateService.iso8601DateParse("2009-08-24T21:29:32.983Z"),
-               dateService.iso8601DateParse("2009-08-24T21:29:44.65Z"), new NamedLinkImpl(
+               dateService.iso8601DateParse("2009-08-24T21:29:44.65Z"), new NamedResourceImpl("1",
                        "VDC Name", VCloudMediaType.VDC_XML,
                        URI.create("https://services.vcloudexpress.terremark.com/api/v0.8/vdc/1")),
-               new NamedLinkImpl("Server1", VCloudMediaType.VAPP_XML, URI
+               new NamedResourceImpl("4012", "Server1", VCloudMediaType.VAPP_XML, URI
                        .create("https://services.vcloudexpress.terremark.com/api/v0.8/vapp/4012")

               )
@ -76,15 +76,14 @@ public class TaskHandlerTest extends BaseHandlerTest {

   }

-   public void testApplyInputStream3() {
-      InputStream is = getClass().getResourceAsStream("/task-hosting-baddate.xml");
+   public void testSelf() {
+      InputStream is = getClass().getResourceAsStream("/task-self.xml");

      Task result = factory.create(injector.getInstance(TaskHandler.class)).parse(is);

-      Task expects = new TaskImpl(VCloudMediaType.TASK_XML, URI
-               .create("https://vcloud.safesecureweb.com/api/v0.8/task/d188849-37"),
-               TaskStatus.RUNNING, null, null, new NamedLinkImpl("188849", VCloudMediaType.VDC_XML,
-                        URI.create("https://vcloud.safesecureweb.com/api/v0.8/vdc/188849")), null
+      Task expects = new TaskImpl(URI
+               .create("https://vcloud.safesecureweb.com/api/v0.8/task/d188849-78"),
+               TaskStatus.QUEUED, null, null, null, null
      );
      assertEquals(result, expects);

@ -95,11 +94,12 @@ public class TaskHandlerTest extends BaseHandlerTest {

      Task result = factory.create(injector.getInstance(TaskHandler.class)).parse(is);

-      Task expects = new TaskImpl(VCloudMediaType.TASK_XML, URI
-               .create("https://vcloud.safesecureweb.com/api/v0.8/task/d188849-34"),
-               TaskStatus.QUEUED, null, null, null, null);
+      Task expects = new TaskImpl(URI
+               .create("https://vcloud.safesecureweb.com/api/v0.8/task/d188849-72"),
+               TaskStatus.RUNNING, dateService.iso8601SecondsDateParse("2001-01-01T05:00:00Z"),
+               null, new NamedResourceImpl("188849", "188849", VCloudMediaType.VDC_XML, URI
+                        .create("https://vcloud.safesecureweb.com/api/v0.8/vdc/188849")), null);
      assertEquals(result, expects);

   }
-
 }
--- a/vcloud/core/src/test/java/org/jclouds/vcloud/xml/TasksListHandlerTest.java
+++ b/vcloud/core/src/test/java/org/jclouds/vcloud/xml/TasksListHandlerTest.java
@ -30,7 +30,7 @@ import java.net.URI;

 import org.jclouds.date.DateService;
 import org.jclouds.http.functions.BaseHandlerTest;
-import org.jclouds.rest.domain.internal.NamedLinkImpl;
+import org.jclouds.rest.internal.NamedResourceImpl;
 import org.jclouds.vcloud.VCloudMediaType;
 import org.jclouds.vcloud.domain.Task;
 import org.jclouds.vcloud.domain.TaskStatus;
@ -65,21 +65,21 @@ public class TasksListHandlerTest extends BaseHandlerTest {
      TasksList result = factory.create(injector.getInstance(TasksListHandler.class)).parse(is);
      assertEquals(result.getLocation(), URI
               .create("https://services.vcloudexpress.terremark.com/api/v0.8/tasksList/1"));
-      Task task1 = new TaskImpl(VCloudMediaType.TASK_XML, URI
+      Task task1 = new TaskImpl(URI
               .create("https://services.vcloudexpress.terremark.com/api/v0.8/task/3300"),
               TaskStatus.SUCCESS, dateService.iso8601DateParse("2009-08-24T21:30:19.587Z"),
-               dateService.iso8601DateParse("2009-08-24T21:30:32.63Z"), new NamedLinkImpl(
+               dateService.iso8601DateParse("2009-08-24T21:30:32.63Z"), new NamedResourceImpl("1",
                        "VDC Name", VCloudMediaType.VDC_XML,
                        URI.create("https://services.vcloudexpress.terremark.com/api/v0.8/vdc/1")),
-               new NamedLinkImpl("Server1", VCloudMediaType.VAPP_XML, URI
+               new NamedResourceImpl("4012", "Server1", VCloudMediaType.VAPP_XML, URI
                        .create("https://services.vcloudexpress.terremark.com/api/v0.8/vapp/4012")));
-      Task task2 = new TaskImpl(VCloudMediaType.TASK_XML, URI
+      Task task2 = new TaskImpl(URI
               .create("https://services.vcloudexpress.terremark.com/api/v0.8/task/3299"),
               TaskStatus.SUCCESS, dateService.iso8601DateParse("2009-08-24T21:29:32.983Z"),
-               dateService.iso8601DateParse("2009-08-24T21:29:44.65Z"), new NamedLinkImpl(
+               dateService.iso8601DateParse("2009-08-24T21:29:44.65Z"), new NamedResourceImpl("1",
                        "VDC Name", VCloudMediaType.VDC_XML,
                        URI.create("https://services.vcloudexpress.terremark.com/api/v0.8/vdc/1")),
-               new NamedLinkImpl("Server1", VCloudMediaType.VAPP_XML, URI
+               new NamedResourceImpl("4012", "Server1", VCloudMediaType.VAPP_XML, URI
                        .create("https://services.vcloudexpress.terremark.com/api/v0.8/vapp/4012")

               )
--- a/vcloud/core/src/test/java/org/jclouds/vcloud/xml/VAppHandlerTest.java
+++ b/vcloud/core/src/test/java/org/jclouds/vcloud/xml/VAppHandlerTest.java
@ -58,7 +58,7 @@ public class VAppHandlerTest extends BaseHandlerTest {
      VApp result = factory.create(injector.getInstance(VAppHandler.class)).parse(is);

      ListMultimap<String, InetAddress> networkToAddresses = ImmutableListMultimap
-               .<String, InetAddress> of("Network 1", InetAddress.getByName("204.12.55.199"));
+               .<String, InetAddress> of("Network 1", InetAddress.getByName("204.12.59.147"));

      VirtualSystem system = new VirtualSystem(0, "Virtual Hardware Family", "SimpleVM", "vmx-07");

@ -78,9 +78,9 @@ public class VAppHandlerTest extends BaseHandlerTest {
                        new ResourceAllocation(9, "Hard Disk 1", null, ResourceType.DISK_DRIVE,
                                 null, null, 0, 3, null, 20971520, "byte * 2^20")).build();

-      VApp expects = new VAppImpl("188849-44", "188849-44", URI
-               .create("https://vcloud.safesecureweb.com/api/v0.8/vapp/188849-44"), VAppStatus.ON,
-               new Long(20971520), networkToAddresses, "", system, resourceAllocations);
+      VApp expects = new VAppImpl("188849-74", "188849-74", URI
+               .create("https://vcloud.safesecureweb.com/api/v0.8/vapp/188849-74"), VAppStatus.ON,
+               new Long(20971520), networkToAddresses, null, system, resourceAllocations);

      assertEquals(result, expects);

--- a/vcloud/core/src/test/resources/task-hosting-baddate.xml
+++ b/vcloud/core/src/test/resources/task-hosting-baddate.xml
@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Task xmlns="http://www.vmware.com/vcloud/v0.8/task"
-    xmlns:common="http://www.vmware.com/vcloud/common"
-    xsi:schemaLocation="http://www.vmware.com/vcloud/v0.8/task
-        https://vcloud.safesecureweb.com/ns/vcloud/task-1.0.xsd
-        http://www.vmware.com/vcloud/common
-        https://vcloud.safesecureweb.com/ns/vcloud/common-1.0.xsd"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    status="running" startTime="1/1/2001 12:00:00 AM">
-
-  <Link rel="self" href="https://vcloud.safesecureweb.com/api/v0.8/task/d188849-37" type="application/vnd.vmware.vcloud.task+xml" />
-
-    <Owner href="https://vcloud.safesecureweb.com/api/v0.8/vdc/188849" type="application/vnd.vmware.vcloud.vdc+xml" name="188849" />
-</Task>
--- a/vcloud/core/src/test/resources/task-hosting.xml
+++ b/vcloud/core/src/test/resources/task-hosting.xml
@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<task xmlns="http://www.vmware.com/vcloud/v0.8/task"
-    xmlns:common="http://www/vmware.com/vcloud/common"
-    xsi:schemaLocation="http://www/vmware.com/vcloud/task
+<Task href="https://vcloud.safesecureweb.com/api/v0.8/task/d188849-72"
+    xmlns="http://www.vmware.com/vcloud/v0.8" xmlns:common="http://www.vmware.com/vcloud/common"
+    xsi:schemaLocation="http://www.vmware.com/vcloud/v0.8/task
        https://vcloud.safesecureweb.com/ns/vcloud/task-1.0.xsd
        http://www.vmware.com/vcloud/common
        https://vcloud.safesecureweb.com/ns/vcloud/common-1.0.xsd"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    status="queued">
-  <Link rel="self" href="https://vcloud.safesecureweb.com/api/v0.8/task/d188849-34" type="application/vnd.vmware.vcloud.task+xml" />
-</task>
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" status="running"
+    startTime="2001-01-01T05:00:00Z">
+    <Link rel="task:cancel" href="https://vcloud.safesecureweb.com/api/v0.8/task/d188849-72/action/cancel" />
+    <Owner href="https://vcloud.safesecureweb.com/api/v0.8/vdc/188849"
+        type="application/vnd.vmware.vcloud.vdc+xml" name="188849" />
+</Task>
--- a/vcloud/core/src/test/resources/task-self.xml
+++ b/vcloud/core/src/test/resources/task-self.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Task xmlns="http://www.vmware.com/vcloud/v0.8" xmlns:common="http://www/vmware.com/vcloud/common"
+    xsi:schemaLocation="http://www/vmware.com/vcloud/task
+        https://vcloud.safesecureweb.com/ns/vcloud/task-1.0.xsd
+        http://www.vmware.com/vcloud/common
+        https://vcloud.safesecureweb.com/ns/vcloud/common-1.0.xsd"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" status="queued">
+    <Link rel="self"
+        href="https://vcloud.safesecureweb.com/api/v0.8/task/d188849-78"
+        type="application/vnd.vmware.vcloud.task+xml" />
+</Task>
--- a/vcloud/core/src/test/resources/task.xml
+++ b/vcloud/core/src/test/resources/task.xml
@ -1,6 +1,5 @@
 <Task href="https://services.vcloudexpress.terremark.com/api/v0.8/task/3299"
-    type="application/vnd.vmware.vcloud.task+xml" status="success"
-    startTime="2009-08-24T21:29:32.983Z" endTime="2009-08-24T21:29:44.65Z">
+    status="success" startTime="2009-08-24T21:29:32.983Z" endTime="2009-08-24T21:29:44.65Z">
    <Owner href="https://services.vcloudexpress.terremark.com/api/v0.8/vdc/1"
        type="application/vnd.vmware.vcloud.vdc+xml" name="VDC Name" />
    <Result
--- a/vcloud/core/src/test/resources/vapp-hosting.xml
+++ b/vcloud/core/src/test/resources/vapp-hosting.xml
@ -1,144 +1,236 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<VApp href="https://vcloud.safesecureweb.com/api/v0.8/vapp/188849-44"
-    type="application/vnd.vmware.vcloud.vApp+xml"
-    name="188849-44"
-    status="4"
-    xsi:schemaLocation="http://www.vmware.com/vcloud/v0.8/vapp.xsd"
-    xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1"
-    xmlns="http://www.vmware.com/vcloud/v0.8"
+<VApp href="https://vcloud.safesecureweb.com/api/v0.8/vapp/188849-74"
+    type="application/vnd.vmware.vcloud.vApp+xml" name="188849-74"
+    status="4" xsi:schemaLocation="http://www.vmware.com/vcloud/v0.8 vapp.xsd"
+    xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns="http://www.vmware.com/vcloud/v0.8"
    xmlns:vmw="http://www.vmware.com/schema/ovf"
    xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"
    xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    size="20971520">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" size="20971520">

-  <NetworkConnectionSection>
-    <NetworkConnection name="Network 1">
-      <IPAddress>204.12.55.199</IPAddress>
-    </NetworkConnection>
-  </NetworkConnectionSection>
+    <NetworkConnectionSection>
+        <Info xmlns="http://schemas.dmtf.org/ovf/envelope/1">Network Information about the vApp</Info>
+        <NetworkConnection Network="Network 1">
+            <IpAddress>204.12.59.147</IpAddress>
+        </NetworkConnection>
+    </NetworkConnectionSection>

-  <OperatingSystemSection d2p1:id="" xmlns="http://schemas.dmtf.org/ovf/envelope/1" xmlns:d2p1="http://schemas.dmtf.org/ovf/envelope/1">
-    <Info>The kind of installed guest operating system</Info>
-    <Description></Description>
-  </OperatingSystemSection>
-
-  <VirtualHardwareSection xmlns="http://schemas.dmtf.org/ovf/envelope/1">
-    <Info>Virtual hardware</Info>
-    <System>
-    <AutomaticRecoveryAction xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" /> 
-    <AutomaticShutdownAction xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" /> 
-    <AutomaticStartupAction xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" /> 
-    <AutomaticStartupActionDelay xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" /> 
-    <AutomaticStartupActionSequenceNumber xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" /> 
-    <Caption xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" /> 
-    <ConfigurationDataRoot xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" /> 
-    <ConfigurationFile xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" /> 
-    <ConfigurationID xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" /> 
-    <CreationTime xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" /> 
-    <Description xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" /> 
-    <LogDataRoot xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" /> 
-    <RecoveryFile xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" /> 
-    <SnapshotDataRoot xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" /> 
-    <SuspendDataRoot xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" /> 
-    <SwapFileDataRoot xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" /> 
-      <ElementName xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData">Virtual Hardware Family</ElementName>
-      <InstanceID xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData">0</InstanceID>
-      <VirtualSystemIdentifier xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData">SimpleVM</VirtualSystemIdentifier>
-      <VirtualSystemType xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData">vmx-07</VirtualSystemType>
-    </System>
-    <Item>
-      <Address xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <AddressOnParent xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <AutomaticAllocation xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <AutomaticDeallocation xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <Caption xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <ConsumerVisibility xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <Limit xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <MappingBehavior xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <OtherResourceType xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <Parent xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <PoolID xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <Reservation xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <ResourceSubType xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <Weight xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <AllocationUnits xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">hertz * 10^6</AllocationUnits>
-      <Description xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">Number of Virtual CPUs</Description>
-      <ElementName xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1 virtual CPU(s)</ElementName>
-      <InstanceID xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1</InstanceID>
-      <ResourceType xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">3</ResourceType>
-      <VirtualQuantity xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1</VirtualQuantity>
-      <VirtualQuantityUnits xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">count</VirtualQuantityUnits>
-    </Item>
-    <Item>
-      <Address xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <AddressOnParent xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <AutomaticAllocation xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <AutomaticDeallocation xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <Caption xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <ConsumerVisibility xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <Limit xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <MappingBehavior xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <OtherResourceType xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <Parent xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <PoolID xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <Reservation xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <ResourceSubType xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <Weight xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <AllocationUnits xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">byte * 2^20</AllocationUnits>
-      <Description xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">Memory Size</Description>
-      <ElementName xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">512MB of memory</ElementName>
-      <InstanceID xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">2</InstanceID>
-      <ResourceType xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">4</ResourceType>
-      <VirtualQuantity xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">512</VirtualQuantity>
-      <VirtualQuantityUnits xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">byte * 2^20</VirtualQuantityUnits>
-    </Item>
-    <Item>
-      <AddressOnParent xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <AllocationUnits xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <AutomaticAllocation xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <AutomaticDeallocation xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <Caption xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <ConsumerVisibility xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <Limit xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <MappingBehavior xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <OtherResourceType xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <Parent xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <PoolID xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <Reservation xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <VirtualQuantity xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <VirtualQuantityUnits xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <Weight xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <Address xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">0</Address>
-      <Description xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">SCSI Controller</Description>
-      <ElementName xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">SCSI Controller 0</ElementName>
-      <InstanceID xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">3</InstanceID>
-      <ResourceSubType xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">lsilogic</ResourceSubType>
-      <ResourceType xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">6</ResourceType>
-    </Item>
-    <Item>
-      <Address xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <AllocationUnits xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <AutomaticAllocation xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <AutomaticDeallocation xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <Caption xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <ConsumerVisibility xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <Description xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <Limit xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <MappingBehavior xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <OtherResourceType xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <PoolID xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <Reservation xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <ResourceSubType xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <VirtualQuantityUnits xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <Weight xsi:nil="true" xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" /> 
-      <AddressOnParent xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">0</AddressOnParent>
-      <ElementName xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">Hard Disk 1</ElementName>
-      <HostResource xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">20971520</HostResource>
-      <InstanceID xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">9</InstanceID>
-      <Parent xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">3</Parent>
-      <ResourceType xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">17</ResourceType>
-      <VirtualQuantity xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">20971520</VirtualQuantity>
-    </Item>
-  </VirtualHardwareSection>
+    <VirtualHardwareSection xmlns="http://schemas.dmtf.org/ovf/envelope/1">
+        <Info>Virtual hardware</Info>
+        <System>
+            <AutomaticRecoveryAction xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
+            <AutomaticShutdownAction xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
+            <AutomaticStartupAction xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
+            <AutomaticStartupActionDelay
+                xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
+            <AutomaticStartupActionSequenceNumber
+                xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
+            <Caption xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
+            <ConfigurationDataRoot xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
+            <ConfigurationFile xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
+            <ConfigurationID xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
+            <CreationTime xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
+            <Description xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
+            <ElementName
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData">Virtual Hardware Family</ElementName>
+            <InstanceID
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData">0</InstanceID>
+            <LogDataRoot xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
+            <RecoveryFile xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
+            <SnapshotDataRoot xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
+            <SuspendDataRoot xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
+            <SwapFileDataRoot xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
+            <VirtualSystemIdentifier
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData">SimpleVM</VirtualSystemIdentifier>
+            <VirtualSystemType
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData">vmx-07</VirtualSystemType>
+        </System>
+        <Item>
+            <Address xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <AddressOnParent xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <AllocationUnits
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">hertz * 10^6</AllocationUnits>
+            <AutomaticAllocation xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <AutomaticDeallocation xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <Caption xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <ConsumerVisibility xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <Description
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">Number of Virtual CPUs</Description>
+            <ElementName
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1 virtual CPU(s)</ElementName>
+            <InstanceID
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1</InstanceID>
+            <Limit xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <MappingBehavior xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <OtherResourceType xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <Parent xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <PoolID xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <Reservation xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <ResourceSubType xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <ResourceType
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">3</ResourceType>
+            <VirtualQuantity
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1</VirtualQuantity>
+            <Weight xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+        </Item>
+        <Item>
+            <Address xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <AddressOnParent xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <AllocationUnits
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">byte * 2^20</AllocationUnits>
+            <AutomaticAllocation xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <AutomaticDeallocation xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <Caption xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <ConsumerVisibility xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <Description
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">Memory Size</Description>
+            <ElementName
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">512MB of memory</ElementName>
+            <InstanceID
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">2</InstanceID>
+            <Limit xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <MappingBehavior xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <OtherResourceType xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <Parent xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <PoolID xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <Reservation xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <ResourceSubType xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <ResourceType
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">4</ResourceType>
+            <VirtualQuantity
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">512</VirtualQuantity>
+            <Weight xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+        </Item>
+        <Item>
+            <Address
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">0</Address>
+            <AddressOnParent xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <AllocationUnits xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <AutomaticAllocation xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <AutomaticDeallocation xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <Caption xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <ConsumerVisibility xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <Description
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">SCSI Controller</Description>
+            <ElementName
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">SCSI Controller 0</ElementName>
+            <InstanceID
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">3</InstanceID>
+            <Limit xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <MappingBehavior xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <OtherResourceType xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <Parent xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <PoolID xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <Reservation xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <ResourceSubType
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">lsilogic</ResourceSubType>
+            <ResourceType
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">6</ResourceType>
+            <VirtualQuantity xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <Weight xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+        </Item>
+        <Item>
+            <Address xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <AddressOnParent
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">0</AddressOnParent>
+            <AllocationUnits xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <AutomaticAllocation xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <AutomaticDeallocation xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <Caption xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <ConsumerVisibility xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <Description xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <ElementName
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">Hard Disk 1</ElementName>
+            <HostResource
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">20971520</HostResource>
+            <InstanceID
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">9</InstanceID>
+            <Limit xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <MappingBehavior xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <OtherResourceType xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <Parent
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">3</Parent>
+            <PoolID xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <Reservation xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <ResourceSubType xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+            <ResourceType
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">17</ResourceType>
+            <VirtualQuantity
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">20971520</VirtualQuantity>
+            <Weight xsi:nil="true"
+                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
+        </Item>
+    </VirtualHardwareSection>
 </VApp>
+
--- a/vcloud/hostingdotcom/src/test/resources/log4j.xml
+++ b/vcloud/hostingdotcom/src/test/resources/log4j.xml
@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+    Copyright (C) 2009 Cloud Conscious, LLC. <info@cloudconscious.com>
+
+    ====================================================================
+    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.
+    ====================================================================
+
+-->
+<!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="VCLOUDFILE" class="org.apache.log4j.DailyRollingFileAppender">
+        <param name="File" value="target/test-data/jclouds-vcloud.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="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="ASYNCVCLOUD" class="org.apache.log4j.AsyncAppender">
+        <appender-ref ref="VCLOUDFILE" />
+    </appender> 
+        
+	<!-- ================ -->
+	<!-- Limit categories -->
+	<!-- ================ -->
+
+	<category name="org.jclouds">
+		<priority value="DEBUG" />
+        <appender-ref ref="ASYNC" />
+ 	</category>
+    
+    <category name="jclouds.http.headers">
+        <priority value="DEBUG" />
+        <appender-ref ref="ASYNCWIRE" />
+    </category>
+    
+    
+    
+    <category name="org.jclouds.vcloud.hostingdotcom.HostingDotComVCloudComputeClient">
+        <priority value="TRACE" />
+        <appender-ref ref="ASYNCVCLOUD" />
+    </category>
+  
+    
+    <category name="org.jclouds.predicates.SocketOpen">
+        <priority value="TRACE" />
+        <appender-ref ref="ASYNCWIRE" />
+    </category>
+  
+    <category name="org.jclouds.vcloud.predicates.TaskSuccess">
+        <priority value="TRACE" />
+        <appender-ref ref="ASYNCWIRE" />
+    </category>
+    
+    
+    <category name="jclouds.http.wire">
+        <priority value="DEBUG" />
+        <appender-ref ref="ASYNCWIRE" />
+    </category>
+    
+    <!-- ======================= -->
+	<!-- Setup the Root category -->
+	<!-- ======================= -->
+
+	<root>
+		<priority value="WARN" />
+	</root>
+
+</log4j:configuration>