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

[vcloud|compute] fix an issue if this is not parsed as an array

Browse source
This commit is contained in:
Peter Meier 2011-10-31 17:51:45 +01:00
parent d4a1fa3a1e
commit 6a627c3532
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/fog/vcloud/models/compute/networks.rb
View file

@ -20,7 +20,8 @@ module Fog
data = [connection.get_vdc(self.href).body[:AvailableNetworks][:Network]].flatten.compact
elsif self.href =~ /\/org\//
check_href!("Org")
data = connection.get_organization(self.href).body[:Link].select{|l| l[:type] == 'application/vnd.vmware.vcloud.network+xml' }
links = (l=connection.get_organization(self.href).body[:Link]).is_a?(Array) ? l : [l].compact
data = links.select{|l| l[:type] == 'application/vnd.vmware.vcloud.network+xml' }
elsif self.href =~ /\/vApp\//
check_href!("Vapp")
data = [(connection.get_vapp(self.href).body[:NetworkConfigSection]||{})[:NetworkConfig]].flatten.compact.collect{|n| n[:Configuration][:ParentNetwork] unless n[:Configuration].nil? }.compact

3
lib/fog/vcloud/models/compute/vapps.rb
View file

@ -13,7 +13,8 @@ module Fog
attribute :href
def all
data = connection.get_vdc(self.href).body[:ResourceEntities][:ResourceEntity].select { |re| re[:type] == "application/vnd.vmware.vcloud.vApp+xml" }
resource_entities = (re=connection.get_vdc(self.href).body[:ResourceEntities][:ResourceEntity]).is_a?(Array) ? re : [re].compact
data = resource_entities.select { |re| re[:type] == "application/vnd.vmware.vcloud.vApp+xml" }
load(data)
end

3
lib/fog/vcloud/models/compute/vdcs.rb
View file

@ -13,7 +13,8 @@ module Fog
attribute :href
def all
data = connection.get_organization(org_uri).body[:Link].select { |link| link[:type] == "application/vnd.vmware.vcloud.vdc+xml" }
links = (l=connection.get_organization(org_uri).body[:Link]).is_a?(Array) ? l : [l].compact
data = links.select { |link| link[:type] == "application/vnd.vmware.vcloud.vdc+xml" }
data.each { |link| link.delete_if { |key, value| [:rel].include?(key) } }
load(data)
end