You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/08/21 09:09:15 UTC

[02/52] [abbrv] [partial] stratos git commit: Merging jclouds GCE fix with upstream - resolving conflicts

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vapp-pool.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vapp-pool.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vapp-pool.xml
deleted file mode 100644
index 1ac8ff3..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vapp-pool.xml
+++ /dev/null
@@ -1,227 +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="my-appExample" 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-1/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"/>
-    <Description>Example FTP Server vApp</Description>
-    <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>0</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="my-app"/>
-        <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="Direct">
-            <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="Direct">
-            <Description/>
-            <Configuration>
-                <IpScope>
-                    <IsInherited>true</IsInherited>
-                    <Gateway>172.16.7.1</Gateway>
-                    <Netmask>255.255.255.0</Netmask>
-                    <Dns1>1.1.1.2</Dns1>
-                    <Dns2>1.1.1.3</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>
-                        <NatRule>
-                            <OneToOneVmRule>
-                                <MappingMode>automatic</MappingMode>
-                                <VAppScopedVmId>100c208b-4f43-40bb-98d6-a046f6e48c3a</VAppScopedVmId>
-                                <VmNicId>0</VmNicId>
-                            </OneToOneVmRule>
-                        </NatRule>
-                    </NatService>
-                </Features>
-            </Configuration>
-            <IsDeployed>true</IsDeployed>
-        </NetworkConfig>
-    </NetworkConfigSection>
-    <Children>
-        <Vm deployed="true" status="4" name="my-app" 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>my-app</vssd:VirtualSystemIdentifier>
-                    <vssd:VirtualSystemType>vmx-07</vssd:VirtualSystemType>
-                </ovf:System>
-                <ovf:Item>
-                    <rasd:Address>00:50:56:01:02:33</rasd:Address>
-                    <rasd:AddressOnParent>0</rasd:AddressOnParent>
-                    <rasd:AutomaticAllocation>true</rasd:AutomaticAllocation>
-                    <rasd:Connection vcloud:ipAddress="172.16.7.230" vcloud:primaryNetworkConnection="true" vcloud:ipAddressingMode="POOL">Direct</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="Direct">
-                    <NetworkConnectionIndex>0</NetworkConnectionIndex>
-                    <IpAddress>172.16.7.230</IpAddress>
-                    <IsConnected>true</IsConnected>
-                    <MACAddress>00:50:56:01:02:33</MACAddress>
-                    <IpAddressAllocationMode>POOL</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>Favor</AdminPassword>
-                <ResetPasswordRequired>false</ResetPasswordRequired>
-                <CustomizationScript/>
-                <ComputerName>my-app</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>100c208b-4f43-40bb-98d6-a046f6e48c3a</VAppScopedLocalId>
-        </Vm>
-    </Children>
-</VApp>

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vapp-rhel-off-static.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vapp-rhel-off-static.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vapp-rhel-off-static.xml
deleted file mode 100644
index 7e29ffc..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vapp-rhel-off-static.xml
+++ /dev/null
@@ -1,325 +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="false" status="8" name="vApp_acole_2"
-    type="application/vnd.vmware.vcloud.vApp+xml"
-    href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-607806320"
-    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://vcenterprise.bluelock.com/api/v1.0/schema/master.xsd">
-    <Link rel="power:powerOn"
-        href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-607806320/power/action/powerOn" />
-    <Link rel="deploy" type="application/vnd.vmware.vcloud.deployVAppParams+xml"
-        href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-607806320/action/deploy" />
-    <Link rel="down" type="application/vnd.vmware.vcloud.controlAccess+xml"
-        href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-607806320/controlAccess/" />
-    <Link rel="controlAccess" type="application/vnd.vmware.vcloud.controlAccess+xml"
-        href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-607806320/action/controlAccess" />
-    <Link rel="recompose"
-        type="application/vnd.vmware.vcloud.recomposeVAppParams+xml"
-        href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-607806320/action/recomposeVApp" />
-    <Link rel="up" type="application/vnd.vmware.vcloud.vdc+xml"
-        href="https://vcenterprise.bluelock.com/api/v1.0/vdc/1014839439" />
-    <Link rel="edit" type="application/vnd.vmware.vcloud.vApp+xml"
-        href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-607806320" />
-    <Link rel="remove"
-        href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-607806320" />
-    <Description>foo</Description>
-    <LeaseSettingsSection
-        type="application/vnd.vmware.vcloud.leaseSettingsSection+xml"
-        href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-607806320/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/vApp/vapp-607806320/leaseSettingsSection/" />
-        <DeploymentLeaseInSeconds>0</DeploymentLeaseInSeconds>
-        <StorageLeaseInSeconds>0</StorageLeaseInSeconds>
-    </LeaseSettingsSection>
-    <ovf:StartupSection xmlns:vcloud="http://www.vmware.com/vcloud/v1"
-        vcloud:href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-607806320/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="RHEL5" />
-        <Link rel="edit"
-            type="application/vnd.vmware.vcloud.startupSection+xml"
-            href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-607806320/startupSection/" />
-    </ovf:StartupSection>
-    <ovf:NetworkSection xmlns:vcloud="http://www.vmware.com/vcloud/v1"
-        vcloud:href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-607806320/networkSection/"
-        vcloud:type="application/vnd.vmware.vcloud.networkSection+xml">
-        <ovf:Info>The list of logical networks</ovf:Info>
-        <ovf:Network ovf:name="internet01">
-            <ovf:Description />
-        </ovf:Network>
-    </ovf:NetworkSection>
-    <NetworkConfigSection
-        type="application/vnd.vmware.vcloud.networkConfigSection+xml"
-        href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-607806320/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://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-607806320/networkConfigSection/" />
-        <NetworkConfig networkName="internet01">
-            <Description />
-            <Configuration>
-                <IpScope>
-                    <IsInherited>true</IsInherited>
-                    <Gateway>174.47.101.161</Gateway>
-                    <Netmask>255.255.255.224</Netmask>
-                    <Dns1>24.172.173.113</Dns1>
-                    <IpRanges>
-                        <IpRange>
-                            <StartAddress>174.47.101.164</StartAddress>
-                            <EndAddress>174.47.101.190</EndAddress>
-                        </IpRange>
-                    </IpRanges>
-                </IpScope>
-                <ParentNetwork
-                    type="application/vnd.vmware.vcloud.network+xml"
-                    name="internet01"
-                    href="https://vcenterprise.bluelock.com/api/v1.0/network/758634723" />
-                <FenceMode>bridged</FenceMode>
-                <Features>
-                    <DhcpService>
-                        <IsEnabled>false</IsEnabled>
-                        <DefaultLeaseTime>3600</DefaultLeaseTime>
-                        <MaxLeaseTime>7200</MaxLeaseTime>
-                        <IpRange>
-                            <StartAddress>174.47.101.162</StartAddress>
-                            <EndAddress>174.47.101.163</EndAddress>
-                        </IpRange>
-                    </DhcpService>
-                    <FirewallService>
-                        <IsEnabled>true</IsEnabled>
-                    </FirewallService>
-                    <NatService>
-                        <IsEnabled>true</IsEnabled>
-                        <NatType>ipTranslation</NatType>
-                        <Policy>allowTraffic</Policy>
-                        <NatRule>
-                            <OneToOneVmRule>
-                                <MappingMode>automatic</MappingMode>
-                                <VAppScopedVmId>10_rhel_template</VAppScopedVmId>
-                                <VmNicId>0</VmNicId>
-                            </OneToOneVmRule>
-                        </NatRule>
-                    </NatService>
-                </Features>
-            </Configuration>
-            <IsDeployed>false</IsDeployed>
-        </NetworkConfig>
-    </NetworkConfigSection>
-    <Children>
-        <Vm deployed="false" status="8" name="RHEL5"
-            type="application/vnd.vmware.vcloud.vm+xml"
-            href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248">
-            <Link rel="power:powerOn"
-                href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/power/action/powerOn" />
-            <Link rel="deploy"
-                type="application/vnd.vmware.vcloud.deployVAppParams+xml"
-                href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/action/deploy" />
-            <Link rel="up" type="application/vnd.vmware.vcloud.vApp+xml"
-                href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-607806320" />
-            <Link rel="edit" type="application/vnd.vmware.vcloud.vm+xml"
-                href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248" />
-            <Link rel="remove"
-                href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248" />
-            <Link rel="screen:thumbnail"
-                href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/screen" />
-            <Link rel="screen:acquireTicket"
-                href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/screen/action/acquireTicket" />
-            <Link rel="media:insertMedia"
-                type="application/vnd.vmware.vcloud.mediaInsertOrEjectParams+xml"
-                href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/media/action/insertMedia" />
-            <Link rel="media:ejectMedia"
-                type="application/vnd.vmware.vcloud.mediaInsertOrEjectParams+xml"
-                href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/media/action/ejectMedia" />
-            <Description />
-            <ovf:VirtualHardwareSection
-                xmlns:vcloud="http://www.vmware.com/vcloud/v1"
-                vcloud:href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/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>RHEL5</vssd:VirtualSystemIdentifier>
-                    <vssd:VirtualSystemType>vmx-07</vssd:VirtualSystemType>
-                </ovf:System>
-                <ovf:Item>
-                    <rasd:Address>00:50:56:01:01:f2</rasd:Address>
-                    <rasd:AddressOnParent>0</rasd:AddressOnParent>
-                    <rasd:AutomaticAllocation>true</rasd:AutomaticAllocation>
-                    <rasd:Connection vcloud:ipAddress="174.47.101.164"
-                        vcloud:primaryNetworkConnection="true"
-                        vcloud:ipAddressingMode="POOL">internet01</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="30720" 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://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/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://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/cpu" />
-                </ovf:Item>
-                <ovf:Item
-                    vcloud:href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/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>384 MB of memory</rasd:ElementName>
-                    <rasd:InstanceID>5</rasd:InstanceID>
-                    <rasd:Reservation>0</rasd:Reservation>
-                    <rasd:ResourceType>4</rasd:ResourceType>
-                    <rasd:VirtualQuantity>384</rasd:VirtualQuantity>
-                    <rasd:Weight>0</rasd:Weight>
-                    <Link rel="edit"
-                        type="application/vnd.vmware.vcloud.rasdItem+xml"
-                        href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/memory" />
-                </ovf:Item>
-                <Link rel="edit"
-                    type="application/vnd.vmware.vcloud.virtualHardwareSection+xml"
-                    href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/" />
-                <Link rel="down"
-                    type="application/vnd.vmware.vcloud.rasdItem+xml"
-                    href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/cpu" />
-                <Link rel="edit"
-                    type="application/vnd.vmware.vcloud.rasdItem+xml"
-                    href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/cpu" />
-                <Link rel="down"
-                    type="application/vnd.vmware.vcloud.rasdItem+xml"
-                    href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/memory" />
-                <Link rel="edit"
-                    type="application/vnd.vmware.vcloud.rasdItem+xml"
-                    href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/memory" />
-                <Link rel="down"
-                    type="application/vnd.vmware.vcloud.rasdItemsList+xml"
-                    href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/disks" />
-                <Link rel="edit"
-                    type="application/vnd.vmware.vcloud.rasdItemsList+xml"
-                    href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/disks" />
-                <Link rel="down"
-                    type="application/vnd.vmware.vcloud.rasdItemsList+xml"
-                    href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/media" />
-                <Link rel="down"
-                    type="application/vnd.vmware.vcloud.rasdItemsList+xml"
-                    href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/networkCards" />
-                <Link rel="edit"
-                    type="application/vnd.vmware.vcloud.rasdItemsList+xml"
-                    href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/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://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/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://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/operatingSystemSection/" />
-            </ovf:OperatingSystemSection>
-            <NetworkConnectionSection
-                type="application/vnd.vmware.vcloud.networkConnectionSection+xml"
-                href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/networkConnectionSection/"
-                ovf:required="false">
-                <ovf:Info>Specifies the available VM network connections</ovf:Info>
-                <PrimaryNetworkConnectionIndex>0</PrimaryNetworkConnectionIndex>
-                <NetworkConnection network="internet01">
-                    <NetworkConnectionIndex>0</NetworkConnectionIndex>
-                    <IpAddress>174.47.101.164</IpAddress>
-                    <IsConnected>true</IsConnected>
-                    <MACAddress>00:50:56:01:01:f2</MACAddress>
-                    <IpAddressAllocationMode>POOL</IpAddressAllocationMode>
-                </NetworkConnection>
-                <Link rel="edit"
-                    type="application/vnd.vmware.vcloud.networkConnectionSection+xml"
-                    href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/networkConnectionSection/" />
-            </NetworkConnectionSection>
-            <GuestCustomizationSection
-                type="application/vnd.vmware.vcloud.guestCustomizationSection+xml"
-                href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/guestCustomizationSection/"
-                ovf:required="false">
-                <ovf:Info>Specifies Guest OS Customization Settings</ovf:Info>
-                <Enabled>true</Enabled>
-                <ChangeSid>false</ChangeSid>
-                <VirtualMachineId>2087535248</VirtualMachineId>
-                <JoinDomainEnabled>false</JoinDomainEnabled>
-                <UseOrgSettings>false</UseOrgSettings>
-                <AdminPasswordEnabled>true</AdminPasswordEnabled>
-                <AdminPasswordAuto>true</AdminPasswordAuto>
-                <ResetPasswordRequired>false</ResetPasswordRequired>
-                <CustomizationScript>cat &gt; /root/foo.txt&lt;&lt;EOF
-I '"love"' {asc|!}*&amp;
-EOF
-</CustomizationScript>
-                <ComputerName>RHEL5</ComputerName>
-                <Link rel="edit"
-                    type="application/vnd.vmware.vcloud.guestCustomizationSection+xml"
-                    href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/guestCustomizationSection/" />
-            </GuestCustomizationSection>
-            <VAppScopedLocalId>10_rhel_template</VAppScopedLocalId>
-        </Vm>
-    </Children>
-</VApp>

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vapp-ubuntu-off-dhcp.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vapp-ubuntu-off-dhcp.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vapp-ubuntu-off-dhcp.xml
deleted file mode 100644
index d8406fc..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vapp-ubuntu-off-dhcp.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="false" status="8" name="vApp_acole_1" type="application/vnd.vmware.vcloud.vApp+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-1701205721" 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://vcenterprise.bluelock.com/api/v1.0/schema/master.xsd">
-    <Link rel="power:powerOn" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-1701205721/power/action/powerOn"/>
-    <Link rel="deploy" type="application/vnd.vmware.vcloud.deployVAppParams+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-1701205721/action/deploy"/>
-    <Link rel="down" type="application/vnd.vmware.vcloud.controlAccess+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-1701205721/controlAccess/"/>
-    <Link rel="controlAccess" type="application/vnd.vmware.vcloud.controlAccess+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-1701205721/action/controlAccess"/>
-    <Link rel="recompose" type="application/vnd.vmware.vcloud.recomposeVAppParams+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-1701205721/action/recomposeVApp"/>
-    <Link rel="up" type="application/vnd.vmware.vcloud.vdc+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vdc/1014839439"/>
-    <Link rel="edit" type="application/vnd.vmware.vcloud.vApp+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-1701205721"/>
-    <Link rel="remove" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-1701205721"/>
-    <Description/>
-    <LeaseSettingsSection type="application/vnd.vmware.vcloud.leaseSettingsSection+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-1701205721/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/vApp/vapp-1701205721/leaseSettingsSection/"/>
-        <DeploymentLeaseInSeconds>0</DeploymentLeaseInSeconds>
-        <StorageLeaseInSeconds>0</StorageLeaseInSeconds>
-    </LeaseSettingsSection>
-    <ovf:StartupSection xmlns:vcloud="http://www.vmware.com/vcloud/v1" vcloud:href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-1701205721/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="Ubuntu1004"/>
-        <Link rel="edit" type="application/vnd.vmware.vcloud.startupSection+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-1701205721/startupSection/"/>
-    </ovf:StartupSection>
-    <ovf:NetworkSection xmlns:vcloud="http://www.vmware.com/vcloud/v1" vcloud:href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-1701205721/networkSection/" vcloud:type="application/vnd.vmware.vcloud.networkSection+xml">
-        <ovf:Info>The list of logical networks</ovf:Info>
-        <ovf:Network ovf:name="internet01">
-            <ovf:Description/>
-        </ovf:Network>
-    </ovf:NetworkSection>
-    <NetworkConfigSection type="application/vnd.vmware.vcloud.networkConfigSection+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-1701205721/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://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-1701205721/networkConfigSection/"/>
-        <NetworkConfig networkName="internet01">
-            <Description/>
-            <Configuration>
-                <IpScope>
-                    <IsInherited>true</IsInherited>
-                    <Gateway>174.47.101.161</Gateway>
-                    <Netmask>255.255.255.224</Netmask>
-                    <Dns1>24.172.173.113</Dns1>
-                    <IpRanges>
-                        <IpRange>
-                            <StartAddress>174.47.101.164</StartAddress>
-                            <EndAddress>174.47.101.190</EndAddress>
-                        </IpRange>
-                    </IpRanges>
-                </IpScope>
-                <ParentNetwork type="application/vnd.vmware.vcloud.network+xml" name="internet01" href="https://vcenterprise.bluelock.com/api/v1.0/network/758634723"/>
-                <FenceMode>bridged</FenceMode>
-                <Features>
-                    <DhcpService>
-                        <IsEnabled>false</IsEnabled>
-                        <DefaultLeaseTime>3600</DefaultLeaseTime>
-                        <MaxLeaseTime>7200</MaxLeaseTime>
-                        <IpRange>
-                            <StartAddress>174.47.101.162</StartAddress>
-                            <EndAddress>174.47.101.163</EndAddress>
-                        </IpRange>
-                    </DhcpService>
-                    <FirewallService>
-                        <IsEnabled>true</IsEnabled>
-                    </FirewallService>
-                    <NatService>
-                        <IsEnabled>true</IsEnabled>
-                        <NatType>ipTranslation</NatType>
-                        <Policy>allowTraffic</Policy>
-                    </NatService>
-                </Features>
-            </Configuration>
-            <IsDeployed>false</IsDeployed>
-        </NetworkConfig>
-    </NetworkConfigSection>
-    <Children>
-        <Vm deployed="false" status="8" name="Ubuntu1004" type="application/vnd.vmware.vcloud.vm+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2093098975">
-            <Link rel="power:powerOn" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2093098975/power/action/powerOn"/>
-            <Link rel="deploy" type="application/vnd.vmware.vcloud.deployVAppParams+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2093098975/action/deploy"/>
-            <Link rel="up" type="application/vnd.vmware.vcloud.vApp+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-1701205721"/>
-            <Link rel="edit" type="application/vnd.vmware.vcloud.vm+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2093098975"/>
-            <Link rel="remove" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2093098975"/>
-            <Link rel="screen:thumbnail" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2093098975/screen"/>
-            <Link rel="screen:acquireTicket" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2093098975/screen/action/acquireTicket"/>
-            <Link rel="media:insertMedia" type="application/vnd.vmware.vcloud.mediaInsertOrEjectParams+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2093098975/media/action/insertMedia"/>
-            <Link rel="media:ejectMedia" type="application/vnd.vmware.vcloud.mediaInsertOrEjectParams+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2093098975/media/action/ejectMedia"/>
-            <Description/>
-            <ovf:VirtualHardwareSection xmlns:vcloud="http://www.vmware.com/vcloud/v1" vcloud:href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2093098975/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>Ubuntu1004</vssd:VirtualSystemIdentifier>
-                    <vssd:VirtualSystemType>vmx-07</vssd:VirtualSystemType>
-                </ovf:System>
-                <ovf:Item>
-                    <rasd:Address>00:50:56:01:01:f1</rasd:Address>
-                    <rasd:AddressOnParent>0</rasd:AddressOnParent>
-                    <rasd:AutomaticAllocation>true</rasd:AutomaticAllocation>
-                    <rasd:Connection vcloud:primaryNetworkConnection="true" vcloud:ipAddressingMode="DHCP">internet01</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="30720" 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://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2093098975/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://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2093098975/virtualHardwareSection/cpu"/>
-                </ovf:Item>
-                <ovf:Item vcloud:href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2093098975/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>512 MB of memory</rasd:ElementName>
-                    <rasd:InstanceID>5</rasd:InstanceID>
-                    <rasd:Reservation>0</rasd:Reservation>
-                    <rasd:ResourceType>4</rasd:ResourceType>
-                    <rasd:VirtualQuantity>512</rasd:VirtualQuantity>
-                    <rasd:Weight>0</rasd:Weight>
-                    <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItem+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2093098975/virtualHardwareSection/memory"/>
-                </ovf:Item>
-                <Link rel="edit" type="application/vnd.vmware.vcloud.virtualHardwareSection+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2093098975/virtualHardwareSection/"/>
-                <Link rel="down" type="application/vnd.vmware.vcloud.rasdItem+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2093098975/virtualHardwareSection/cpu"/>
-                <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItem+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2093098975/virtualHardwareSection/cpu"/>
-                <Link rel="down" type="application/vnd.vmware.vcloud.rasdItem+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2093098975/virtualHardwareSection/memory"/>
-                <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItem+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2093098975/virtualHardwareSection/memory"/>
-                <Link rel="down" type="application/vnd.vmware.vcloud.rasdItemsList+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2093098975/virtualHardwareSection/disks"/>
-                <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItemsList+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2093098975/virtualHardwareSection/disks"/>
-                <Link rel="down" type="application/vnd.vmware.vcloud.rasdItemsList+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2093098975/virtualHardwareSection/media"/>
-                <Link rel="down" type="application/vnd.vmware.vcloud.rasdItemsList+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2093098975/virtualHardwareSection/networkCards"/>
-                <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItemsList+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2093098975/virtualHardwareSection/networkCards"/>
-            </ovf:VirtualHardwareSection>
-            <ovf:OperatingSystemSection xmlns:vcloud="http://www.vmware.com/vcloud/v1" xmlns:vmw="http://www.vmware.com/schema/ovf" ovf:id="94" vcloud:href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2093098975/operatingSystemSection/" vcloud:type="application/vnd.vmware.vcloud.operatingSystemSection+xml" vmw:osType="ubuntu64Guest">
-                <ovf:Info>Specifies the operating system installed</ovf:Info>
-                <ovf:Description>Ubuntu Linux (64-bit)</ovf:Description>
-                <Link rel="edit" type="application/vnd.vmware.vcloud.operatingSystemSection+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2093098975/operatingSystemSection/"/>
-            </ovf:OperatingSystemSection>
-            <NetworkConnectionSection type="application/vnd.vmware.vcloud.networkConnectionSection+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2093098975/networkConnectionSection/" ovf:required="false">
-                <ovf:Info>Specifies the available VM network connections</ovf:Info>
-                <PrimaryNetworkConnectionIndex>0</PrimaryNetworkConnectionIndex>
-                <NetworkConnection network="internet01">
-                    <NetworkConnectionIndex>0</NetworkConnectionIndex>
-                    <IsConnected>true</IsConnected>
-                    <MACAddress>00:50:56:01:01:f1</MACAddress>
-                    <IpAddressAllocationMode>DHCP</IpAddressAllocationMode>
-                </NetworkConnection>
-                <Link rel="edit" type="application/vnd.vmware.vcloud.networkConnectionSection+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2093098975/networkConnectionSection/"/>
-            </NetworkConnectionSection>
-            <GuestCustomizationSection type="application/vnd.vmware.vcloud.guestCustomizationSection+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2093098975/guestCustomizationSection/" ovf:required="false">
-                <ovf:Info>Specifies Guest OS Customization Settings</ovf:Info>
-                <Enabled>true</Enabled>
-                <ChangeSid>false</ChangeSid>
-                <VirtualMachineId>2093098975</VirtualMachineId>
-                <JoinDomainEnabled>false</JoinDomainEnabled>
-                <UseOrgSettings>false</UseOrgSettings>
-                <AdminPasswordEnabled>true</AdminPasswordEnabled>
-                <AdminPasswordAuto>true</AdminPasswordAuto>
-                <AdminPassword>%3eD%gmF</AdminPassword>
-                <ResetPasswordRequired>false</ResetPasswordRequired>
-                <CustomizationScript>#regenerate keys /bin/rm /etc/ssh/ssh_host_* /usr/sbin/dpkg-reconfigure openssh-server</CustomizationScript>
-                <ComputerName>Ubuntu1004</ComputerName>
-                <Link rel="edit" type="application/vnd.vmware.vcloud.guestCustomizationSection+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2093098975/guestCustomizationSection/"/>
-            </GuestCustomizationSection>
-            <VAppScopedLocalId>02_ubuntu_template</VAppScopedLocalId>
-        </Vm>
-    </Children>
-</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-unresolved.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vapp-unresolved.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vapp-unresolved.xml
deleted file mode 100644
index 995bc29..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vapp-unresolved.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VApp xmlns="http://www.vmware.com/vcloud/v1" deployed="false"
-    status="0" name="vApp_acole_2" type="application/vnd.vmware.vcloud.vApp+xml"
-    href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-607806320"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="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" />
-    <Description />
-    <Tasks>
-        <Task status="running" startTime="2010-08-23T02:09:52.443-04:00"
-            operation="Creating Virtual Application vApp_acole_2(607806320)"
-            expiryTime="2010-11-21T02:09:52.443-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/3cc08ir8oczbze3n1a3">
-            <Owner type="application/vnd.vmware.vcloud.vApp+xml"
-                name="vApp_acole_2"
-                href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-607806320" />
-        </Task>
-    </Tasks>
-</VApp>

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vapp-win-off-static.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vapp-win-off-static.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vapp-win-off-static.xml
deleted file mode 100644
index 6282766..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vapp-win-off-static.xml
+++ /dev/null
@@ -1,219 +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="false" status="8" name="vApp_acole_4" type="application/vnd.vmware.vcloud.vApp+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-972626903" 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 h
 ttp://vcenterprise.bluelock.com/api/v1.0/schema/master.xsd">
