http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/taskslist.xml
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/taskslist.xml
 
b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/taskslist.xml
deleted file mode 100644
index fe0d8c1..0000000
--- 
a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/taskslist.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<TasksList
-    href="https://services.vcloudexpress.terremark.com/api/v0.8/tasksList/1";
-    xmlns="http://www.vmware.com/vcloud/v1"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
-    <Task
-        href="https://services.vcloudexpress.terremark.com/api/v0.8/task/3300";
-        type="application/vnd.vmware.vcloud.task+xml" status="success"
-        startTime="2009-08-24T21:30:19.587Z" endTime="2009-08-24T21:30:32.63Z">
-        <Owner
-            href="https://services.vcloudexpress.terremark.com/api/v0.8/vdc/1";
-            type="application/vnd.vmware.vcloud.vdc+xml" name="VDC Name" />
-        <Result
-            
href="https://services.vcloudexpress.terremark.com/api/v0.8/vapp/4012";
-            type="application/vnd.vmware.vcloud.vApp+xml" name="Server1" />
-    </Task>
-    <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">
-        <Owner
-            href="https://services.vcloudexpress.terremark.com/api/v0.8/vdc/1";
-            type="application/vnd.vmware.vcloud.vdc+xml" name="VDC Name" />
-        <Result
-            
href="https://services.vcloudexpress.terremark.com/api/v0.8/vapp/4012";
-            type="application/vnd.vmware.vcloud.vApp+xml" name="Server1" />
-    </Task>
-</TasksList>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/template1.0-vcd15-multi-vm.xml
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/template1.0-vcd15-multi-vm.xml
 
b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/template1.0-vcd15-multi-vm.xml
deleted file mode 100644
index 46b3c83..0000000
--- 
a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/template1.0-vcd15-multi-vm.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VAppTemplate xmlns="http://www.vmware.com/vcloud/v1"; 
xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1"; ovfDescriptorUploaded="true" 
status="8" name="Windows Server 2008 R2" 
type="application/vnd.vmware.vcloud.vAppTemplate+xml" 
href="https://zone.myvcloud.com/api/v1.0/vAppTemplate/vappTemplate-51891b97-c5dd-47dc-a687-aabae354f728";
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://schemas.dmtf.org/ovf/envelope/1 
http://schemas.dmtf.org/ovf/envelope/1/dsp8023_1.1.0.xsd 
http://www.vmware.com/vcloud/v1 
http://zone.myvcloud.com/api/v1.0/schema/master.xsd";>
-    <Link rel="up" type="application/vnd.vmware.vcloud.vdc+xml" 
href="https://zone.myvcloud.com/api/v1.0/vdc/cf6a0068-b7c4-425c-9e80-46ffef58782a"/>
-    <Link rel="catalogItem" 
type="application/vnd.vmware.vcloud.catalogItem+xml" 
href="https://zone.myvcloud.com/api/v1.0/catalogItem/9c45dbbd-910d-45c8-a811-d1e0b01e9e82"/>
-    <Link rel="remove" 
href="https://zone.myvcloud.com/api/v1.0/vAppTemplate/vappTemplate-51891b97-c5dd-47dc-a687-aabae354f728"/>
-    <Link rel="edit" type="application/vnd.vmware.vcloud.vAppTemplate+xml" 
href="https://zone.myvcloud.com/api/v1.0/vAppTemplate/vappTemplate-51891b97-c5dd-47dc-a687-aabae354f728"/>
-    <Link rel="enable" 
href="https://zone.myvcloud.com/api/v1.0/vAppTemplate/vappTemplate-51891b97-c5dd-47dc-a687-aabae354f728/action/enableDownload"/>
-    <Link rel="disable" 
href="https://zone.myvcloud.com/api/v1.0/vAppTemplate/vappTemplate-51891b97-c5dd-47dc-a687-aabae354f728/action/disableDownload"/>
-    <Link rel="ovf" type="text/xml" 
href="https://zone.myvcloud.com/api/v1.0/vAppTemplate/vappTemplate-51891b97-c5dd-47dc-a687-aabae354f728/ovf"/>
-    <Link rel="down" type="application/vnd.vmware.vcloud.owner+xml" 
href="https://zone.myvcloud.com/api/v1.0/vAppTemplate/vappTemplate-51891b97-c5dd-47dc-a687-aabae354f728/owner"/>
-    <Description/>
-    <Children>
-        <Vm name="Windows Server 2008 R2" 
type="application/vnd.vmware.vcloud.vm+xml" 
href="https://zone.myvcloud.com/api/v1.0/vAppTemplate/vm-24fc1b05-10f7-423e-a644-fd3368f9d0cd";>
-            <Link rel="up" 
type="application/vnd.vmware.vcloud.vAppTemplate+xml" 
href="https://zone.myvcloud.com/api/v1.0/vAppTemplate/vappTemplate-51891b97-c5dd-47dc-a687-aabae354f728"/>
-            <Description/>
-            <NetworkConnectionSection 
type="application/vnd.vmware.vcloud.networkConnectionSection+xml" 
href="https://zone.myvcloud.com/api/v1.0/vAppTemplate/vm-24fc1b05-10f7-423e-a644-fd3368f9d0cd/networkConnectionSection/";
 ovf:required="false">
-                <ovf:Info>Specifies the available VM network 
connections</ovf:Info>
-                
<PrimaryNetworkConnectionIndex>0</PrimaryNetworkConnectionIndex>
-                <NetworkConnection network="none">
-                    <NetworkConnectionIndex>0</NetworkConnectionIndex>
-                    <IsConnected>false</IsConnected>
-                    <MACAddress>00:50:56:b5:09:dc</MACAddress>
-                    <IpAddressAllocationMode>NONE</IpAddressAllocationMode>
-                </NetworkConnection>
-            </NetworkConnectionSection>
-            <GuestCustomizationSection 
type="application/vnd.vmware.vcloud.guestCustomizationSection+xml" 
href="https://zone.myvcloud.com/api/v1.0/vAppTemplate/vm-24fc1b05-10f7-423e-a644-fd3368f9d0cd/guestCustomizationSection/";
 ovf:required="false">
-                <ovf:Info>Specifies Guest OS Customization Settings</ovf:Info>
-                <Enabled>true</Enabled>
-                <ChangeSid>false</ChangeSid>
-                <JoinDomainEnabled>false</JoinDomainEnabled>
-                <UseOrgSettings>false</UseOrgSettings>
-                <AdminPasswordEnabled>true</AdminPasswordEnabled>
-                <AdminPasswordAuto>true</AdminPasswordAuto>
-                <ResetPasswordRequired>true</ResetPasswordRequired>            
    <ComputerName>WindowsServ-001</ComputerName>
-            </GuestCustomizationSection>
-            <VAppScopedLocalId>Windows Server 2008 R2</VAppScopedLocalId>
-        </Vm>
-    </Children>
-    <ovf:NetworkSection xmlns:vcloud="http://www.vmware.com/vcloud/v1"; 
vcloud:href="https://zone.myvcloud.com/api/v1.0/vAppTemplate/vappTemplate-51891b97-c5dd-47dc-a687-aabae354f728/networkSection/";
 vcloud:type="application/vnd.vmware.vcloud.networkSection+xml">        
<ovf:Info>The list of logical networks</ovf:Info>
-        <ovf:Network ovf:name="none">
-            <ovf:Description>This is a special place-holder used for 
disconnected network interfaces.</ovf:Description>
-        </ovf:Network>    </ovf:NetworkSection>
-    <NetworkConfigSection 
type="application/vnd.vmware.vcloud.networkConfigSection+xml" 
href="https://zone.myvcloud.com/api/v1.0/vAppTemplate/vappTemplate-51891b97-c5dd-47dc-a687-aabae354f728/networkConfigSection/";
 ovf:required="false">
