You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ad...@apache.org on 2014/11/17 17:19:21 UTC
[05/19] jclouds git commit: JCLOUDS-780 Remove vcloud.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/orglist-savvis.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/orglist-savvis.xml b/apis/vcloud/src/test/resources/orglist-savvis.xml
deleted file mode 100644
index 4de503b..0000000
--- a/apis/vcloud/src/test/resources/orglist-savvis.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<vApp:OrgList xmlns:vApp="http://www.vmware.com/vcloud/v0.8">
-<vApp:Org name="SAVVISStation Integration Testing" type="application/vnd.vmware.vcloud.org+xml" href="https://api.sandbox.symphonyvpdc.savvis.net/rest/api/v0.8/org/100000.0"/>
-</vApp:OrgList>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/orglist.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/orglist.xml b/apis/vcloud/src/test/resources/orglist.xml
deleted file mode 100644
index e6117b3..0000000
--- a/apis/vcloud/src/test/resources/orglist.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<OrgList xmlns="http://www.vmware.com/vcloud/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-<Org href="https://services.vcloudexpress.terremark.com/api/v0.8/org/48" type="application/vnd.vmware.vcloud.org+xml" name="adrian@jclouds.org"/>
-</OrgList>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/orgnetwork-bridged.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/orgnetwork-bridged.xml b/apis/vcloud/src/test/resources/orgnetwork-bridged.xml
deleted file mode 100644
index cb2a0d3..0000000
--- a/apis/vcloud/src/test/resources/orgnetwork-bridged.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<OrgNetwork xmlns="http://www.vmware.com/vcloud/v1" name="internet01" type="application/vnd.vmware.vcloud.network+xml" href="https://vcenterprise.bluelock.com/api/v1.0/network/758634723" 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"/>
- <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>
- <FenceMode>bridged</FenceMode>
- </Configuration>
-</OrgNetwork>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/orgnetwork-isolated.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/orgnetwork-isolated.xml b/apis/vcloud/src/test/resources/orgnetwork-isolated.xml
deleted file mode 100644
index ac3a66a..0000000
--- a/apis/vcloud/src/test/resources/orgnetwork-isolated.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<OrgNetwork xmlns="http://www.vmware.com/vcloud/v1" name="isolation01" type="application/vnd.vmware.vcloud.network+xml" href="https://vcenterprise.bluelock.com/api/v1.0/network/990419644" 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"/>
- <Description/>
- <Configuration>
- <IpScope>
- <IsInherited>false</IsInherited>
- <Gateway>192.168.15.1</Gateway>
- <Netmask>255.255.255.0</Netmask>
- <Dns1>23.172.173.113</Dns1>
- <IpRanges>
- <IpRange>
- <StartAddress>192.168.15.100</StartAddress>
- <EndAddress>192.168.15.199</EndAddress>
- </IpRange>
- </IpRanges>
- </IpScope>
- <FenceMode>isolated</FenceMode>
- <Features>
- <DhcpService>
- <IsEnabled>false</IsEnabled>
- <DefaultLeaseTime>3600</DefaultLeaseTime>
- <MaxLeaseTime>7200</MaxLeaseTime>
- <IpRange>
- <StartAddress>192.168.15.2</StartAddress>
- <EndAddress>192.168.15.99</EndAddress>
- </IpRange>
- </DhcpService>
- </Features>
- </Configuration>
-</OrgNetwork>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/os.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/os.xml b/apis/vcloud/src/test/resources/os.xml
deleted file mode 100644
index 3196a27..0000000
--- a/apis/vcloud/src/test/resources/os.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/ovf-multi-vm.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/ovf-multi-vm.xml b/apis/vcloud/src/test/resources/ovf-multi-vm.xml
deleted file mode 100644
index fa4bb37..0000000
--- a/apis/vcloud/src/test/resources/ovf-multi-vm.xml
+++ /dev/null
@@ -1,285 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ovf:Envelope xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns:vcloud="http://www.vmware.com/vcloud/v1" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns: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://zone.myvcloud.com/api/v1.0/schema/master.xsd">
- <ovf:References/>
- <ovf:NetworkSection>
- <ovf:Info>The list of logical networks</ovf:Info>
- <ovf:Network ovf:name="vapp net">
- <ovf:Description/>
- </ovf:Network>
- </ovf:NetworkSection>
- <vcloud:NetworkConfigSection ovf:required="false">
- <ovf:Info>The configuration parameters for logical networks</ovf:Info>
- <vcloud:NetworkConfig networkName="vapp net">
- <vcloud:Description/>
- <vcloud:Configuration>
- <vcloud:IpScope>
- <vcloud:IsInherited>false</vcloud:IsInherited>
- <vcloud:Gateway>192.168.2.1</vcloud:Gateway>
- <vcloud:Netmask>255.255.255.0</vcloud:Netmask>
- <vcloud:Dns1>195.225.219.131</vcloud:Dns1>
- <vcloud:IpRanges>
- <vcloud:IpRange>
- <vcloud:StartAddress>192.168.2.100</vcloud:StartAddress>
- <vcloud:EndAddress>192.168.2.199</vcloud:EndAddress>
- </vcloud:IpRange>
- </vcloud:IpRanges>
- </vcloud:IpScope>
- <vcloud:FenceMode>isolated</vcloud:FenceMode>
- <vcloud:Features>
- <vcloud:DhcpService>
- <vcloud:IsEnabled>false</vcloud:IsEnabled>
- <vcloud:DefaultLeaseTime>7200</vcloud:DefaultLeaseTime>
- <vcloud:MaxLeaseTime>7200</vcloud:MaxLeaseTime>
- <vcloud:IpRange/>
- </vcloud:DhcpService>
- </vcloud:Features>
- </vcloud:Configuration>
- <vcloud:IsDeployed>false</vcloud:IsDeployed>
- </vcloud:NetworkConfig>
- </vcloud:NetworkConfigSection>
- <vcloud:LeaseSettingsSection ovf:required="false">
- <ovf:Info>Lease settings section</ovf:Info>
- <vcloud:DeploymentLeaseInSeconds>0</vcloud:DeploymentLeaseInSeconds>
- <vcloud:StorageLeaseInSeconds>0</vcloud:StorageLeaseInSeconds>
- </vcloud:LeaseSettingsSection>
- <vcloud:CustomizationSection ovf:required="false">
- <ovf:Info>VApp template customization section</ovf:Info>
- <vcloud:CustomizeOnInstantiate>true</vcloud:CustomizeOnInstantiate>
- </vcloud:CustomizationSection>
- <ovf:VirtualSystemCollection ovf:id="centos-web/db-5.5">
- <ovf:Info>A collection of virtual machines: </ovf:Info>
- <ovf:Name>centos-web/db-5.5</ovf:Name>
- <ovf:StartupSection>
- <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-web"/>
- <ovf:Item ovf:stopDelay="0" ovf:stopAction="powerOff" ovf:startDelay="0" ovf:startAction="powerOn" ovf:order="0" ovf:id="centos-db"/>
- </ovf:StartupSection>
- <ovf:VirtualSystem ovf:id="centos-db">
- <ovf:Info>A virtual machine: </ovf:Info>
- <ovf:Name>centos-db</ovf:Name>
- <ovf:OperatingSystemSection xmlns:vmw="http://www.vmware.com/schema/ovf" ovf:id="100" vmw:osType="other26xLinux64Guest">
- <ovf:Info>Specifies the operating system installed</ovf:Info>
- <ovf:Description>Other 2.6x Linux (64-bit)</ovf:Description>
- </ovf:OperatingSystemSection>
- <ovf:VirtualHardwareSection>
- <ovf:Info>Virtual hardware requirements</ovf:Info>
- <ovf:System>
- <vssd:ElementName>Virtual Hardware Family</vssd:ElementName>
- <vssd:InstanceID>0</vssd:InstanceID>
- <vssd:VirtualSystemIdentifier>centos-db</vssd:VirtualSystemIdentifier>
- <vssd:VirtualSystemType>vmx-07</vssd:VirtualSystemType>
- </ovf:System>
- <ovf:Item>
- <rasd:Address>00:50:56:01:06:81</rasd:Address>
- <rasd:AddressOnParent>0</rasd:AddressOnParent>
- <rasd:AutomaticAllocation>true</rasd:AutomaticAllocation>
- <rasd:Connection vcloud:ipAddress="192.168.2.100" vcloud:primaryNetworkConnection="true" vcloud:ipAddressingMode="POOL">vapp net</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="8192" 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>3000</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>
- <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>
- </ovf:Item>
- <ovf:Item>
- <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>
- </ovf:Item>
- </ovf:VirtualHardwareSection>
- <vcloud:NetworkConnectionSection ovf:required="false">
- <ovf:Info>Specifies the available VM network connections</ovf:Info>
- <vcloud:PrimaryNetworkConnectionIndex>0</vcloud:PrimaryNetworkConnectionIndex>
- <vcloud:NetworkConnection network="vapp net">
- <vcloud:NetworkConnectionIndex>0</vcloud:NetworkConnectionIndex>
- <vcloud:IpAddress>192.168.2.100</vcloud:IpAddress>
- <vcloud:IsConnected>true</vcloud:IsConnected>
- <vcloud:MACAddress>00:50:56:01:06:81</vcloud:MACAddress>
- <vcloud:IpAddressAllocationMode>POOL</vcloud:IpAddressAllocationMode>
- </vcloud:NetworkConnection>
- </vcloud:NetworkConnectionSection>
- <vcloud:GuestCustomizationSection ovf:required="false">
- <ovf:Info>Specifies Guest OS Customization Settings</ovf:Info>
- <vcloud:Enabled>true</vcloud:Enabled>
- <vcloud:ChangeSid>false</vcloud:ChangeSid>
- <vcloud:JoinDomainEnabled>false</vcloud:JoinDomainEnabled>
- <vcloud:UseOrgSettings>false</vcloud:UseOrgSettings>
- <vcloud:AdminPasswordEnabled>false</vcloud:AdminPasswordEnabled>
- <vcloud:AdminPasswordAuto>true</vcloud:AdminPasswordAuto>
- <vcloud:ResetPasswordRequired>false</vcloud:ResetPasswordRequired>
- <vcloud:ComputerName>centos-db</vcloud:ComputerName>
- </vcloud:GuestCustomizationSection>
- </ovf:VirtualSystem>
- <ovf:VirtualSystem ovf:id="centos-web">
- <ovf:Info>A virtual machine: </ovf:Info>
- <ovf:Name>centos-web</ovf:Name>
- <ovf:OperatingSystemSection xmlns:vmw="http://www.vmware.com/schema/ovf" ovf:id="100" vmw:osType="other26xLinux64Guest">
- <ovf:Info>Specifies the operating system installed</ovf:Info>
- <ovf:Description>Other 2.6x Linux (64-bit)</ovf:Description>
- </ovf:OperatingSystemSection>
- <ovf:VirtualHardwareSection>
- <ovf:Info>Virtual hardware requirements</ovf:Info>
- <ovf:System>
- <vssd:ElementName>Virtual Hardware Family</vssd:ElementName>
- <vssd:InstanceID>0</vssd:InstanceID>
- <vssd:VirtualSystemIdentifier>centos-web</vssd:VirtualSystemIdentifier>
- <vssd:VirtualSystemType>vmx-07</vssd:VirtualSystemType>
- </ovf:System>
- <ovf:Item>
- <rasd:Address>00:50:56:01:06:82</rasd:Address> <rasd:AddressOnParent>0</rasd:AddressOnParent>
- <rasd:AutomaticAllocation>true</rasd:AutomaticAllocation>
- <rasd:Connection vcloud:ipAddress="192.168.2.101" vcloud:primaryNetworkConnection="true" vcloud:ipAddressingMode="POOL">vapp net</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="8192" 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>3000</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>
- <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>
- </ovf:Item>
- <ovf:Item>
- <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>
- </ovf:Item>
- </ovf:VirtualHardwareSection>
- <vcloud:NetworkConnectionSection ovf:required="false">
- <ovf:Info>Specifies the available VM network connections</ovf:Info>
- <vcloud:PrimaryNetworkConnectionIndex>0</vcloud:PrimaryNetworkConnectionIndex>
- <vcloud:NetworkConnection network="vapp net">
- <vcloud:NetworkConnectionIndex>0</vcloud:NetworkConnectionIndex>
- <vcloud:IpAddress>192.168.2.101</vcloud:IpAddress>
- <vcloud:IsConnected>true</vcloud:IsConnected>
- <vcloud:MACAddress>00:50:56:01:06:82</vcloud:MACAddress>
- <vcloud:IpAddressAllocationMode>POOL</vcloud:IpAddressAllocationMode>
- </vcloud:NetworkConnection>
- </vcloud:NetworkConnectionSection>
- <vcloud:GuestCustomizationSection ovf:required="false">
- <ovf:Info>Specifies Guest OS Customization Settings</ovf:Info>
- <vcloud:Enabled>true</vcloud:Enabled>
- <vcloud:ChangeSid>false</vcloud:ChangeSid>
- <vcloud:JoinDomainEnabled>false</vcloud:JoinDomainEnabled>
- <vcloud:UseOrgSettings>false</vcloud:UseOrgSettings>
- <vcloud:AdminPasswordEnabled>false</vcloud:AdminPasswordEnabled>
- <vcloud:AdminPasswordAuto>true</vcloud:AdminPasswordAuto>
- <vcloud:ResetPasswordRequired>false</vcloud:ResetPasswordRequired>
- <vcloud:ComputerName>centos-web</vcloud:ComputerName>
- </vcloud:GuestCustomizationSection>
- </ovf:VirtualSystem>
- </ovf:VirtualSystemCollection>
-</ovf:Envelope>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/ovf-ubuntu64.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/ovf-ubuntu64.xml b/apis/vcloud/src/test/resources/ovf-ubuntu64.xml
deleted file mode 100644
index 7679573..0000000
--- a/apis/vcloud/src/test/resources/ovf-ubuntu64.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ovf:Envelope xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns:vcloud="http://www.vmware.com/vcloud/v1" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns: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 https://zone.myvcloud.com/api/v1.0/schema/master.xsd">
- <ovf:References/>
- <ovf:NetworkSection>
- <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>
- <vcloud:NetworkConfigSection ovf:required="false">
- <ovf:Info>The configuration parameters for logical networks</ovf:Info>
- <vcloud:NetworkConfig networkName="none">
- <vcloud:Description>This is a special place-holder used for disconnected network interfaces.</vcloud:Description>
- <vcloud:Configuration>
- <vcloud:IpScope>
- <vcloud:IsInherited>false</vcloud:IsInherited>
- <vcloud:Gateway>196.254.254.254</vcloud:Gateway>
- <vcloud:Netmask>255.255.0.0</vcloud:Netmask>
- <vcloud:Dns1>196.254.254.254</vcloud:Dns1>
- </vcloud:IpScope>
- <vcloud:FenceMode>isolated</vcloud:FenceMode>
- </vcloud:Configuration>
- <vcloud:IsDeployed>false</vcloud:IsDeployed>
- </vcloud:NetworkConfig>
- </vcloud:NetworkConfigSection>
- <vcloud:LeaseSettingsSection ovf:required="false">
- <ovf:Info>Lease settings section</ovf:Info>
- <vcloud:DeploymentLeaseInSeconds>0</vcloud:DeploymentLeaseInSeconds>
- <vcloud:StorageLeaseInSeconds>5184000</vcloud:StorageLeaseInSeconds>
- <vcloud:StorageLeaseExpiration>2012-03-12T17:40:44.491-06:00</vcloud:StorageLeaseExpiration>
- </vcloud:LeaseSettingsSection>
- <vcloud:CustomizationSection ovf:required="false">
- <ovf:Info>VApp template customization section</ovf:Info>
- <vcloud:CustomizeOnInstantiate>true</vcloud:CustomizeOnInstantiate>
- </vcloud:CustomizationSection>
- <ovf:VirtualSystem ovf:id="UbuntuServer-x64-2GB">
- <ovf:Info>A virtual machine: </ovf:Info>
- <ovf:Name>UbuntuServer-x64-2GB</ovf:Name>
- <ovf:OperatingSystemSection xmlns:vmw="http://www.vmware.com/schema/ovf" ovf:id="94" vmw:osType="ubuntu64Guest">
- <ovf:Info>Specifies the operating system installed</ovf:Info>
- <ovf:Description>Ubuntu Linux (64-bit)</ovf:Description>
- </ovf:OperatingSystemSection>
- <ovf:VirtualHardwareSection>
- <ovf:Info>Virtual hardware requirements</ovf:Info>
- <ovf:System>
- <vssd:ElementName>Virtual Hardware Family</vssd:ElementName>
- <vssd:InstanceID>0</vssd:InstanceID>
- <vssd:VirtualSystemIdentifier>UbuntuServer-x64-2GB</vssd:VirtualSystemIdentifier>
- <vssd:VirtualSystemType>vmx-07</vssd:VirtualSystemType>
- </ovf:System>
- <ovf:Item>
- <rasd:Address>00:50:56:01:02:9f</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="2048" 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>3000</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>
- <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>
- </ovf:Item>
- <ovf:Item>
- <rasd:AllocationUnits>byte * 2^20</rasd:AllocationUnits>
- <rasd:Description>Memory Size</rasd:Description>
- <rasd:ElementName>256 MB of memory</rasd:ElementName>
- <rasd:InstanceID>5</rasd:InstanceID>
- <rasd:Reservation>0</rasd:Reservation>
- <rasd:ResourceType>4</rasd:ResourceType>
- <rasd:VirtualQuantity>256</rasd:VirtualQuantity>
- <rasd:Weight>0</rasd:Weight>
- </ovf:Item>
- </ovf:VirtualHardwareSection>
- <vcloud:NetworkConnectionSection ovf:required="false">
- <ovf:Info>Specifies the available VM network connections</ovf:Info>
- <vcloud:PrimaryNetworkConnectionIndex>0</vcloud:PrimaryNetworkConnectionIndex>
- <vcloud:NetworkConnection network="none">
- <vcloud:NetworkConnectionIndex>0</vcloud:NetworkConnectionIndex>
- <vcloud:IsConnected>false</vcloud:IsConnected>
- <vcloud:MACAddress>00:50:56:01:02:9f</vcloud:MACAddress>
- <vcloud:IpAddressAllocationMode>NONE</vcloud:IpAddressAllocationMode>
- </vcloud:NetworkConnection>
- </vcloud:NetworkConnectionSection>
- <vcloud:GuestCustomizationSection ovf:required="false">
- <ovf:Info>Specifies Guest OS Customization Settings</ovf:Info>
- <vcloud:Enabled>true</vcloud:Enabled>
- <vcloud:ChangeSid>false</vcloud:ChangeSid>
- <vcloud:JoinDomainEnabled>false</vcloud:JoinDomainEnabled>
- <vcloud:UseOrgSettings>false</vcloud:UseOrgSettings>
- <vcloud:AdminPasswordEnabled>true</vcloud:AdminPasswordEnabled>
- <vcloud:AdminPasswordAuto>true</vcloud:AdminPasswordAuto>
- <vcloud:ResetPasswordRequired>false</vcloud:ResetPasswordRequired>
- <vcloud:ComputerName>UbuntuServer</vcloud:ComputerName>
- </vcloud:GuestCustomizationSection>
- </ovf:VirtualSystem>
-</ovf:Envelope>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/task-1.0.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/task-1.0.xml b/apis/vcloud/src/test/resources/task-1.0.xml
deleted file mode 100644
index 20fde3f..0000000
--- a/apis/vcloud/src/test/resources/task-1.0.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/task-error.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/task-error.xml b/apis/vcloud/src/test/resources/task-error.xml
deleted file mode 100644
index 77147f8..0000000
--- a/apis/vcloud/src/test/resources/task-error.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Task href="http://10.150.4.49/api/v0.8/task/23" type="application/vnd.vmware.vcloud.task+xml"
- status="error" startTime="2009-12-07T19:05:02" endTime="2009-12-10T14:40:32">
- <Owner href="http://10.150.4.49/api/v0.8/org/1" type="application/vnd.vmware.vcloud.org+xml"
- name="APIOrg" />
- <Result href="http://10.150.4.49/api/v0.8/vapp/1" type="application/vnd.vmware.vcloud.vApp+xml"
- name="testapp1" />
- <Error message="Error processing job" majorErrorCode="500"
- minorErrorCode=" Error in runDailySummaries date used:2009-12-09 19:40:30.577326+00:00" />
-</Task>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/task-hosting.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/task-hosting.xml b/apis/vcloud/src/test/resources/task-hosting.xml
deleted file mode 100644
index f4af4a2..0000000
--- a/apis/vcloud/src/test/resources/task-hosting.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Task href="https://vcloud.safesecureweb.com/api/v0.8/task/97806" xmlns="http://www.vmware.com/vcloud/v0.8"
- xmlns:common="http://www.vmware.com/vcloud/common"
- xsi:schemaLocation="http://www.vmware.com/vcloud/v0.8/task
- https://vcloud.safesecureweb.com/ns/vcloud/task-1.0.xsd
- http://www.vmware.com/vcloud/common
- https://vcloud.safesecureweb.com/ns/vcloud/common-1.0.xsd"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- status="success" startTime="2010-01-14T20:04:51Z" endTime="2010-01-14T20:05:02Z" expiryTime="2010-01-15T20:05:02Z">
-
- <Owner href="https://vcloud.safesecureweb.com/api/v0.8/vapp/188849-96" type="application/vnd.vmware.vcloud.vApp+xml" name="188849-96" />
-</Task>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/task-self.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/task-self.xml b/apis/vcloud/src/test/resources/task-self.xml
deleted file mode 100644
index 4a17424..0000000
--- a/apis/vcloud/src/test/resources/task-self.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Task xmlns="http://www.vmware.com/vcloud/v0.8" xmlns:common="http://www/vmware.com/vcloud/common"
- xsi:schemaLocation="http://www/vmware.com/vcloud/task
- https://vcloud.safesecureweb.com/ns/vcloud/task-1.0.xsd
- http://www.vmware.com/vcloud/common
- https://vcloud.safesecureweb.com/ns/vcloud/common-1.0.xsd"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" status="queued">
- <Link rel="self"
- href="https://vcloud.safesecureweb.com/api/v0.8/task/d188849-78"
- type="application/vnd.vmware.vcloud.task+xml" />
-</Task>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/task-vcd15.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/task-vcd15.xml b/apis/vcloud/src/test/resources/task-vcd15.xml
deleted file mode 100644
index 452287d..0000000
--- a/apis/vcloud/src/test/resources/task-vcd15.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vcloud:Task xmlns:vcloud="http://www.vmware.com/vcloud/v1" status="running" startTime="2012-03-15T22:47:02.058-06:00" operation="Updating Virtual Machine UbuntuServer-x64-2GB(c9004a47-5e21-4cf1-860c-670d8965b24a)" expiryTime="2012-06-13T22:47:02.058-06:00" type="application/vnd.vmware.vcloud.task+xml" href="https://mycloud.greenhousedata.com/api/v1.0/task/77a33fd4-3401-423c-8167-6711fc51ee9a" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1 http://mycloud.greenhousedata.com/api/v1.0/schema/master.xsd">
- <vcloud:Link rel="task:cancel" href="https://mycloud.greenhousedata.com/api/v1.0/task/77a33fd4-3401-423c-8167-6711fc51ee9a/action/cancel"/>
- <vcloud:Owner type="application/vnd.vmware.vcloud.vm+xml" name="UbuntuServer-x64-2GB" href="https://mycloud.greenhousedata.com/api/v1.0/vApp/vm-c9004a47-5e21-4cf1-860c-670d8965b24a"/>
-</vcloud:Task>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/task.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/task.xml b/apis/vcloud/src/test/resources/task.xml
deleted file mode 100644
index bd0514e..0000000
--- a/apis/vcloud/src/test/resources/task.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Task href="https://services.vcloudexpress.terremark.com/api/v0.8/task/3299"
- 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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/taskslist-hosting.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/taskslist-hosting.xml b/apis/vcloud/src/test/resources/taskslist-hosting.xml
deleted file mode 100644
index 1511d13..0000000
--- a/apis/vcloud/src/test/resources/taskslist-hosting.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tasks xmlns="http://www.vmware.com/vcloud/tasks" xmlns:common="http://www.vmware.com/vcloud/v0.8"
- xmlns:task="http://www.vmware.com/vcloud/task"
- xsi:schemaLocation="http://www.vmware.com/vcloud/tasks
- https://vcloud.safesecureweb.com/ns/vcloud/tasks-1.0.xsd
- http://www.vmware.com/vcloud/v0.8
- https://vcloud.safesecureweb.com/ns/vcloud/common-1.0.xsd
- http://www.vmware.com/vcloud/task
- https://vcloud.safesecureweb.com/ns/vcloud/task-1.0.xsd"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <Link rel="self"
- href="https://vcloud.safesecureweb.com/api/v0.8/tasksList/188849"
- type="application/vnd.vmware.vcloud.tasksList+xml" />
-</tasks>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/taskslist.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/taskslist.xml b/apis/vcloud/src/test/resources/taskslist.xml
deleted file mode 100644
index fe0d8c1..0000000
--- a/apis/vcloud/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/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/template1.0-vcd15-multi-vm.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/template1.0-vcd15-multi-vm.xml b/apis/vcloud/src/test/resources/template1.0-vcd15-multi-vm.xml
deleted file mode 100644
index 46b3c83..0000000
--- a/apis/vcloud/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/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/template1.0-vcd15.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/template1.0-vcd15.xml b/apis/vcloud/src/test/resources/template1.0-vcd15.xml
deleted file mode 100644
index 35393ee..0000000
--- a/apis/vcloud/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/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/vAppTemplate-copying.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/vAppTemplate-copying.xml b/apis/vcloud/src/test/resources/vAppTemplate-copying.xml
deleted file mode 100644
index 8ffa7d7..0000000
--- a/apis/vcloud/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/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/vAppTemplate.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/vAppTemplate.xml b/apis/vcloud/src/test/resources/vAppTemplate.xml
deleted file mode 100644
index bb5fcaf..0000000
--- a/apis/vcloud/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/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/vAppTemplate1.0-vcd15_withNewlines.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/vAppTemplate1.0-vcd15_withNewlines.xml b/apis/vcloud/src/test/resources/vAppTemplate1.0-vcd15_withNewlines.xml
deleted file mode 100644
index 9f41d81..0000000
--- a/apis/vcloud/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