From 85f7b1568c8538ba22a5207c57aa1a5654bae139 Mon Sep 17 00:00:00 2001 From: Nick Osborn Date: Thu, 5 Sep 2013 11:07:58 +0100 Subject: [PATCH 1/2] [vcloud_director] Allow for multiple Orgs. --- lib/fog/vcloud_director/models/compute/organizations.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/fog/vcloud_director/models/compute/organizations.rb b/lib/fog/vcloud_director/models/compute/organizations.rb index 79ee2ed2c..dbb1728b1 100644 --- a/lib/fog/vcloud_director/models/compute/organizations.rb +++ b/lib/fog/vcloud_director/models/compute/organizations.rb @@ -20,12 +20,12 @@ module Fog def item_list data = service.get_organizations.body - org = data[:Org] # there is only a single Org - service.add_id_from_href!(org) - [org] + orgs = data[:Org].is_a?(Array) ? data[:Org] : [data[:Org]] + orgs.each {|org| service.add_id_from_href!(org)} + orgs end end end end -end \ No newline at end of file +end From a47f11a7ec1f89c6c3874205cc46866d800d6774 Mon Sep 17 00:00:00 2001 From: Nick Osborn Date: Thu, 12 Sep 2013 09:46:42 +0100 Subject: [PATCH 2/2] [vcloud_director] Allow for multiple Orgs, rephrased. --- lib/fog/vcloud_director/models/compute/organizations.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/vcloud_director/models/compute/organizations.rb b/lib/fog/vcloud_director/models/compute/organizations.rb index dbb1728b1..cfe20dfcf 100644 --- a/lib/fog/vcloud_director/models/compute/organizations.rb +++ b/lib/fog/vcloud_director/models/compute/organizations.rb @@ -20,7 +20,7 @@ module Fog def item_list data = service.get_organizations.body - orgs = data[:Org].is_a?(Array) ? data[:Org] : [data[:Org]] + orgs = data[:Org].is_a?(Hash) ? [data[:Org]] : data[:Org] orgs.each {|org| service.add_id_from_href!(org)} orgs end