-        <ovf:Info>The configuration parameters for logical networks</ovf:Info>
-        <NetworkConfig networkName="none">
-            <Description>This is a special place-holder used for disconnected 
network interfaces.</Description>
-            <Configuration>
-                <IpScope>
-                    <IsInherited>false</IsInherited>
-                    <Gateway>196.254.254.254</Gateway>
-                    <Netmask>255.255.0.0</Netmask>
-                    <Dns1>196.254.254.254</Dns1>
-                </IpScope>
-                <FenceMode>isolated</FenceMode>
-            </Configuration>
-            <IsDeployed>false</IsDeployed>
-        </NetworkConfig>
-    </NetworkConfigSection>    
-    <LeaseSettingsSection 
type="application/vnd.vmware.vcloud.leaseSettingsSection+xml" 
href="https://zone.myvcloud.com/api/v1.0/vAppTemplate/vappTemplate-51891b97-c5dd-47dc-a687-aabae354f728/leaseSettingsSection/";
 ovf:required="false">
-        <ovf:Info>Lease settings section</ovf:Info>        <Link rel="edit" 
type="application/vnd.vmware.vcloud.leaseSettingsSection+xml" 
href="https://zone.myvcloud.com/api/v1.0/vAppTemplate/vappTemplate-51891b97-c5dd-47dc-a687-aabae354f728/leaseSettingsSection/"/>
-        <StorageLeaseInSeconds>0</StorageLeaseInSeconds>
-    </LeaseSettingsSection>    
-        <CustomizationSection 
type="application/vnd.vmware.vcloud.customizationSection+xml" 
href="https://zone.myvcloud.com/api/v1.0/vAppTemplate/vappTemplate-51891b97-c5dd-47dc-a687-aabae354f728/customizationSection/";
 ovf:required="false">
-        <ovf:Info>VApp template customization section</ovf:Info>
-        <CustomizeOnInstantiate>true</CustomizeOnInstantiate>        
-        <Link rel="edit" 
type="application/vnd.vmware.vcloud.customizationSection+xml" 
href="https://zone.myvcloud.com/api/v1.0/vAppTemplate/vappTemplate-51891b97-c5dd-47dc-a687-aabae354f728/customizationSection/"/>
-    </CustomizationSection>
-</VAppTemplate>

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/template1.0-vcd15.xml
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/template1.0-vcd15.xml
 
b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/template1.0-vcd15.xml
deleted file mode 100644
index 35393ee..0000000
--- 
a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/template1.0-vcd15.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VAppTemplate xmlns="http://www.vmware.com/vcloud/v1"; 
xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1"; ovfDescriptorUploaded="true" 
status="8" name="UbuntuServer-x64-2GB" 
type="application/vnd.vmware.vcloud.vAppTemplate+xml" 
href="https://zone.myvcloud.com/api/v1.0/vAppTemplate/vappTemplate-51891b97-c5dd-47dc-a687-aabae354f728";
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://schemas.dmtf.org/ovf/envelope/1 
http://schemas.dmtf.org/ovf/envelope/1/dsp8023_1.1.0.xsd 
http://www.vmware.com/vcloud/v1 
https://zone.myvcloud.com/api/v1.0/schema/master.xsd";>
-    <Link rel="up" type="application/vnd.vmware.vcloud.vdc+xml" 
href="https://zone.myvcloud.com/api/v1.0/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f"/>
-    <Link rel="catalogItem" 
type="application/vnd.vmware.vcloud.catalogItem+xml" 
href="https://zone.myvcloud.com/api/v1.0/catalogItem/ceb369f7-1d07-4e32-9dbd-ebb5aa6ca55c"/>
-    <Link rel="remove" 
href="https://zone.myvcloud.com/api/v1.0/vAppTemplate/vappTemplate-51891b97-c5dd-47dc-a687-aabae354f728"/>
-    <Link rel="edit" type="application/vnd.vmware.vcloud.vAppTemplate+xml" 
href="https://zone.myvcloud.com/api/v1.0/vAppTemplate/vappTemplate-51891b97-c5dd-47dc-a687-aabae354f728"/>
-    <Link rel="enable" 
href="https://zone.myvcloud.com/api/v1.0/vAppTemplate/vappTemplate-51891b97-c5dd-47dc-a687-aabae354f728/action/enableDownload"/>
-    <Link rel="disable" 
href="https://zone.myvcloud.com/api/v1.0/vAppTemplate/vappTemplate-51891b97-c5dd-47dc-a687-aabae354f728/action/disableDownload"/>
-    <Link rel="ovf" type="text/xml" 
href="https://zone.myvcloud.com/api/v1.0/vAppTemplate/vappTemplate-51891b97-c5dd-47dc-a687-aabae354f728/ovf"/>
-    <Link rel="down" type="application/vnd.vmware.vcloud.owner+xml" 
href="https://zone.myvcloud.com/api/v1.0/vAppTemplate/vappTemplate-51891b97-c5dd-47dc-a687-aabae354f728/owner"/>
-    <Description/>
-    <Children>
-        <Vm name="UbuntuServer-x64-2GB" 
type="application/vnd.vmware.vcloud.vm+xml" 
href="https://zone.myvcloud.com/api/v1.0/vAppTemplate/vm-3aee3d0d-106a-4c63-8529-1edde335b212";>
-            <Link rel="up" 
type="application/vnd.vmware.vcloud.vAppTemplate+xml" 
href="https://zone.myvcloud.com/api/v1.0/vAppTemplate/vappTemplate-51891b97-c5dd-47dc-a687-aabae354f728"/>
-            <Description/>
-            <NetworkConnectionSection 
type="application/vnd.vmware.vcloud.networkConnectionSection+xml" 
href="https://zone.myvcloud.com/api/v1.0/vAppTemplate/vm-3aee3d0d-106a-4c63-8529-1edde335b212/networkConnectionSection/";
 ovf:required="false">
-                <ovf:Info>Specifies the available VM network 
connections</ovf:Info>
-                
<PrimaryNetworkConnectionIndex>0</PrimaryNetworkConnectionIndex>
-                <NetworkConnection network="none">
-                    <NetworkConnectionIndex>0</NetworkConnectionIndex>
-                    <IsConnected>false</IsConnected>
-                    <MACAddress>00:50:56:01:02:9f</MACAddress>
-                    <IpAddressAllocationMode>NONE</IpAddressAllocationMode>
-                </NetworkConnection>
-            </NetworkConnectionSection>
-            <GuestCustomizationSection 
type="application/vnd.vmware.vcloud.guestCustomizationSection+xml" 
href="https://zone.myvcloud.com/api/v1.0/vAppTemplate/vm-3aee3d0d-106a-4c63-8529-1edde335b212/guestCustomizationSection/";
 ovf:required="false">
-                <ovf:Info>Specifies Guest OS Customization Settings</ovf:Info>
-                <Enabled>true</Enabled>
-                <ChangeSid>false</ChangeSid>
-                <JoinDomainEnabled>false</JoinDomainEnabled>
-                <UseOrgSettings>false</UseOrgSettings>
-                <AdminPasswordEnabled>true</AdminPasswordEnabled>
-                <AdminPasswordAuto>true</AdminPasswordAuto>
-                <ResetPasswordRequired>false</ResetPasswordRequired>
-                <ComputerName>UbuntuServer</ComputerName>
-            </GuestCustomizationSection>
-            
<VAppScopedLocalId>f114ade7-a63f-4f8b-b30b-44e9ff77e068</VAppScopedLocalId>
-        </Vm>
-    </Children>
-    <ovf:NetworkSection xmlns:vcloud="http://www.vmware.com/vcloud/v1"; 
vcloud:href="https://zone.myvcloud.com/api/v1.0/vAppTemplate/vappTemplate-51891b97-c5dd-47dc-a687-aabae354f728/networkSection/";
 vcloud:type="application/vnd.vmware.vcloud.networkSection+xml">
