fog 1.1.0 → 1.2.0

data/tests/vcloud/data/api_+_vApp_+_vm-2

@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Vm xmlns="http://www.vmware.com/vcloud/v1.5" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:vmext="http://www.vmware.com/vcloud/extension/v1.5" needsCustomization="false" deployed="true" status="8" name="vm2" id="urn:vcloud:vm:1" type="application/vnd.vmware.vcloud.vm+xml" href="https://vcloud.example.com/api/vApp/vm-2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/extension/v1.5 http://vcloud.example.com/api/v1.5/schema/vmwextensions.xsd 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://www.vmware.com/vcloud/v1.5 http://vcloud.example.com/api/v1.5/schema/master.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">
+    <VCloudExtension required="false">
+        <vmext:VimObjectRef>
+            <vmext:VimServerRef type="application/vnd.vmware.admin.vmwvirtualcenter+xml" name="vm2.example.com" href="https://vcloud.example.com/api/v1.0/admin/extension/vimServer/2"/>
+            <vmext:MoRef>vm-595</vmext:MoRef>
+            <vmext:VimObjectType>VIRTUAL_MACHINE</vmext:VimObjectType>
+        </vmext:VimObjectRef>
+    </VCloudExtension>
+    <Link rel="power:powerOn" href="https://vcloud.example.com/api/v1.0/vApp/vm-2/power/action/powerOn"/>
+    <Link rel="power:powerOff" href="https://vcloud.example.com/api/v1.0/vApp/vm-2/power/action/powerOff"/>
+    <Link rel="undeploy" type="application/vnd.vmware.vcloud.undeployVAppParams+xml" href="https://vcloud.example.com/api/v1.0/vApp/vm-2/action/undeploy"/>
+    <Link rel="up" type="application/vnd.vmware.vcloud.vApp+xml" href="https://vcloud.example.com/api/v1.0/vApp/vapp-1"/>
+    <Link rel="edit" type="application/vnd.vmware.vcloud.vm+xml" href="https://vcloud.example.com/api/v1.0/vApp/vm-2"/>
+    <Link rel="screen:thumbnail" href="https://vcloud.example.com/api/v1.0/vApp/vm-2/screen"/>
+    <Link rel="media:insertMedia" type="application/vnd.vmware.vcloud.mediaInsertOrEjectParams+xml" href="https://vcloud.example.com/api/v1.0/vApp/vm-2/media/action/insertMedia"/>
+    <Link rel="media:ejectMedia" type="application/vnd.vmware.vcloud.mediaInsertOrEjectParams+xml" href="https://vcloud.example.com/api/v1.0/vApp/vm-2/media/action/ejectMedia"/>
+    <Description>Some VM Description</Description>
+    <ovf:VirtualHardwareSection xmlns:vcloud="http://www.vmware.com/vcloud/v1" vcloud:href="https://vcloud.example.com/api/v1.0/vApp/vm-2/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>vm2</vssd:VirtualSystemIdentifier>
+            <vssd:VirtualSystemType>vmx-07</vssd:VirtualSystemType>
+        </ovf:System>
+        <ovf:Item>
+            <rasd:Address>00:50:56:01:02:03</rasd:Address>
+            <rasd:AddressOnParent>0</rasd:AddressOnParent>
+            <rasd:AutomaticAllocation>true</rasd:AutomaticAllocation>
+            <rasd:Connection vcloud:ipAddress="192.168.2.102" vcloud:primaryNetworkConnection="true" vcloud:ipAddressingMode="POOL">Network1</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="1600" 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:AddressOnParent>1</rasd:AddressOnParent>
+            <rasd:Description>Hard disk</rasd:Description>
+            <rasd:ElementName>Hard disk 2</rasd:ElementName>
+            <rasd:HostResource vcloud:capacity="1600" vcloud:busType="6" vcloud:busSubType="lsilogicsas"/>
+            <rasd:InstanceID>3000</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 vcloud:href="https://vcloud.example.com/api/v1.0/vApp/vm-2/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://vcloud.example.com/api/v1.0/vApp/vm-2/virtualHardwareSection/cpu"/>
+        </ovf:Item>
+        <ovf:Item vcloud:href="https://vcloud.example.com/api/v1.0/vApp/vm-2/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://vcloud.example.com/api/v1.0/vApp/vm-2/virtualHardwareSection/memory"/>
+        </ovf:Item>
+        <Link rel="edit" type="application/vnd.vmware.vcloud.virtualHardwareSection+xml" href="https://vcloud.example.com/api/v1.0/vApp/vm-2/virtualHardwareSection/"/>
+        <Link rel="down" type="application/vnd.vmware.vcloud.rasdItem+xml" href="https://vcloud.example.com/api/v1.0/vApp/vm-2/virtualHardwareSection/cpu"/>
+        <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItem+xml" href="https://vcloud.example.com/api/v1.0/vApp/vm-2/virtualHardwareSection/cpu"/>
+        <Link rel="down" type="application/vnd.vmware.vcloud.rasdItem+xml" href="https://vcloud.example.com/api/v1.0/vApp/vm-2/virtualHardwareSection/memory"/>
+        <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItem+xml" href="https://vcloud.example.com/api/v1.0/vApp/vm-2/virtualHardwareSection/memory"/>
+        <Link rel="down" type="application/vnd.vmware.vcloud.rasdItemsList+xml" href="https://vcloud.example.com/api/v1.0/vApp/vm-2/virtualHardwareSection/disks"/>
+        <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItemsList+xml" href="https://vcloud.example.com/api/v1.0/vApp/vm-2/virtualHardwareSection/disks"/>
+        <Link rel="down" type="application/vnd.vmware.vcloud.rasdItemsList+xml" href="https://vcloud.example.com/api/v1.0/vApp/vm-2/virtualHardwareSection/media"/>
+        <Link rel="down" type="application/vnd.vmware.vcloud.rasdItemsList+xml" href="https://vcloud.example.com/api/v1.0/vApp/vm-2/virtualHardwareSection/networkCards"/>
+        <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItemsList+xml" href="https://vcloud.example.com/api/v1.0/vApp/vm-2/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://vcloud.example.com/api/v1.0/vApp/vm-2/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://vcloud.example.com/api/v1.0/vApp/vm-2/operatingSystemSection/"/>
+    </ovf:OperatingSystemSection>
+    <NetworkConnectionSection type="application/vnd.vmware.vcloud.networkConnectionSection+xml" href="https://vcloud.example.com/api/v1.0/vApp/vm-2/networkConnectionSection/" ovf:required="false">
+        <ovf:Info>Specifies the available VM network connections</ovf:Info>
+        <PrimaryNetworkConnectionIndex>0</PrimaryNetworkConnectionIndex>
+        <NetworkConnection network="Network1">
+            <NetworkConnectionIndex>0</NetworkConnectionIndex>
+            <IpAddress>192.168.2.102</IpAddress>
+            <ExternalIpAddress>192.168.1.103</ExternalIpAddress>
+            <IsConnected>true</IsConnected>
+            <MACAddress>00:50:56:01:02:03</MACAddress>
+            <IpAddressAllocationMode>POOL</IpAddressAllocationMode>
+        </NetworkConnection>
+        <NetworkConnection network="Network2">
+            <NetworkConnectionIndex>1</NetworkConnectionIndex>
+            <IpAddress>192.168.3.102</IpAddress>
+            <IsConnected>true</IsConnected>
+            <MACAddress>00:50:56:01:02:04</MACAddress>
+            <IpAddressAllocationMode>POOL</IpAddressAllocationMode>
+        </NetworkConnection>
+        <Link rel="edit" type="application/vnd.vmware.vcloud.networkConnectionSection+xml" href="https://vcloud.example.com/api/v1.0/vApp/vm-2/networkConnectionSection/"/>
+    </NetworkConnectionSection>
+    <GuestCustomizationSection type="application/vnd.vmware.vcloud.guestCustomizationSection+xml" href="https://vcloud.example.com/api/v1.0/vApp/vm-2/guestCustomizationSection/" ovf:required="false">
+        <ovf:Info>Specifies Guest OS Customization Settings</ovf:Info>
+        <Enabled>true</Enabled>
+        <ChangeSid>false</ChangeSid>
+        <VirtualMachineId>2</VirtualMachineId>
+        <JoinDomainEnabled>false</JoinDomainEnabled>
+        <UseOrgSettings>false</UseOrgSettings>
+        <AdminPasswordEnabled>true</AdminPasswordEnabled>
+        <AdminPasswordAuto>true</AdminPasswordAuto>
+        <AdminPassword>password</AdminPassword>
+        <ResetPasswordRequired>false</ResetPasswordRequired>
+        <CustomizationScript/>
+        <ComputerName>vm2</ComputerName>
+        <Link rel="edit" type="application/vnd.vmware.vcloud.guestCustomizationSection+xml" href="https://vcloud.example.com/api/v1.0/vApp/vm-2/guestCustomizationSection/"/>
+    </GuestCustomizationSection>
+    <VAppScopedLocalId>vmware_RHEL5-U5-64-small_v02</VAppScopedLocalId>
+</Vm>

