From 9b7339156b313114e5bd98ba1945f7bab5c4b1ab Mon Sep 17 00:00:00 2001 From: Peter Meier Date: Mon, 17 Oct 2011 17:44:44 +0200 Subject: [PATCH] [vcloud|compute] improve disk info access Some infos were missing and other couldn't be looked up that way. --- lib/fog/vcloud/models/compute/server.rb | 2 +- tests/vcloud/models/compute/server_tests.rb | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/fog/vcloud/models/compute/server.rb b/lib/fog/vcloud/models/compute/server.rb index b9a93a3a7..a4d6e1770 100644 --- a/lib/fog/vcloud/models/compute/server.rb +++ b/lib/fog/vcloud/models/compute/server.rb @@ -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 diff --git a/tests/vcloud/models/compute/server_tests.rb b/tests/vcloud/models/compute/server_tests.rb index a6c4c955b..e8c6318b3 100644 --- a/tests/vcloud/models/compute/server_tests.rb +++ b/tests/vcloud/models/compute/server_tests.rb @@ -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 }