-        <ovf:Info>The list of logical networks</ovf:Info>
-        <ovf:Network ovf:name="none">
-            <ovf:Description>This is a special place-holder used for 
disconnected network interfaces.</ovf:Description>
-        </ovf:Network>
-    </ovf:NetworkSection>
-    <NetworkConfigSection 
type="application/vnd.vmware.vcloud.networkConfigSection+xml" 
href="https://zone.myvcloud.com/api/v1.0/vAppTemplate/vappTemplate-51891b97-c5dd-47dc-a687-aabae354f728/networkConfigSection/";
 ovf:required="false">
-        <ovf:Info>The configuration parameters for logical networks</ovf:Info>
-        <NetworkConfig networkName="none">
-            <Description>This is a special place-holder used for disconnected 
network interfaces.</Description>
-            <Configuration>
-                <IpScope>
-                    <IsInherited>false</IsInherited>
-                    <Gateway>196.254.254.254</Gateway>
-                    <Netmask>255.255.0.0</Netmask>
-                    <Dns1>196.254.254.254</Dns1>
-                </IpScope>
-                <FenceMode>isolated</FenceMode>
-            </Configuration>
-            <IsDeployed>false</IsDeployed>
-        </NetworkConfig>
-    </NetworkConfigSection>
-    <LeaseSettingsSection 
type="application/vnd.vmware.vcloud.leaseSettingsSection+xml" 
href="https://zone.myvcloud.com/api/v1.0/vAppTemplate/vappTemplate-51891b97-c5dd-47dc-a687-aabae354f728/leaseSettingsSection/";
 ovf:required="false">
-        <ovf:Info>Lease settings section</ovf:Info>
-        <Link rel="edit" 
type="application/vnd.vmware.vcloud.leaseSettingsSection+xml" 
href="https://zone.myvcloud.com/api/v1.0/vAppTemplate/vappTemplate-51891b97-c5dd-47dc-a687-aabae354f728/leaseSettingsSection/"/>
-        <StorageLeaseInSeconds>5184000</StorageLeaseInSeconds>
-        
<StorageLeaseExpiration>2012-03-12T17:40:44.491-06:00</StorageLeaseExpiration>
-    </LeaseSettingsSection>
-    <CustomizationSection 
type="application/vnd.vmware.vcloud.customizationSection+xml" 
href="https://zone.myvcloud.com/api/v1.0/vAppTemplate/vappTemplate-51891b97-c5dd-47dc-a687-aabae354f728/customizationSection/";
 ovf:required="false">
-        <ovf:Info>VApp template customization section</ovf:Info>
-        <CustomizeOnInstantiate>true</CustomizeOnInstantiate>
-    </CustomizationSection>
-</VAppTemplate>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vAppTemplate-copying.xml
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vAppTemplate-copying.xml
 
b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vAppTemplate-copying.xml
deleted file mode 100644
index 8ffa7d7..0000000
--- 
a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vAppTemplate-copying.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VAppTemplate xmlns="http://www.vmware.com/vcloud/v1";
-    xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1";
-    ovfDescriptorUploaded="true" status="0" name="Ubuntu10.04_v2"
-    type="application/vnd.vmware.vcloud.vAppTemplate+xml"
-    
href="https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/vappTemplate-699683881";
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-    xsi:schemaLocation="http://schemas.dmtf.org/ovf/envelope/1 
http://schemas.dmtf.org/ovf/envelope/1/dsp8023_1.1.0.xsd 
http://www.vmware.com/vcloud/v1 
http://vcenterprise.bluelock.com/api/v1.0/schema/master.xsd";>
-    <Link rel="up" type="application/vnd.vmware.vcloud.vdc+xml"
-        href="https://vcenterprise.bluelock.com/api/v1.0/vdc/105186609"; />
-    <Description />
-    <Tasks>
-        <Task status="running" startTime="2010-09-17T23:20:46.039-04:00"
-            operation="Copying Virtual Application Template 
Ubuntu10.04_v2(699683881)"
-            expiryTime="2010-12-16T23:20:46.039-05:00" 
endTime="9999-12-31T23:59:59.999-05:00"
-            type="application/vnd.vmware.vcloud.task+xml"
-            
href="https://vcenterprise.bluelock.com/api/v1.0/task/q62gxhi32xgd9yrqvr";>
-            <Owner type="application/vnd.vmware.vcloud.vAppTemplate+xml"
-                name="Ubuntu10.04_v2"
-                
href="https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/vappTemplate-699683881";
 />
-        </Task>
-    </Tasks>
-    <Children />
-    <LeaseSettingsSection
-        type="application/vnd.vmware.vcloud.leaseSettingsSection+xml"
-        
href="https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/vappTemplate-699683881/leaseSettingsSection/";
-        ovf:required="false">
-        <ovf:Info>Lease settings section</ovf:Info>
-        <Link rel="edit"
-            type="application/vnd.vmware.vcloud.leaseSettingsSection+xml"
-            
href="https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/vappTemplate-699683881/leaseSettingsSection/";
 />
-        <StorageLeaseInSeconds>0</StorageLeaseInSeconds>
-    </LeaseSettingsSection>
-    <CustomizationSection
-        type="application/vnd.vmware.vcloud.customizationSection+xml"
-        
href="https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/vappTemplate-699683881/customizationSection/";
-        ovf:required="false">
-        <ovf:Info>VApp template customization section</ovf:Info>
-        <CustomizeOnInstantiate>true</CustomizeOnInstantiate>
-    </CustomizationSection>
-</VAppTemplate>

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vAppTemplate.xml
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vAppTemplate.xml
 
b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vAppTemplate.xml
deleted file mode 100644
index bb5fcaf..0000000
--- 
a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vAppTemplate.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VAppTemplate xmlns="http://www.vmware.com/vcloud/v1";
-       xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1";
-       ovfDescriptorUploaded="true" status="8" name="Ubuntu Template"
-       type="application/vnd.vmware.vcloud.vAppTemplate+xml"
-       
href="https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/vappTemplate-1201908921";
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-       xsi:schemaLocation="http://schemas.dmtf.org/ovf/envelope/1 
http://schemas.dmtf.org/ovf/envelope/1/dsp8023_1.1.0.xsd 
http://www.vmware.com/vcloud/v1 
http://vcenterprise.bluelock.com/api/v1.0/schema/master.xsd";>
-       <Link rel="up" type="application/vnd.vmware.vcloud.vdc+xml"
-               
href="https://vcenterprise.bluelock.com/api/v1.0/vdc/1014839439"; />
-       <Link rel="catalogItem" 
type="application/vnd.vmware.vcloud.catalogItem+xml"
-               
href="https://vcenterprise.bluelock.com/api/v1.0/catalogItem/2090447518"; />
-       <Link rel="remove"
-               
href="https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/vappTemplate-1201908921";
 />
-       <Link rel="edit" type="application/vnd.vmware.vcloud.vAppTemplate+xml"
-               
href="https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/vappTemplate-1201908921";
 />
-       <Link rel="enable"
-               
href="https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/vappTemplate-1201908921/action/enableDownload";
 />
-       <Link rel="disable"
-               
href="https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/vappTemplate-1201908921/action/disableDownload";
 />
-       <Link rel="ovf" type="text/xml"
-               
href="https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/vappTemplate-1201908921/ovf";
 />
-       <Description />
-       <Children>
-               <Vm name="Ubuntu1004" 
type="application/vnd.vmware.vcloud.vAppTemplate+xml"
-                       
href="https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/vm-172837194";>
-                       <Link rel="up" 
type="application/vnd.vmware.vcloud.vAppTemplate+xml"
-                               
href="https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/vappTemplate-1201908921";
 />
