1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00

[vcloud|compute] improve disk info access

Some infos were missing and other couldn't be looked up that way.
This commit is contained in:
Peter Meier 2011-10-17 17:44:44 +02:00
parent 750fb59f25
commit 9b7339156b
2 changed files with 4 additions and 2 deletions

View file

@ -113,7 +113,7 @@ module Fog
def disks
disk_mess.map do |dm|
{ :number => dm[:"rasd:AddressOnParent"].to_i, :size => dm[:"rasd:HostResource"][:vcloud_capacity].to_i, :resource => dm[:"rasd:HostResource"] }
{ :number => dm[:"rasd:AddressOnParent"].to_i, :size => dm[:"rasd:HostResource"][:vcloud_capacity].to_i, :resource => dm[:"rasd:HostResource"], :disk_data => dm }
end
end

View file

@ -26,8 +26,10 @@ Shindo.tests("Vcloud::Compute | server", ['vcloud']) do
tests("#disks") do
tests("#size").returns(2){ instance.disks.size }
tests("#size").returns(0){ instance.disks.first[:number] }
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 }