data/tests/vcloud/data/api_+_vdc_+_1

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Vdc xmlns="http://www.vmware.com/vcloud/v1.5" xmlns:vmext="http://www.vmware.com/vcloud/extension/v1.5" status="1" name="vDC1" id="urn:vcloud:vdc:1" type="application/vnd.vmware.vcloud.vdc+xml" href="https://vcloud.example.com/api/vdc/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/extension/v1.5 http://vcloud.example.com/api/v1.5/schema/vmwextensions.xsd http://www.vmware.com/vcloud/v1.5 http://vcloud.example.com/api/v1.5/schema/master.xsd">
+    <VCloudExtension required="false">
+        <vmext:VimObjectRef>
+            <vmext:VimServerRef type="application/vnd.vmware.admin.vmwvirtualcenter+xml" name="host.example.com" href="https://vcloud.example.com/api/admin/extension/vimServer/1"/>
+            <vmext:MoRef>resgroup-1</vmext:MoRef>
+            <vmext:VimObjectType>RESOURCE_POOL</vmext:VimObjectType>
+        </vmext:VimObjectRef>
+    </VCloudExtension>
+    <Link rel="up" type="application/vnd.vmware.vcloud.org+xml" href="https://vcloud.example.com/api/org/1"/>
+    <Link rel="add" type="application/vnd.vmware.vcloud.uploadVAppTemplateParams+xml" href="https://vcloud.example.com/api/vdc/1/action/uploadVAppTemplate"/>
+    <Link rel="add" type="application/vnd.vmware.vcloud.media+xml" href="https://vcloud.example.com/api/vdc/1/media"/>
+    <Link rel="add" type="application/vnd.vmware.vcloud.instantiateVAppTemplateParams+xml" href="https://vcloud.example.com/api/vdc/1/action/instantiateVAppTemplate"/>
+    <Link rel="add" type="application/vnd.vmware.vcloud.cloneVAppParams+xml" href="https://vcloud.example.com/api/vdc/1/action/cloneVApp"/>
+    <Link rel="add" type="application/vnd.vmware.vcloud.cloneVAppTemplateParams+xml" href="https://vcloud.example.com/api/vdc/1/action/cloneVAppTemplate"/>
+    <Link rel="add" type="application/vnd.vmware.vcloud.cloneMediaParams+xml" href="https://vcloud.example.com/api/vdc/1/action/cloneMedia"/>
+    <Link rel="add" type="application/vnd.vmware.vcloud.captureVAppParams+xml" href="https://vcloud.example.com/api/vdc/1/action/captureVApp"/>
+    <Link rel="add" type="application/vnd.vmware.vcloud.composeVAppParams+xml" href="https://vcloud.example.com/api/vdc/1/action/composeVApp"/>
+    <Link rel="move" type="application/vnd.vmware.vcloud.moveMediaParams+xml" href="https://vcloud.example.com/api/vdc/1/action/moveMedia"/>
+    <Link rel="move" type="application/vnd.vmware.vcloud.moveVAppParams+xml" href="https://vcloud.example.com/api/vdc/1/action/moveVApp"/>
+    <Link rel="move" type="application/vnd.vmware.vcloud.moveVAppTemplateParams+xml" href="https://vcloud.example.com/api/vdc/1/action/moveVAppTemplate"/>
+    <Description>Some Description</Description>
+    <AllocationModel>AllocationVApp</AllocationModel>
+    <StorageCapacity>
+        <Units>MB</Units>
+        <Allocated>10240</Allocated>
+        <Limit>102400</Limit>
+        <Used>101650</Used>
+        <Overhead>0</Overhead>
+    </StorageCapacity>
+    <ComputeCapacity>
+        <Cpu>
+            <Units>MHz</Units>
+            <Allocated>20000</Allocated>
+            <Limit>40000</Limit>
+            <Used>2000</Used>
+            <Overhead>0</Overhead>
+        </Cpu>
+        <Memory>
+            <Units>MB</Units>
+            <Allocated>1024</Allocated>
+            <Limit>10240</Limit>
+            <Used>8385</Used>
+            <Overhead>0</Overhead>
+        </Memory>
+    </ComputeCapacity>
+    <ResourceEntities>
+        <ResourceEntity type="application/vnd.vmware.vcloud.vApp+xml" name="vApp_1" href="https://vcloud.example.com/api/vApp/vapp-1"/>
+        <ResourceEntity type="application/vnd.vmware.vcloud.vApp+xml" name="vApp_2" href="https://vcloud.example.com/api/vApp/vapp-2"/>
+        <ResourceEntity type="application/vnd.vmware.vcloud.media+xml" name="media1" href="https://vcloud.example.com/api/media/1"/>
+        <ResourceEntity type="application/vnd.vmware.vcloud.media+xml" name="media2" href="https://vcloud.example.com/api/media/2"/>
+    </ResourceEntities>
+    <AvailableNetworks>
+        <Network type="application/vnd.vmware.vcloud.network+xml" name="network1" href="https://vcloud.example.com/api/network/1"/>
+        <Network type="application/vnd.vmware.vcloud.network+xml" name="network2" href="https://vcloud.example.com/api/network/2"/>
+    </AvailableNetworks>
+    <NicQuota>10</NicQuota>
+    <NetworkQuota>10</NetworkQuota>
+    <VmQuota>10</VmQuota>
+    <IsEnabled>true</IsEnabled>
+</Vdc>