-                       <Description />
-                       <NetworkConnectionSection
-                               
type="application/vnd.vmware.vcloud.networkConnectionSection+xml"
-                               
href="https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/vm-172837194/networkConnectionSection/";
-                               ovf:required="false">
-                               <ovf:Info>Specifies the available VM network 
connections</ovf:Info>
-                               
<PrimaryNetworkConnectionIndex>0</PrimaryNetworkConnectionIndex>
-                               <NetworkConnection network="vAppNet-vApp 
Internal">
-                                       
<NetworkConnectionIndex>0</NetworkConnectionIndex>
-                                       <IpAddress>192.168.2.100</IpAddress>
-                                       <IsConnected>true</IsConnected>
-                                       
<MACAddress>00:50:56:8c:00:13</MACAddress>
-                                       
<IpAddressAllocationMode>POOL</IpAddressAllocationMode>
-                               </NetworkConnection>
-                       </NetworkConnectionSection>
-                       <GuestCustomizationSection
-                               
type="application/vnd.vmware.vcloud.guestCustomizationSection+xml"
-                               
href="https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/vm-172837194/guestCustomizationSection/";
-                               ovf:required="false">
-                               <ovf:Info>Specifies Guest OS Customization 
Settings</ovf:Info>
-                               <Enabled>true</Enabled>
-                               <ChangeSid>false</ChangeSid>
-                               <VirtualMachineId>172837194</VirtualMachineId>
-                               <JoinDomainEnabled>false</JoinDomainEnabled>
-                               <UseOrgSettings>false</UseOrgSettings>
-                               
<AdminPasswordEnabled>true</AdminPasswordEnabled>
-                               <AdminPasswordAuto>true</AdminPasswordAuto>
-                               <AdminPassword>%3eD%gmF</AdminPassword>
-                               
<ResetPasswordRequired>false</ResetPasswordRequired>
-                               <CustomizationScript>#!/bin/bash if [ "$1" = 
"postcustomization" ]; then echo "post customization" touch 
/root/.postcustomization sleep 30 #regenerate keys /bin/rm /etc/ssh/ssh_host_* 
/usr/sbin/dpkg-reconfigure openssh-server echo "completed" 
fi</CustomizationScript>
-                               <ComputerName>Ubuntu1004</ComputerName>
-                       </GuestCustomizationSection>
-                       
<VAppScopedLocalId>02_ubuntu_template</VAppScopedLocalId>
-               </Vm>
-       </Children>
-       <ovf:NetworkSection xmlns:vcloud="http://www.vmware.com/vcloud/v1";
-               
vcloud:href="https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/vappTemplate-1201908921/networkSection/";
-               vcloud:type="application/vnd.vmware.vcloud.networkSection+xml">
-               <ovf:Info>The list of logical networks</ovf:Info>
-               <ovf:Network ovf:name="vAppNet-vApp Internal">
-                       <ovf:Description />
-               </ovf:Network>
-       </ovf:NetworkSection>
-       <NetworkConfigSection
-               type="application/vnd.vmware.vcloud.networkConfigSection+xml"
-               
href="https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/vappTemplate-1201908921/networkConfigSection/";
-               ovf:required="false">
-               <ovf:Info>The configuration parameters for logical 
networks</ovf:Info>
-               <NetworkConfig networkName="vAppNet-vApp Internal">
-                       <Description />
-                       <Configuration>
-                               <IpScope>
-                                       <IsInherited>false</IsInherited>
-                                       <Gateway>192.168.2.1</Gateway>
-                                       <Netmask>255.255.255.0</Netmask>
-                                       <Dns1>8.8.8.8</Dns1>
-                                       <IpRanges>
-                                               <IpRange>
-                                                       
<StartAddress>192.168.2.100</StartAddress>
-                                                       
<EndAddress>192.168.2.199</EndAddress>
-                                               </IpRange>
-                                       </IpRanges>
-                                       <AllocatedIpAddresses>
-                                               
<IpAddress>192.168.2.100</IpAddress>
-                                       </AllocatedIpAddresses>
-                               </IpScope>
-                               <FenceMode>isolated</FenceMode>
-                               <Features>
-                                       <DhcpService>
-                                               <IsEnabled>false</IsEnabled>
-                                               
<DefaultLeaseTime>7200</DefaultLeaseTime>
-                                               
<MaxLeaseTime>7200</MaxLeaseTime>
-                                               <IpRange />
-                                       </DhcpService>
-                                       <FirewallService>
-                                               <IsEnabled>true</IsEnabled>
-                                       </FirewallService>
-                                       <NatService>
-                                               <IsEnabled>true</IsEnabled>
-                                               <NatType>ipTranslation</NatType>
-                                               <Policy>allowTraffic</Policy>
-                                               <NatRule>
-                                                       <OneToOneVmRule>
-                                                               
<MappingMode>automatic</MappingMode>
-                                                               
<VAppScopedVmId>02_ubuntu_template</VAppScopedVmId>
-                                                               
<VmNicId>0</VmNicId>
-                                                       </OneToOneVmRule>
-                                               </NatRule>
-                                       </NatService>
-                               </Features>
-                       </Configuration>
-                       <IsDeployed>false</IsDeployed>
-               </NetworkConfig>
-       </NetworkConfigSection>
-       <LeaseSettingsSection
-               type="application/vnd.vmware.vcloud.leaseSettingsSection+xml"
-               
href="https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/vappTemplate-1201908921/leaseSettingsSection/";
-               ovf:required="false">
-               <ovf:Info>Lease settings section</ovf:Info>
-               <Link rel="edit"
-                       
type="application/vnd.vmware.vcloud.leaseSettingsSection+xml"
-                       
href="https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/vappTemplate-1201908921/leaseSettingsSection/";
 />
-               <StorageLeaseInSeconds>0</StorageLeaseInSeconds>
-       </LeaseSettingsSection>
-       <CustomizationSection
-               type="application/vnd.vmware.vcloud.customizationSection+xml"
-               
href="https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/vappTemplate-1201908921/customizationSection/";
-               ovf:required="false">
-               <ovf:Info>VApp template customization section</ovf:Info>
-               <CustomizeOnInstantiate>true</CustomizeOnInstantiate>
-               <Link rel="edit"
-                       
type="application/vnd.vmware.vcloud.customizationSection+xml"
-                       
href="https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/vappTemplate-1201908921/customizationSection/";
 />
-       </CustomizationSection>
-</VAppTemplate>

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vAppTemplate1.0-vcd15_withNewlines.xml
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vAppTemplate1.0-vcd15_withNewlines.xml
 
b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vAppTemplate1.0-vcd15_withNewlines.xml
deleted file mode 100644
index 9f41d81..0000000
--- 
a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vAppTemplate1.0-vcd15_withNewlines.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vcloud:VAppTemplate xmlns:vcloud="http://www.vmware.com/vcloud/v1"; 
xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1"; ovfDescriptorUploaded="true" 
status="8" name="Windows 2008 R2 Standard (base) with SP1" 
type="application/vnd.vmware.vcloud.vAppTempla
-te+xml" 
href="https://vcd.stratogen.net/api/v1.0/vAppTemplate/vappTemplate-f8ca27ba-c6ee-44bd-91a9-416f464cba80";
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://schemas.dmtf.org/ovf/envelope/1 
http://schemas.dmtf.org/ovf
-/envelope/1/dsp8023_1.1.0.xsd http://www.vmware.com/vcloud/v1 
http://109.233.49.135/api/v1.0/schema/master.xsd";>
-    <vcloud:Link rel="catalogItem" 
type="application/vnd.vmware.vcloud.catalogItem+xml" 
href="https://vcd.stratogen.net/api/v1.0/catalogItem/16bdea08-f176-48ce-9fe8-fc2265fc1068"/>
-    <vcloud:Link rel="enable" 
href="https://vcd.stratogen.net/api/v1.0/vAppTemplate/vappTemplate-f8ca27ba-c6ee-44bd-91a9-416f464cba80/action/enableDownload"/>
-    <vcloud:Link rel="disable" 
href="https://vcd.stratogen.net/api/v1.0/vAppTemplate/vappTemplate-f8ca27ba-c6ee-44bd-91a9-416f464cba80/action/disableDownload"/>
-    <vcloud:Link rel="ovf" type="text/xml" 
href="https://vcd.stratogen.net/api/v1.0/vAppTemplate/vappTemplate-f8ca27ba-c6ee-44bd-91a9-416f464cba80/ovf"/>
-    <vcloud:Link rel="down" type="application/vnd.vmware.vcloud.owner+xml" 
href="https://vcd.stratogen.net/api/v1.0/vAppTemplate/vappTemplate-f8ca27ba-c6ee-44bd-91a9-416f464cba80/owner"/>
-    <vcloud:Description>Windows 2008 R2 Standard Edition
-Service Pack 1
-Internet Explorer 9</vcloud:Description>
-    <vcloud:Children>
-        <vcloud:Vm name="Windows 2008 R2 Standard (Base) with SP1" 
type="application/vnd.vmware.vcloud.vm+xml" 
href="https://vcd.stratogen.net/api/v1.0/vAppTemplate/vm-2ac49c8b-5cd9-428d-86da-24cfe9144b94";>
-            <vcloud:Link rel="up" 
type="application/vnd.vmware.vcloud.vAppTemplate+xml" 
href="https://vcd.stratogen.net/api/v1.0/vAppTemplate/vappTemplate-f8ca27ba-c6ee-44bd-91a9-416f464cba80"/>
-            <vcloud:Description>Windows 2008 R2 Standard Edition
-Service Pack 1
-Internet Explorer 9</vcloud:Description>
-            <vcloud:NetworkConnectionSection 
type="application/vnd.vmware.vcloud.networkConnectionSection+xml" 
href="https://vcd.stratogen.net/api/v1.0/vAppTemplate/vm-2ac49c8b-5cd9-428d-86da-24cfe9144b94/networkConnectionSection/";
 ovf:required="false">