-    <Link rel="power:powerOn" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-972626903/power/action/powerOn"/>
-    <Link rel="deploy" type="application/vnd.vmware.vcloud.deployVAppParams+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-972626903/action/deploy"/>
-    <Link rel="down" type="application/vnd.vmware.vcloud.controlAccess+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-972626903/controlAccess/"/>
-    <Link rel="controlAccess" type="application/vnd.vmware.vcloud.controlAccess+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-972626903/action/controlAccess"/>
-    <Link rel="recompose" type="application/vnd.vmware.vcloud.recomposeVAppParams+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-972626903/action/recomposeVApp"/>
-    <Link rel="up" type="application/vnd.vmware.vcloud.vdc+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vdc/1014839439"/>
-    <Link rel="edit" type="application/vnd.vmware.vcloud.vApp+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-972626903"/>
-    <Link rel="remove" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-972626903"/>
-    <Description/>
-    <LeaseSettingsSection type="application/vnd.vmware.vcloud.leaseSettingsSection+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-972626903/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/vApp/vapp-972626903/leaseSettingsSection/"/>
-        <DeploymentLeaseInSeconds>0</DeploymentLeaseInSeconds>
-        <StorageLeaseInSeconds>0</StorageLeaseInSeconds>
-    </LeaseSettingsSection>
-    <ovf:StartupSection xmlns:vcloud="http://www.vmware.com/vcloud/v1" vcloud:href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-972626903/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="Windows2008R2"/>
-        <Link rel="edit" type="application/vnd.vmware.vcloud.startupSection+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-972626903/startupSection/"/>
-    </ovf:StartupSection>
-    <ovf:NetworkSection xmlns:vcloud="http://www.vmware.com/vcloud/v1" vcloud:href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-972626903/networkSection/" vcloud:type="application/vnd.vmware.vcloud.networkSection+xml">
-        <ovf:Info>The list of logical networks</ovf:Info>
-        <ovf:Network ovf:name="internet01">
-            <ovf:Description/>
-        </ovf:Network>
-    </ovf:NetworkSection>
-    <NetworkConfigSection type="application/vnd.vmware.vcloud.networkConfigSection+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-972626903/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://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-972626903/networkConfigSection/"/>
-        <NetworkConfig networkName="internet01">
-            <Description/>
-            <Configuration>
-                <IpScope>
-                    <IsInherited>true</IsInherited>
-                    <Gateway>174.47.101.161</Gateway>
-                    <Netmask>255.255.255.224</Netmask>
-                    <Dns1>24.172.173.113</Dns1>
-                    <IpRanges>
-                        <IpRange>
-                            <StartAddress>174.47.101.164</StartAddress>
-                            <EndAddress>174.47.101.190</EndAddress>
-                        </IpRange>
-                    </IpRanges>
-                </IpScope>
-                <ParentNetwork type="application/vnd.vmware.vcloud.network+xml" name="internet01" href="https://vcenterprise.bluelock.com/api/v1.0/network/758634723"/>
-                <FenceMode>bridged</FenceMode>
-                <Features>
-                    <DhcpService>
-                        <IsEnabled>false</IsEnabled>
-                        <DefaultLeaseTime>3600</DefaultLeaseTime>
-                        <MaxLeaseTime>7200</MaxLeaseTime>
-                        <IpRange>
-                            <StartAddress>174.47.101.162</StartAddress>
-                            <EndAddress>174.47.101.163</EndAddress>
-                        </IpRange>
-                    </DhcpService>
-                    <FirewallService>
-                        <IsEnabled>true</IsEnabled>
-                    </FirewallService>
-                    <NatService>
-                        <IsEnabled>true</IsEnabled>
-                        <NatType>ipTranslation</NatType>
-                        <Policy>allowTraffic</Policy>
-                        <NatRule>
-                            <OneToOneVmRule>
-                                <MappingMode>automatic</MappingMode>
-                                <VAppScopedVmId>04_windows_template</VAppScopedVmId>
-                                <VmNicId>0</VmNicId>
-                            </OneToOneVmRule>
-                        </NatRule>
-                    </NatService>
-                </Features>
-            </Configuration>
-            <IsDeployed>false</IsDeployed>
-        </NetworkConfig>
-    </NetworkConfigSection>
-    <Children>
-        <Vm deployed="false" status="8" name="Windows2008R2" type="application/vnd.vmware.vcloud.vm+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-904484461">
-            <Link rel="power:powerOn" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-904484461/power/action/powerOn"/>
-            <Link rel="deploy" type="application/vnd.vmware.vcloud.deployVAppParams+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-904484461/action/deploy"/>
-            <Link rel="up" type="application/vnd.vmware.vcloud.vApp+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-972626903"/>
-            <Link rel="edit" type="application/vnd.vmware.vcloud.vm+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-904484461"/>
-            <Link rel="remove" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-904484461"/>
-            <Link rel="screen:thumbnail" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-904484461/screen"/>
-            <Link rel="screen:acquireTicket" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-904484461/screen/action/acquireTicket"/>
-            <Link rel="media:insertMedia" type="application/vnd.vmware.vcloud.mediaInsertOrEjectParams+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-904484461/media/action/insertMedia"/>
-            <Link rel="media:ejectMedia" type="application/vnd.vmware.vcloud.mediaInsertOrEjectParams+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-904484461/media/action/ejectMedia"/>
-            <Description/>
-            <ovf:VirtualHardwareSection xmlns:vcloud="http://www.vmware.com/vcloud/v1" vcloud:href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-904484461/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>Windows2008R2</vssd:VirtualSystemIdentifier>
-                    <vssd:VirtualSystemType>vmx-07</vssd:VirtualSystemType>
-                </ovf:System>
-                <ovf:Item>
-                    <rasd:Address>00:50:56:01:02:33</rasd:Address>
-                    <rasd:AddressOnParent>0</rasd:AddressOnParent>
-                    <rasd:AutomaticAllocation>true</rasd:AutomaticAllocation>
-                    <rasd:Connection vcloud:ipAddress="174.47.101.165" vcloud:primaryNetworkConnection="true" vcloud:ipAddressingMode="POOL">internet01</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>lsilogicsas</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="40960" vcloud:busType="6" vcloud:busSubType="lsilogicsas"/>
-                    <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://vcenterprise.bluelock.com/api/v1.0/vApp/vm-904484461/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://vcenterprise.bluelock.com/api/v1.0/vApp/vm-904484461/virtualHardwareSection/cpu"/>
-                </ovf:Item>
-                <ovf:Item vcloud:href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-904484461/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>4096 MB of memory</rasd:ElementName>
-                    <rasd:InstanceID>5</rasd:InstanceID>
-                    <rasd:Reservation>0</rasd:Reservation>
-                    <rasd:ResourceType>4</rasd:ResourceType>
-                    <rasd:VirtualQuantity>4096</rasd:VirtualQuantity>
-                    <rasd:Weight>0</rasd:Weight>
-                    <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItem+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-904484461/virtualHardwareSection/memory"/>
-                </ovf:Item>
-                <Link rel="edit" type="application/vnd.vmware.vcloud.virtualHardwareSection+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-904484461/virtualHardwareSection/"/>
-                <Link rel="down" type="application/vnd.vmware.vcloud.rasdItem+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-904484461/virtualHardwareSection/cpu"/>
-                <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItem+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-904484461/virtualHardwareSection/cpu"/>
-                <Link rel="down" type="application/vnd.vmware.vcloud.rasdItem+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-904484461/virtualHardwareSection/memory"/>
-                <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItem+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-904484461/virtualHardwareSection/memory"/>
-                <Link rel="down" type="application/vnd.vmware.vcloud.rasdItemsList+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-904484461/virtualHardwareSection/disks"/>
-                <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItemsList+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-904484461/virtualHardwareSection/disks"/>
-                <Link rel="down" type="application/vnd.vmware.vcloud.rasdItemsList+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-904484461/virtualHardwareSection/media"/>
-                <Link rel="down" type="application/vnd.vmware.vcloud.rasdItemsList+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-904484461/virtualHardwareSection/networkCards"/>
-                <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItemsList+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-904484461/virtualHardwareSection/networkCards"/>
-            </ovf:VirtualHardwareSection>
-            <ovf:OperatingSystemSection xmlns:vcloud="http://www.vmware.com/vcloud/v1" xmlns:vmw="http://www.vmware.com/schema/ovf" ovf:id="102" vcloud:href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-904484461/operatingSystemSection/" vcloud:type="application/vnd.vmware.vcloud.operatingSystemSection+xml" vmw:osType="windows7Server64Guest">
-                <ovf:Info>Specifies the operating system installed</ovf:Info>
-                <ovf:Description>Microsoft Windows Server 2008 R2 (64-bit)</ovf:Description>
-                <Link rel="edit" type="application/vnd.vmware.vcloud.operatingSystemSection+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-904484461/operatingSystemSection/"/>
-            </ovf:OperatingSystemSection>
-            <NetworkConnectionSection type="application/vnd.vmware.vcloud.networkConnectionSection+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-904484461/networkConnectionSection/" ovf:required="false">
-                <ovf:Info>Specifies the available VM network connections</ovf:Info>
-                <PrimaryNetworkConnectionIndex>0</PrimaryNetworkConnectionIndex>
-                <NetworkConnection network="internet01">
-                    <NetworkConnectionIndex>0</NetworkConnectionIndex>
-                    <IpAddress>174.47.101.165</IpAddress>
-                    <IsConnected>true</IsConnected>
-                    <MACAddress>00:50:56:01:02:33</MACAddress>
-                    <IpAddressAllocationMode>POOL</IpAddressAllocationMode>
-                </NetworkConnection>
-                <Link rel="edit" type="application/vnd.vmware.vcloud.networkConnectionSection+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-904484461/networkConnectionSection/"/>
-            </NetworkConnectionSection>
-            <GuestCustomizationSection type="application/vnd.vmware.vcloud.guestCustomizationSection+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-904484461/guestCustomizationSection/" ovf:required="false">
-                <ovf:Info>Specifies Guest OS Customization Settings</ovf:Info>
-                <Enabled>true</Enabled>
-                <ChangeSid>true</ChangeSid>
-                <VirtualMachineId>904484461</VirtualMachineId>
-                <JoinDomainEnabled>false</JoinDomainEnabled>
-                <UseOrgSettings>false</UseOrgSettings>
-                <AdminPasswordEnabled>true</AdminPasswordEnabled>
-                <AdminPasswordAuto>true</AdminPasswordAuto>
-                <ResetPasswordRequired>false</ResetPasswordRequired>
-                <CustomizationScript/>
-                <ComputerName>Windows2008R2</ComputerName>
-                <Link rel="edit" type="application/vnd.vmware.vcloud.guestCustomizationSection+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-904484461/guestCustomizationSection/"/>
-            </GuestCustomizationSection>
-            <VAppScopedLocalId>04_windows_template</VAppScopedLocalId>
-        </Vm>
-    </Children>
-</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/vdc-1.0.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vdc-1.0.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vdc-1.0.xml
deleted file mode 100644
index 286e42c..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vdc-1.0.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Vdc xmlns="http://www.vmware.com/vcloud/v1" status="1" name="Jclouds-Commit-compG1xstorA01" type="application/vnd.vmware.vcloud.vdc+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vdc/1014839439" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1 http://
-vcenterprise.bluelock.com/api/v1.0/schema/master.xsd">
-    <Link rel="up" type="application/vnd.vmware.vcloud.org+xml" href="https://vcenterprise.bluelock.com/api/v1.0/org/9566014"/>
-    <Link rel="add" type="application/vnd.vmware.vcloud.uploadVAppTemplateParams+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vdc/1014839439/action/uploadVAppTemplate"/>
-    <Link rel="add" type="application/vnd.vmware.vcloud.media+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vdc/1014839439/media"/>
-    <Link rel="add" type="application/vnd.vmware.vcloud.instantiateVAppTemplateParams+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vdc/1014839439/action/instantiateVAppTemplate"/>
-    <Link rel="add" type="application/vnd.vmware.vcloud.cloneVAppParams+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vdc/1014839439/action/cloneVApp"/>
-    <Link rel="add" type="application/vnd.vmware.vcloud.cloneVAppTemplateParams+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vdc/1014839439/action/cloneVAppTemplate"/>
-    <Link rel="add" type="application/vnd.vmware.vcloud.cloneMediaParams+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vdc/1014839439/action/cloneMedia"/>
-    <Link rel="add" type="application/vnd.vmware.vcloud.captureVAppParams+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vdc/1014839439/action/captureVApp"/>
-    <Link rel="add" type="application/vnd.vmware.vcloud.composeVAppParams+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vdc/1014839439/action/composeVApp"/>
-    <Link rel="move" type="application/vnd.vmware.vcloud.moveMediaParams+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vdc/1014839439/action/moveMedia"/>
-    <Link rel="move" type="application/vnd.vmware.vcloud.moveVAppParams+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vdc/1014839439/action/moveVApp"/>
-    <Link rel="move" type="application/vnd.vmware.vcloud.moveVAppTemplateParams+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vdc/1014839439/action/moveVAppTemplate"/>
-    <AllocationModel>AllocationPool</AllocationModel>
-    <StorageCapacity>
-        <Units>MB</Units>
-        <Allocated>1024000</Allocated>
-        <Limit>1024000</Limit>
-        <Used>0</Used>
-        <Overhead>0</Overhead>
-    </StorageCapacity>
-    <ComputeCapacity>
-        <Cpu>
-            <Units>MHz</Units>
-            <Allocated>20000</Allocated>
-            <Limit>20000</Limit>
-            <Used>0</Used>
-            <Overhead>0</Overhead>
-        </Cpu>
-        <Memory>
-            <Units>MB</Units>
-            <Allocated>30720</Allocated>
-            <Limit>30720</Limit>
-            <Used>0</Used>
-            <Overhead>0</Overhead>
-        </Memory>
-    </ComputeCapacity>
-    <ResourceEntities/>
-    <AvailableNetworks>
-        <Network type="application/vnd.vmware.vcloud.network+xml" name="isolation01" href="https://vcenterprise.bluelock.com/api/v1.0/network/990419644"/>
-        <Network type="application/vnd.vmware.vcloud.network+xml" name="internet01" href="https://vcenterprise.bluelock.com/api/v1.0/network/758634723"/>
-    </AvailableNetworks>
-    <NicQuota>0</NicQuota>
-    <NetworkQuota>100</NetworkQuota>
-    <VmQuota>50</VmQuota>
-    <IsEnabled>true</IsEnabled>
-</Vdc>

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vdc-hosting.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vdc-hosting.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vdc-hosting.xml
deleted file mode 100644
index 6254112..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/vdc-hosting.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Vdc href="https://vcloud.safesecureweb.com/api/v0.8/vdc/188849"
-    name="vDC Name" xsi:schemaLocation="http://www.vmware.com/vcloud/v0.8/vdc.xsd"
-    xmlns="http://www.vmware.com/vcloud/v0.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <Link rel="add"
-        href="https://vcloud.safesecureweb.com/api/v0.8/vdc/188849/vApps"
-        type="application/vnd.vmware.vcloud.vApp+xml" />
-    <Link rel="add"
-        href="https://vcloud.safesecureweb.com/api/v0.8/vdc/188849/vAppTemplates"
-        type="application/vnd.vmware.vcloud.catalogItem+xml" />
-    <Link rel="add"
-        href="https://vcloud.safesecureweb.com/api/v0.8/vdc/188849/media"
-        type="application/vnd.vmware.vcloud.media+xml" />
-    <Description>vDC Name</Description>
-    <StorageCapacity>
-        <Units>bytes * 10^9</Units>
-        <Allocated>0</Allocated>
-        <Used>40960</Used>
-    </StorageCapacity>
-    <ComputeCapacity>
-        <Cpu>
-            <Units>hz * 10^6</Units>
-            <Allocated>0</Allocated>
-            <Used>2400</Used>
-        </Cpu>
-        <Memory>
-            <Units>bytes * 10^9</Units>
-            <Allocated>0</Allocated>
-            <Used>2</Used>
-        </Memory>
-        <InstantiatedVmsQuota>
-            <Limit>0</Limit>
-            <Used>2</Used>
-        </InstantiatedVmsQuota>
-        <DeployedVmsQuota>
-            <Limit>0</Limit>
-            <Used>2</Used>
-        </DeployedVmsQuota>
-    </ComputeCapacity>
-    <ResourceEntities>
-        <ResourceEntity
-            href="https://vcloud.safesecureweb.com/api/v0.8/vAppTemplate/1"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Plesk (Linux) 64-bit Template" />
-        <ResourceEntity
-            href="https://vcloud.safesecureweb.com/api/v0.8/vAppTemplate/2"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows 2008 Datacenter 64 Bit Template" />
-        <ResourceEntity
-            href="https://vcloud.safesecureweb.com/api/v0.8/vAppTemplate/3"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Cent OS 64 Bit Template" />
-        <ResourceEntity
-            href="https://vcloud.safesecureweb.com/api/v0.8/vAppTemplate/4"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="cPanel (Linux) 64 Bit Template" />
-        <ResourceEntity
-            href="https://vcloud.safesecureweb.com/api/v0.8/vApp/188849-1"
-            type="application/vnd.vmware.vcloud.vApp+xml" name="188849-1" />
-        <ResourceEntity
-            href="https://vcloud.safesecureweb.com/api/v0.8/vApp/188849-2"
-            type="application/vnd.vmware.vcloud.vApp+xml" name="188849-2" />
-    </ResourceEntities>
-</Vdc>