data/tests/vcloud/models/compute/conn_helper.rb

@@ -0,0 +1,20 @@
+module Fog
+  module Vcloud
+    if false
+      class Fog::Connection
+        def request(params, &block)
+          path = File.expand_path(File.join(File.dirname(__FILE__),'..','..','data',params[:path].gsub(/^\//,'').gsub('/','_+_')))
+          if File.exists?(path)
+            body = File.read(path)
+          else
+            ''
+          end
+          Excon::Response.new(
+            :body   => body,
+            :status => 200,
+            :header => '')
+        end
+      end
+    end
+  end
+end

data/tests/vcloud/models/compute/network_tests.rb

@@ -0,0 +1,67 @@
+require 'fog/vcloud/models/compute/networks'
+
+Shindo.tests("Vcloud::Compute | network", ['vcloud']) do
+
+  Fog::Vcloud::Compute::SUPPORTED_VERSIONS.each do |version|
+    tests("api version #{version}") do
+      pending if Fog.mocking?
+
+      connection = Fog::Vcloud::Compute.new(
+        :vcloud_host => 'vcloud.example.com',
+        :vcloud_username => 'username',
+        :vcloud_password => 'password',
+        :vcloud_version => version
+      )
+      tests("an org network") do
+        instance = connection.get_network("https://vcloud.example.com/api#{version == '1.0' ? '/v1.0' : ''}/network/1")
+        instance.reload
+    
+        tests("#href").returns("https://vcloud.example.com/api#{version == '1.0' ? '/v1.0' : ''}/network/1") { instance.href }
+        tests("#name").returns("Network1") { instance.name }
+        tests("#description").returns("Some fancy Network") { instance.description }
+    
+        tests("configuration") do
+          tests("parent network").returns("ParentNetwork1") { instance.configuration[:ParentNetwork][:name]}
+          tests("dns").returns("172.0.0.2") { instance.configuration[:IpScope][:Dns1]}
+          
+          tests("#fence_mode").returns("natRouted") { instance.configuration[:FenceMode] }
+          
+          tests("features") do
+            tests("dhcp_service") do
+              tests("#is_enabled").returns("false") { instance.configuration[:Features][:DhcpService][:IsEnabled] }
+              tests("ip_range") do
+                tests("#start_address").returns("192.168.0.151") { instance.configuration[:Features][:DhcpService][:IpRange][:StartAddress] }
+              end
+            end
+            tests("firewall_server") do
+              tests("is_enabled").returns("true"){ instance.configuration[:Features][:FirewallService][:IsEnabled] }
+            end
+            tests("nat_service") do
+              tests("is_enabled").returns("false"){ instance.configuration[:Features][:NatService][:IsEnabled] }
+            end
+          end
+        end
+        
+        tests("#parent_network") do
+          tests("returned network name").returns("ParentNetwork1"){ p = instance.parent_network; p.name }
+        end
+      end
+    
+      tests("an external network") do
+        instance = connection.get_network("https://vcloud.example.com/api#{version == '1.0' ? '/v1.0' : ''}/admin/network/2")
+        instance.reload
+        tests("#href").returns("https://vcloud.example.com/api#{version == '1.0' ? '/v1.0' : ''}/admin/network/2") { instance.href }
+        tests("#name").returns("ParentNetwork1") { instance.name }
+        tests("#description").returns("Internet Connection") { instance.description }
+        tests("#provider_info").returns("NETWORK:dvportgroup-230 on com.vmware.vcloud.entity.vimserver:35935555") { instance.provider_info }
+    
+        tests("configuration") do
+          tests("dns").returns("172.0.0.2") { instance.configuration[:IpScope][:Dns1]}
+          tests("allocated addresses").returns("172.0.0.144") { instance.configuration[:IpScope][:AllocatedIpAddresses][:IpAddress].first }
+        end
+    
+        tests("#parent_network").returns(nil){ instance.parent_network }
+      end
+    end
+  end
+end

data/tests/vcloud/models/compute/networks_tests.rb

@@ -0,0 +1,61 @@
+require 'fog/vcloud/models/compute/networks'
+
+Shindo.tests("Vcloud::Compute | networks", ['vcloud']) do
+
+  Fog::Vcloud::Compute::SUPPORTED_VERSIONS.each do |version|
+    tests("api version #{version}") do
+      pending if Fog.mocking?
+
+      tests("from an org perspective") do
+        instance = Fog::Vcloud::Compute::Networks.new(
+          :connection => Fog::Vcloud::Compute.new(
+            :vcloud_host => 'vcloud.example.com',
+            :vcloud_username => 'username',
+            :vcloud_password => 'password',
+            :vcloud_version => version
+            ),
+          :href       =>  "https://vcloud.example.com/api#{version == '1.0' ? '/v1.0' : ''}/org/1"
+        )
+    
+        tests("collection") do
+          returns(2) { instance.size }
+          returns("https://vcloud.example.com/api#{version == '1.0' ? '/v1.0' : ''}/network/1") { instance.first.href }
+        end
+      end
+    
+      tests("from a vdc perspective") do
+        instance = Fog::Vcloud::Compute::Networks.new(
+          :connection => Fog::Vcloud::Compute.new(
+            :vcloud_host => 'vcloud.example.com',
+            :vcloud_username => 'username',
+            :vcloud_password => 'password',
+            :vcloud_version => version
+            ),
+          :href       =>  "https://vcloud.example.com/api#{version == '1.0' ? '/v1.0' : ''}/vdc/1"
+        )
+    
+        tests("collection") do
+          returns(2) { instance.size }
+          returns("https://vcloud.example.com/api#{version == '1.0' ? '/v1.0' : ''}/network/1") { instance.first.href }
+        end
+      end
+    
+      tests("from a vapp perspective") do
+        instance = Fog::Vcloud::Compute::Networks.new(
+          :connection => Fog::Vcloud::Compute.new(
+            :vcloud_host => 'vcloud.example.com',
+            :vcloud_username => 'username',
+            :vcloud_password => 'password',
+            :vcloud_version => version
+            ),
+          :href       =>  "https://vcloud.example.com/api#{version == '1.0' ? '/v1.0' : ''}/vApp/vapp-1"
+        )
+    
+        tests("collection") do
+          returns(1) { instance.size }
+          returns("https://vcloud.example.com/api#{version == '1.0' ? '/v1.0' : ''}/network/1") { instance.first.href }
+        end
+      end
+    end
+  end
+end

data/tests/vcloud/models/compute/organization_tests.rb

@@ -0,0 +1,20 @@
+Shindo.tests("Vcloud::Compute | organization", ['vcloud']) do
+
+  Fog::Vcloud::Compute::SUPPORTED_VERSIONS.each do |version|
+    tests("api version #{version}") do
+      pending if Fog.mocking?
+      instance = Fog::Vcloud::Compute.new(
+        :vcloud_host => 'vcloud.example.com',
+        :vcloud_username => 'username',
+        :vcloud_password => 'password',
+        :vcloud_version => version
+      ).get_organization("https://vcloud.example.com/api#{(version == '1.0') ? '/v1.0' : ''}/org/1")
+      instance.reload
+    
+      tests("#href").returns("https://vcloud.example.com/api#{(version == '1.0') ? '/v1.0' : ''}/org/1"){ instance.href }
+      tests("#name").returns('Org1'){ instance.name }
+      tests("#full_name").returns('My Full Name'){ instance.full_name }
+      tests("#description").returns("Some fancy\n\nDescription"){ instance.description }
+    end
+  end
+end

data/tests/vcloud/models/compute/organizations_tests.rb

@@ -0,0 +1,16 @@
+require 'fog/vcloud/models/compute/organizations'
+
+Shindo.tests("Vcloud::Compute | organizations", ['vcloud']) do
+
+  Fog::Vcloud::Compute::SUPPORTED_VERSIONS.each do |version|
+    tests("api version #{version}") do
+      pending if Fog.mocking?
+      instance = Fog::Vcloud::Compute.new(:vcloud_host => 'vcloud.example.com', :vcloud_username => 'username', :vcloud_password => 'password', :vcloud_version => version).organizations
+    
+      tests("collection") do
+        returns(2) { instance.size }
+        returns("https://vcloud.example.com/api#{(version == '1.0') ? '/v1.0' : ''}/org/1") { instance.first.href }
+      end
+    end
+  end
+end

data/tests/vcloud/models/compute/server_tests.rb

@@ -0,0 +1,142 @@
+require 'fog/vcloud/models/compute/servers'
+
+Shindo.tests("Vcloud::Compute | server", ['vcloud']) do
+
+  Fog::Vcloud::Compute::SUPPORTED_VERSIONS.each do |version|
+    tests("api version #{version}") do
+      pending if Fog.mocking?
+      instance = Fog::Vcloud::Compute.new(
+        :vcloud_host => 'vcloud.example.com',
+        :vcloud_username => 'username',
+        :vcloud_password => 'password',
+        :vcloud_version => version
+      ).get_server("https://vcloud.example.com/api#{(version == '1.0') ? '/v1.0' : ''}/vApp/vm-2")
+    
+      instance.reload
+    
+      tests("#href").returns("https://vcloud.example.com/api#{(version == '1.0') ? '/v1.0' : ''}/vApp/vm-2") { instance.href }
+      tests("#name").returns("vm2") { instance.name }
+      tests("#vapp").returns("vApp1") { instance.vapp.name }
+      tests("#description").returns("Some VM Description") { instance.description }
+      tests("#status").returns('8') { instance.status }
+      tests("#deployed").returns(true) { instance.deployed }
+    
+      tests("#os_desc").returns("Red Hat Enterprise Linux 5 (64-bit)") { instance.os_desc }
+      tests("#os_type").returns("rhel5_64Guest") { instance.os_type }
+      tests("#computer_name").returns("vm2") { instance.computer_name }
+    
+      tests("cpu count").returns(1) { instance.cpus[:count] }
+    
+      tests("amount of memory").returns(512){ instance.memory[:amount] }
+    
+      tests("#disks") do
+        tests("#size").returns(2){ instance.disks.size }
+        tests("#number").returns(0){ instance.disks.first[:number] }
+        tests("#size").returns(1600){ instance.disks.first[:size] }
+        tests("#ElementName").returns("Hard disk 1"){ instance.disks.first[:disk_data][:'rasd:ElementName'] }
+        tests("#InstanceID").returns("2000"){ instance.disks.first[:disk_data][:'rasd:InstanceID'] }
+      end
+    
+      tests("#vapp_scoped_local_id").returns("vmware_RHEL5-U5-64-small_v02") { instance.vapp_scoped_local_id }
+    
+      tests("#friendly_status").returns('off') { instance.friendly_status }
+      tests("#on?").returns(false) { instance.on? }
+      tests("#off?").returns(true) { instance.off? }
+    
+      tests("#network_connections") do
+        tests("#size").returns(2) { instance.network_connections.size }
+      end
+    end
+  end
+  #old tests
+  tests("#server.new('#{Vcloud::Compute::TestSupport::template}')").returns(true) do
+    pending if Fog.mocking?
+    @svr = Vcloud.servers.create :catalog_item_uri => Vcloud::Compute::TestSupport::template, :name => 'fog_test_run', :password => 'password'
+    print "Waiting for server to be ready"
+    @svr.wait_for(1200) { print '.' ; ready? }
+    puts ""
+    @svr.ready?
+  end
+
+  tests("#svr.power_on()").returns(true) do
+    pending if Fog.mocking?
+    @svr.power_on
+    @svr.wait_for { on? }
+    @svr.wait_for { ready? }
+    @svr.on?
+  end
+
+  tests("#svr.description(\"testing\")").returns("testing") do
+    pending if Fog.mocking?
+    @svr.wait_for { ready? }
+    @svr.description = "testing"
+    @svr.save
+    @svr.wait_for { ready? }
+    @svr.description
+  end
+
+  # Power off only stops the OS, doesn't free up resources. #undeploy is for this.
+  tests("#svr.undeploy()").returns(true) do
+    pending if Fog.mocking?
+    @svr.undeploy
+    @svr.wait_for { off? }
+    @svr.wait_for { ready? }
+    @svr.off?
+  end
+
+  tests("#svr.memory(384)").returns(384) do
+    pending if Fog.mocking?
+    raise 'Server template memory already 384m - change to something different' if @svr.memory[:amount] == 384
+    @svr.wait_for { ready? }
+    @svr.memory = 384
+    @svr.save
+    @svr.wait_for { ready? }
+    # Can take a little while for the VM to know it has different ram, and not tied to a task..
+    (1..20).each do |i|
+      break if @svr.reload.memory[:amount] == '384'
+      sleep 1
+    end
+    @svr.reload.memory[:amount]
+  end
+
+  tests("#svr.add_disk(4096)").returns([2, "4096"]) do
+    pending if Fog.mocking?
+    raise 'Server template already has two disks' if @svr.disks.size == 2
+    @svr.wait_for { ready? }
+    @svr.add_disk(4096)
+    @svr.save
+    @svr.wait_for { ready? }
+    # Can take a little while for the VM to know it has different ram, and not tied to a task..
+    (1..20).each do |i|
+      break if @svr.reload.disks.size == 2
+      sleep 1
+    end
+    [
+     @svr.disks.size,
+     @svr.disks[1][:resource][:vcloud_capacity]
+    ]
+  end
+
+  tests("#svr.delete_disk(1)").returns(1) do
+    pending if Fog.mocking?
+    raise "Server doesn't have two disks - did previous step fail? " if @svr.disks.size != 2
+    @svr.wait_for { ready? }
+    sleep 5 # otherwise complains about being busy
+    @svr.delete_disk 1
+    @svr.save
+    @svr.wait_for { ready? }
+    # Can take a little while for the VM to know it has different ram, and not tied to a task..
+    (1..20).each do |i|
+      break if @svr.reload.disks.size == 1
+      sleep 1
+    end
+    @svr.disks.size
+  end
+
+  tests("#svr.destroy").raises(Excon::Errors::Forbidden) do
+    pending if Fog.mocking?
+    @svr.destroy
+    sleep 5 # allow cleanup..
+    Vcloud.servers.get(@svr.href) == nil
+  end
+end