-                <ovf:Info>Specifies the available VM network 
connections</ovf:Info>
-                
<vcloud:PrimaryNetworkConnectionIndex>0</vcloud:PrimaryNetworkConnectionIndex>
-                <vcloud:NetworkConnection network="StratoGen Ext Net">
-                    
<vcloud:NetworkConnectionIndex>0</vcloud:NetworkConnectionIndex>
-                    <vcloud:IpAddress>212.54.128.56</vcloud:IpAddress>
-                    <vcloud:IsConnected>true</vcloud:IsConnected>
-                    <vcloud:MACAddress>00:50:56:01:0d:3c</vcloud:MACAddress>
-                    
<vcloud:IpAddressAllocationMode>POOL</vcloud:IpAddressAllocationMode>
-                </vcloud:NetworkConnection>
-            </vcloud:NetworkConnectionSection>
-            <vcloud:GuestCustomizationSection 
type="application/vnd.vmware.vcloud.guestCustomizationSection+xml" 
href="https://vcd.stratogen.net/api/v1.0/vAppTemplate/vm-2ac49c8b-5cd9-428d-86da-24cfe9144b94/guestCustomizationSection/";
 ovf:required="false">
-                <ovf:Info>Specifies Guest OS Customization Settings</ovf:Info>
-                <vcloud:Enabled>true</vcloud:Enabled>
-                <vcloud:ChangeSid>true</vcloud:ChangeSid>
-                <vcloud:JoinDomainEnabled>false</vcloud:JoinDomainEnabled>
-                <vcloud:UseOrgSettings>false</vcloud:UseOrgSettings>
-                <vcloud:AdminPasswordEnabled>true</vcloud:AdminPasswordEnabled>
-                <vcloud:AdminPasswordAuto>true</vcloud:AdminPasswordAuto>
-                <vcloud:AdminPassword>$6fEPL93</vcloud:AdminPassword>
-                
<vcloud:ResetPasswordRequired>false</vcloud:ResetPasswordRequired>
-                <vcloud:ComputerName>Win2008r2Stand</vcloud:ComputerName>
-            </vcloud:GuestCustomizationSection>
-            
<vcloud:VAppScopedLocalId>ac2ce03d-0491-46f7-afc6-37ffe5b30f74</vcloud:VAppScopedLocalId>
-        </vcloud:Vm>
-    </vcloud:Children>
-    <ovf:NetworkSection 
vcloud:href="https://vcd.stratogen.net/api/v1.0/vAppTemplate/vappTemplate-f8ca27ba-c6ee-44bd-91a9-416f464cba80/networkSection/";
 vcloud:type="application/vnd.vmware.vcloud.networkSection+xml">
-        <ovf:Info>The list of logical networks</ovf:Info>
-        <ovf:Network ovf:name="StratoGen Ext Net">
-            <ovf:Description/>
-        </ovf:Network>
-    </ovf:NetworkSection>
-    <vcloud:NetworkConfigSection 
type="application/vnd.vmware.vcloud.networkConfigSection+xml" 
href="https://vcd.stratogen.net/api/v1.0/vAppTemplate/vappTemplate-f8ca27ba-c6ee-44bd-91a9-416f464cba80/networkConfigSection/";
 ovf:required="false">
-        <ovf:Info>The configuration parameters for logical networks</ovf:Info>
-        <vcloud:NetworkConfig networkName="StratoGen Ext Net">
-            <vcloud:Description/>
-            <vcloud:Configuration>
-                <vcloud:IpScope>
-                    <vcloud:IsInherited>true</vcloud:IsInherited>
-                    <vcloud:Gateway>212.54.128.1</vcloud:Gateway>
-                    <vcloud:Netmask>255.255.255.0</vcloud:Netmask>
-                    <vcloud:Dns1>109.233.48.141</vcloud:Dns1>
-                    <vcloud:Dns2>109.233.48.142</vcloud:Dns2>
-                    <vcloud:IpRanges>
-                        <vcloud:IpRange>
-                            
<vcloud:StartAddress>212.54.128.4</vcloud:StartAddress>
-                            
<vcloud:EndAddress>212.54.128.220</vcloud:EndAddress>
-                        </vcloud:IpRange>
-                    </vcloud:IpRanges>
-                </vcloud:IpScope>
-                <vcloud:FenceMode>bridged</vcloud:FenceMode>
-                <vcloud:Features>
-                    <vcloud:DhcpService>
-                        <vcloud:IsEnabled>false</vcloud:IsEnabled>
-                        <vcloud:DefaultLeaseTime>3600</vcloud:DefaultLeaseTime>
-                        <vcloud:MaxLeaseTime>7200</vcloud:MaxLeaseTime>
-                        <vcloud:IpRange>
-                            
<vcloud:StartAddress>212.54.128.201</vcloud:StartAddress>
-                            
<vcloud:EndAddress>212.54.128.254</vcloud:EndAddress>
-                        </vcloud:IpRange>
-                    </vcloud:DhcpService>
-                    <vcloud:FirewallService>
-                        <vcloud:IsEnabled>true</vcloud:IsEnabled>
-                    </vcloud:FirewallService>
-                    <vcloud:NatService>
-                        <vcloud:IsEnabled>true</vcloud:IsEnabled>
-                        <vcloud:NatType>ipTranslation</vcloud:NatType>
-                        <vcloud:Policy>allowTraffic</vcloud:Policy>
-                        <vcloud:NatRule>
-                            <vcloud:OneToOneVmRule>
-                                
<vcloud:MappingMode>automatic</vcloud:MappingMode>
-                                
<vcloud:VAppScopedVmId>ac2ce03d-0491-46f7-afc6-37ffe5b30f74</vcloud:VAppScopedVmId>
-                                <vcloud:VmNicId>0</vcloud:VmNicId>
-                            </vcloud:OneToOneVmRule>
-                        </vcloud:NatRule>
-                    </vcloud:NatService>
-                </vcloud:Features>
-            </vcloud:Configuration>
-            <vcloud:IsDeployed>false</vcloud:IsDeployed>
-        </vcloud:NetworkConfig>
-    </vcloud:NetworkConfigSection>
-    <vcloud:LeaseSettingsSection 
type="application/vnd.vmware.vcloud.leaseSettingsSection+xml" 
href="https://vcd.stratogen.net/api/v1.0/vAppTemplate/vappTemplate-f8ca27ba-c6ee-44bd-91a9-416f464cba80/leaseSettingsSection/";
 ovf:required="false">
-        <ovf:Info>Lease settings section</ovf:Info>
-        <vcloud:Link rel="edit" 
type="application/vnd.vmware.vcloud.leaseSettingsSection+xml" 
href="https://vcd.stratogen.net/api/v1.0/vAppTemplate/vappTemplate-f8ca27ba-c6ee-44bd-91a9-416f464cba80/leaseSettingsSection/"/>
-        <vcloud:StorageLeaseInSeconds>0</vcloud:StorageLeaseInSeconds>
-    </vcloud:LeaseSettingsSection>
-    <vcloud:CustomizationSection 
type="application/vnd.vmware.vcloud.customizationSection+xml" 
href="https://vcd.stratogen.net/api/v1.0/vAppTemplate/vappTemplate-f8ca27ba-c6ee-44bd-91a9-416f464cba80/customizationSection/";
 ovf:required="false">
-        <ovf:Info>VApp template customization section</ovf:Info>
-        <vcloud:CustomizeOnInstantiate>true</vcloud:CustomizeOnInstantiate>
-    </vcloud:CustomizationSection>
-</vcloud:VAppTemplate>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vapp-hosting.xml
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vapp-hosting.xml
 
b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vapp-hosting.xml
deleted file mode 100644
index c746cba..0000000
--- 
a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vapp-hosting.xml
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VApp href="https://vcloud.safesecureweb.com/api/v0.8/vapp/188849-96";
-    type="application/vnd.vmware.vcloud.vApp+xml" name="188849-96"
-    status="2" 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">
-
-    <NetworkConnectionSection>
-        <Info xmlns="http://schemas.dmtf.org/ovf/envelope/1";>Network 
Information about the vApp</Info>
-        <NetworkConnection Network="Network 1">
-            <IpAddress>204.12.11.167</IpAddress>
-        </NetworkConnection>
-    </NetworkConnectionSection>
-
-    <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>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vapp-none.xml
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vapp-none.xml
 
b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vapp-none.xml
deleted file mode 100644
index 62b4f32..0000000
--- 
a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vapp-none.xml
+++ /dev/null
@@ -1,237 +0,0 @@
-<VApp xmlns="http://www.vmware.com/vcloud/v1"; 
xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1"; 
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";
 deployed="true" status="4" name="customize-750" 
type="application/vnd.vmware.vcloud.vApp+xml" 
href="https://1.1.1.1/api/v1.0/vApp/vapp-1"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData
 
http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2.22.0/CIM_VirtualSystemSettingData.xsd
 http://schemas.dmtf.org/ovf/envelope/1 
http://schemas.dmtf.org/ovf/envelope/1/dsp8023_1.1.0.xsd 
http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData
 
http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2.22.0/CIM_ResourceAllocationSettingData.xsd
 http://www.vmware.com/vcloud/v1 http://1.1.1.1/api/v1.0/sch
 ema/master.xsd">
-    <Link rel="power:powerOff" 
href="https://1.1.1.1/api/v1.0/vApp/vapp-1/power/action/powerOff"/>
-    <Link rel="power:reboot" 
href="https://1.1.1.1/api/v1.0/vApp/vapp-1/power/action/reboot"/>
-    <Link rel="power:reset" 
href="https://1.1.1.1/api/v1.0/vApp/vapp-1/power/action/reset"/>
-    <Link rel="power:shutdown" 
href="https://1.1.1.1/api/v1.0/vApp/vapp-1/power/action/shutdown"/>
-    <Link rel="power:suspend" 
href="https://1.1.1.1/api/v1.0/vApp/vapp-1/power/action/suspend"/>
-    <Link rel="deploy" 
type="application/vnd.vmware.vcloud.deployVAppParams+xml" 
href="https://1.1.1.1/api/v1.0/vApp/vapp-1/action/deploy"/>
-    <Link rel="undeploy" 
type="application/vnd.vmware.vcloud.undeployVAppParams+xml" 
href="https://1.1.1.1/api/v1.0/vApp/vapp-98934665/action/undeploy"/>
-    <Link rel="down" type="application/vnd.vmware.vcloud.controlAccess+xml" 
href="https://1.1.1.1/api/v1.0/vApp/vapp-1/controlAccess/"/>
-    <Link rel="controlAccess" 
type="application/vnd.vmware.vcloud.controlAccess+xml" 
href="https://1.1.1.1/api/v1.0/vApp/vapp-1/action/controlAccess"/>
-    <Link rel="up" type="application/vnd.vmware.vcloud.vdc+xml" 
href="https://1.1.1.1/api/v1.0/vdc/1"/>
-    <Link rel="edit" type="application/vnd.vmware.vcloud.vApp+xml" 
href="https://1.1.1.1/api/v1.0/vApp/vapp-1"/>
-    <LeaseSettingsSection 
type="application/vnd.vmware.vcloud.leaseSettingsSection+xml" 
href="https://1.1.1.1/api/v1.0/vApp/vapp-1/leaseSettingsSection/"; 
ovf:required="false">
-        <ovf:Info>Lease settings section</ovf:Info>
-        <Link rel="edit" 
type="application/vnd.vmware.vcloud.leaseSettingsSection+xml" 
href="https://1.1.1.1/api/v1.0/vApp/vapp-1/leaseSettingsSection/"/>
-        <DeploymentLeaseInSeconds>0</DeploymentLeaseInSeconds>
-        <StorageLeaseInSeconds>7776000</StorageLeaseInSeconds>
-    </LeaseSettingsSection>
-    <ovf:StartupSection xmlns:vcloud="http://www.vmware.com/vcloud/v1"; 
vcloud:href="https://1.1.1.1/api/v1.0/vApp/vapp-1/startupSection/"; 
vcloud:type="application/vnd.vmware.vcloud.startupSection+xml">
-        <ovf:Info>VApp startup section</ovf:Info>
-        <ovf:Item ovf:stopDelay="0" ovf:stopAction="powerOff" 
ovf:startDelay="0" ovf:startAction="powerOn" ovf:order="0" 
ovf:id="Centos-5.5_x64"/>
-        <Link rel="edit" 
type="application/vnd.vmware.vcloud.startupSection+xml" 
href="https://1.1.1.1/api/v1.0/vApp/vapp-1/startupSection/"/>
-    </ovf:StartupSection>
-    <ovf:NetworkSection xmlns:vcloud="http://www.vmware.com/vcloud/v1"; 
vcloud:href="https://1.1.1.1/api/v1.0/vApp/vapp-1/networkSection/"; 
vcloud:type="application/vnd.vmware.vcloud.networkSection+xml">
-        <ovf:Info>The list of logical networks</ovf:Info>
-        <ovf:Network ovf:name="none">
-            <ovf:Description/>
-        </ovf:Network>
-        <ovf:Network ovf:name="none">
-            <ovf:Description>This is a special place-holder used for 
disconnected network interfaces.</ovf:Description>
-        </ovf:Network>
-    </ovf:NetworkSection>
-    <NetworkConfigSection 
type="application/vnd.vmware.vcloud.networkConfigSection+xml" 
href="https://1.1.1.1/api/v1.0/vApp/vapp-1/networkConfigSection/"; 
ovf:required="false">
-        <ovf:Info>The configuration parameters for logical networks</ovf:Info>
-        <Link rel="edit" 
type="application/vnd.vmware.vcloud.networkConfigSection+xml" 
href="https://1.1.1.1/api/v1.0/vApp/vapp-1/networkConfigSection/"/>
-        <NetworkConfig networkName="none">
-            <Description/>
-            <Configuration>
-                <IpScope>
-                    <IsInherited>true</IsInherited>
-                    <Gateway>172.16.7.1</Gateway>
-                    <Netmask>255.255.255.0</Netmask>
-                    <Dns1>208.95.232.10</Dns1>
-                    <Dns2>208.95.232.11</Dns2>
-                    <IpRanges>
-                        <IpRange>
-                            <StartAddress>172.16.7.230</StartAddress>
-                            <EndAddress>172.16.7.239</EndAddress>
-                        </IpRange>
-                    </IpRanges>
-                </IpScope>
-                <ParentNetwork 
type="application/vnd.vmware.vcloud.network+xml" name="Direct" 
href="https://1.1.1.1/api/v1.0/network/282371363"/>
-                <FenceMode>bridged</FenceMode>
-                <Features>
-                    <DhcpService>
-                        <IsEnabled>false</IsEnabled>
-                        <DefaultLeaseTime>3600</DefaultLeaseTime>
-                        <MaxLeaseTime>7200</MaxLeaseTime>
-                        <IpRange>
-                            <StartAddress>172.16.7.2</StartAddress>
-                            <EndAddress>172.16.7.229</EndAddress>
-                        </IpRange>
-                    </DhcpService>
-                    <FirewallService>
-                        <IsEnabled>true</IsEnabled>
-                    </FirewallService>
-                    <NatService>
-                        <IsEnabled>true</IsEnabled>
-                        <NatType>ipTranslation</NatType>
-                        <Policy>allowTraffic</Policy>
-                    </NatService>
-                </Features>
-            </Configuration>
-            <IsDeployed>true</IsDeployed>
-        </NetworkConfig>
-        <NetworkConfig networkName="none">
-            <Description>This is a special place-holder used for disconnected 
network interfaces.</Description>
-            <Configuration>
-                <IpScope>
-                    <IsInherited>false</IsInherited>
-                    <Gateway>196.254.254.254</Gateway>
-                    <Netmask>255.255.0.0</Netmask>
-                    <Dns1>196.254.254.254</Dns1>
-                </IpScope>
-                <FenceMode>isolated</FenceMode>
-            </Configuration>
-            <IsDeployed>false</IsDeployed>
-        </NetworkConfig>
-    </NetworkConfigSection>
-    <Children>
-        <Vm deployed="true" status="4" name="Centos-5.5_x64" 
type="application/vnd.vmware.vcloud.vm+xml" 
href="https://1.1.1.1/api/v1.0/vApp/vm-1";>
-            <Link rel="power:powerOff" 
href="https://1.1.1.1/api/v1.0/vApp/vm-1/power/action/powerOff"/>
-            <Link rel="power:reboot" 
href="https://1.1.1.1/api/v1.0/vApp/vm-1/power/action/reboot"/>
-            <Link rel="power:reset" 
href="https://1.1.1.1/api/v1.0/vApp/vm-1/power/action/reset"/>
-            <Link rel="power:shutdown" 
href="https://1.1.1.1/api/v1.0/vApp/vm-1/power/action/shutdown"/>
-            <Link rel="power:suspend" 
href="https://1.1.1.1/api/v1.0/vApp/vm-1/power/action/suspend"/>
-            <Link rel="undeploy" 
type="application/vnd.vmware.vcloud.undeployVAppParams+xml" 
href="https://1.1.1.1/api/v1.0/vApp/vm-1/action/undeploy"/>
-            <Link rel="up" type="application/vnd.vmware.vcloud.vApp+xml" 
href="https://1.1.1.1/api/v1.0/vApp/vapp-1"/>
-            <Link rel="edit" type="application/vnd.vmware.vcloud.vm+xml" 
href="https://1.1.1.1/api/v1.0/vApp/vm-1"/>
-            <Link rel="screen:thumbnail" 
href="https://1.1.1.1/api/v1.0/vApp/vm-1/screen"/>
-            <Link rel="screen:acquireTicket" 
href="https://1.1.1.1/api/v1.0/vApp/vm-1/screen/action/acquireTicket"/>
-            <Link rel="media:insertMedia" 
type="application/vnd.vmware.vcloud.mediaInsertOrEjectParams+xml" 
href="https://1.1.1.1/api/v1.0/vApp/vm-1/media/action/insertMedia"/>
-            <Link rel="media:ejectMedia" 
type="application/vnd.vmware.vcloud.mediaInsertOrEjectParams+xml" 
href="https://1.1.1.1/api/v1.0/vApp/vm-1/media/action/ejectMedia"/>
-            <Description/>
-            <ovf:VirtualHardwareSection 
xmlns:vcloud="http://www.vmware.com/vcloud/v1"; 
vcloud:href="https://1.1.1.1/api/v1.0/vApp/vm-1/virtualHardwareSection/"; 
vcloud:type="application/vnd.vmware.vcloud.virtualHardwareSection+xml">
-                <ovf:Info>Virtual hardware requirements</ovf:Info>
-                <ovf:System>
-                    <vssd:ElementName>Virtual Hardware 
Family</vssd:ElementName>
-                    <vssd:InstanceID>0</vssd:InstanceID>
-                    
<vssd:VirtualSystemIdentifier>Centos-5.5_x64</vssd:VirtualSystemIdentifier>
-                    <vssd:VirtualSystemType>vmx-07</vssd:VirtualSystemType>
-                </ovf:System>
-                <ovf:Item>
-                    <rasd:Address>00:50:56:01:02:38</rasd:Address>
-                    <rasd:AddressOnParent>0</rasd:AddressOnParent>
-                    <rasd:AutomaticAllocation>false</rasd:AutomaticAllocation>
-                    <rasd:Connection vcloud:primaryNetworkConnection="true" 
vcloud:ipAddressingMode="NONE">none</rasd:Connection>
-                    <rasd:Description>PCNet32 ethernet 
adapter</rasd:Description>
-                    <rasd:ElementName>Network adapter 0</rasd:ElementName>
-                    <rasd:InstanceID>1</rasd:InstanceID>
-                    <rasd:ResourceSubType>PCNet32</rasd:ResourceSubType>
-                    <rasd:ResourceType>10</rasd:ResourceType>
-                </ovf:Item>
-                <ovf:Item>
-                    <rasd:Address>0</rasd:Address>
-                    <rasd:Description>SCSI Controller</rasd:Description>
-                    <rasd:ElementName>SCSI Controller 0</rasd:ElementName>
-                    <rasd:InstanceID>2</rasd:InstanceID>
-                    <rasd:ResourceSubType>lsilogic</rasd:ResourceSubType>
-                    <rasd:ResourceType>6</rasd:ResourceType>
-                </ovf:Item>
-                <ovf:Item>
-                    <rasd:AddressOnParent>0</rasd:AddressOnParent>
-                    <rasd:Description>Hard disk</rasd:Description>
-                    <rasd:ElementName>Hard disk 1</rasd:ElementName>
-                    <rasd:HostResource vcloud:capacity="15360" 
vcloud:busType="6" vcloud:busSubType="lsilogic"/>
-                    <rasd:InstanceID>2000</rasd:InstanceID>
-                    <rasd:Parent>2</rasd:Parent>
-                    <rasd:ResourceType>17</rasd:ResourceType>
-                </ovf:Item>
-                <ovf:Item>
-                    <rasd:Address>0</rasd:Address>
-                    <rasd:Description>IDE Controller</rasd:Description>
-                    <rasd:ElementName>IDE Controller 0</rasd:ElementName>
-                    <rasd:InstanceID>3</rasd:InstanceID>
-                    <rasd:ResourceType>5</rasd:ResourceType>
-                </ovf:Item>
-                <ovf:Item>
-                    <rasd:AddressOnParent>0</rasd:AddressOnParent>
-                    <rasd:AutomaticAllocation>false</rasd:AutomaticAllocation>
-                    <rasd:Description>CD/DVD Drive</rasd:Description>
-                    <rasd:ElementName>CD/DVD Drive 1</rasd:ElementName>
-                    <rasd:HostResource/>
-                    <rasd:InstanceID>3002</rasd:InstanceID>
-                    <rasd:Parent>3</rasd:Parent>
-                    <rasd:ResourceType>15</rasd:ResourceType>
-                </ovf:Item>
-                <ovf:Item>
-                    <rasd:AddressOnParent>0</rasd:AddressOnParent>
-                    <rasd:AutomaticAllocation>false</rasd:AutomaticAllocation>
-                    <rasd:Description>Floppy Drive</rasd:Description>
-                    <rasd:ElementName>Floppy Drive 1</rasd:ElementName>
-                    <rasd:HostResource/>
-                    <rasd:InstanceID>8000</rasd:InstanceID>
-                    <rasd:ResourceType>14</rasd:ResourceType>
-                </ovf:Item>
-                <ovf:Item 
vcloud:href="https://1.1.1.1/api/v1.0/vApp/vm-1/virtualHardwareSection/cpu"; 
vcloud:type="application/vnd.vmware.vcloud.rasdItem+xml">
-                    <rasd:AllocationUnits>hertz * 10^6</rasd:AllocationUnits>
-                    <rasd:Description>Number of Virtual CPUs</rasd:Description>
-                    <rasd:ElementName>1 virtual CPU(s)</rasd:ElementName>
-                    <rasd:InstanceID>4</rasd:InstanceID>
-                    <rasd:Reservation>0</rasd:Reservation>
-                    <rasd:ResourceType>3</rasd:ResourceType>
-                    <rasd:VirtualQuantity>1</rasd:VirtualQuantity>
-                    <rasd:Weight>0</rasd:Weight>
-                    <Link rel="edit" 
type="application/vnd.vmware.vcloud.rasdItem+xml" 
href="https://1.1.1.1/api/v1.0/vApp/vm-1/virtualHardwareSection/cpu"/>
-                </ovf:Item>
-                <ovf:Item 
vcloud:href="https://1.1.1.1/api/v1.0/vApp/vm-1/virtualHardwareSection/memory"; 
vcloud:type="application/vnd.vmware.vcloud.rasdItem+xml">
-                    <rasd:AllocationUnits>byte * 2^20</rasd:AllocationUnits>
-                    <rasd:Description>Memory Size</rasd:Description>
-                    <rasd:ElementName>2048 MB of memory</rasd:ElementName>
-                    <rasd:InstanceID>5</rasd:InstanceID>
-                    <rasd:Reservation>0</rasd:Reservation>
-                    <rasd:ResourceType>4</rasd:ResourceType>
-                    <rasd:VirtualQuantity>2048</rasd:VirtualQuantity>
-                    <rasd:Weight>0</rasd:Weight>
-                    <Link rel="edit" 
type="application/vnd.vmware.vcloud.rasdItem+xml" 
href="https://1.1.1.1/api/v1.0/vApp/vm-1/virtualHardwareSection/memory"/>
-                </ovf:Item>
-                <Link rel="edit" 
type="application/vnd.vmware.vcloud.virtualHardwareSection+xml" 
href="https://1.1.1.1/api/v1.0/vApp/vm-1/virtualHardwareSection/"/>
-                <Link rel="down" 
type="application/vnd.vmware.vcloud.rasdItem+xml" 
href="https://1.1.1.1/api/v1.0/vApp/vm-1/virtualHardwareSection/cpu"/>
-                <Link rel="edit" 
type="application/vnd.vmware.vcloud.rasdItem+xml" 
href="https://1.1.1.1/api/v1.0/vApp/vm-1/virtualHardwareSection/cpu"/>
-                <Link rel="down" 
type="application/vnd.vmware.vcloud.rasdItem+xml" 
href="https://1.1.1.1/api/v1.0/vApp/vm-1/virtualHardwareSection/memory"/>
-                <Link rel="edit" 
type="application/vnd.vmware.vcloud.rasdItem+xml" 
href="https://1.1.1.1/api/v1.0/vApp/vm-1/virtualHardwareSection/memory"/>
-                <Link rel="down" 
type="application/vnd.vmware.vcloud.rasdItemsList+xml" 
href="https://1.1.1.1/api/v1.0/vApp/vm-1/virtualHardwareSection/disks"/>
-                <Link rel="edit" 
type="application/vnd.vmware.vcloud.rasdItemsList+xml" 
href="https://1.1.1.1/api/v1.0/vApp/vm-1/virtualHardwareSection/disks"/>
-                <Link rel="down" 
type="application/vnd.vmware.vcloud.rasdItemsList+xml" 
href="https://1.1.1.1/api/v1.0/vApp/vm-1/virtualHardwareSection/media"/>
-                <Link rel="down" 
type="application/vnd.vmware.vcloud.rasdItemsList+xml" 
href="https://1.1.1.1/api/v1.0/vApp/vm-1/virtualHardwareSection/networkCards"/>
-                <Link rel="edit" 
type="application/vnd.vmware.vcloud.rasdItemsList+xml" 
href="https://1.1.1.1/api/v1.0/vApp/vm-1/virtualHardwareSection/networkCards"/>
-            </ovf:VirtualHardwareSection>
-            <ovf:OperatingSystemSection 
xmlns:vcloud="http://www.vmware.com/vcloud/v1"; 
xmlns:vmw="http://www.vmware.com/schema/ovf"; ovf:id="80" 
vcloud:href="https://1.1.1.1/api/v1.0/vApp/vm-1/operatingSystemSection/"; 
vcloud:type="application/vnd.vmware.vcloud.operatingSystemSection+xml" 
vmw:osType="rhel5_64Guest">
-                <ovf:Info>Specifies the operating system installed</ovf:Info>
-                <ovf:Description>Red Hat Enterprise Linux 5 
(64-bit)</ovf:Description>
-                <Link rel="edit" 
type="application/vnd.vmware.vcloud.operatingSystemSection+xml" 
href="https://1.1.1.1/api/v1.0/vApp/vm-1/operatingSystemSection/"/>
-            </ovf:OperatingSystemSection>
-            <NetworkConnectionSection 
type="application/vnd.vmware.vcloud.networkConnectionSection+xml" 
href="https://1.1.1.1/api/v1.0/vApp/vm-1/networkConnectionSection/"; 
ovf:required="false">
-                <ovf:Info>Specifies the available VM network 
connections</ovf:Info>
-                
<PrimaryNetworkConnectionIndex>0</PrimaryNetworkConnectionIndex>
-                <NetworkConnection network="none">
-                    <NetworkConnectionIndex>0</NetworkConnectionIndex>
-                    <IsConnected>false</IsConnected>
-                    <MACAddress>00:50:56:01:02:38</MACAddress>
-                    <IpAddressAllocationMode>NONE</IpAddressAllocationMode>
-                </NetworkConnection>
-                <Link rel="edit" 
type="application/vnd.vmware.vcloud.networkConnectionSection+xml" 
href="https://1.1.1.1/api/v1.0/vApp/vm-1/networkConnectionSection/"/>
-            </NetworkConnectionSection>
-            <GuestCustomizationSection 
type="application/vnd.vmware.vcloud.guestCustomizationSection+xml" 
href="https://1.1.1.1/api/v1.0/vApp/vm-1/guestCustomizationSection/"; 
ovf:required="false">
-                <ovf:Info>Specifies Guest OS Customization Settings</ovf:Info>
-                <Enabled>true</Enabled>
-                <ChangeSid>false</ChangeSid>
-                <VirtualMachineId>1</VirtualMachineId>
-                <JoinDomainEnabled>false</JoinDomainEnabled>
-                <UseOrgSettings>false</UseOrgSettings>
-                <AdminPasswordEnabled>true</AdminPasswordEnabled>
-                <AdminPasswordAuto>true</AdminPasswordAuto>
-                <AdminPassword>secret</AdminPassword>
-                <ResetPasswordRequired>false</ResetPasswordRequired>
-                <CustomizationScript>cat &gt; /root/foo.txt&lt;&lt;EOF
-I love candy
-EOF
-</CustomizationScript>
-                <ComputerName>Centos-5.5_x64</ComputerName>
-                <Link rel="edit" 
type="application/vnd.vmware.vcloud.guestCustomizationSection+xml" 
href="https://1.1.1.1/api/v1.0/vApp/vm-1/guestCustomizationSection/"/>
-            </GuestCustomizationSection>
-            <VAppScopedLocalId>Centos-5.5_x64</VAppScopedLocalId>
-        </Vm>
-    </Children>
-</VApp>

Reply via email to