From 2d05f1f2eaeb0f16899ef69392bd19ce39d0af77 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Mon, 17 Nov 2014 15:31:07 +0100 Subject: [PATCH] Solve recursion problem in vCenter driver for hierarchy function (cherry picked from commit ab35b92babe0383fd193866171f75084a1e07f31) --- src/vmm_mad/remotes/vcenter/vcenter_driver.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb index 624869d938..85584b6230 100644 --- a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb +++ b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb @@ -156,11 +156,10 @@ class VIClient def hierarchy vc_hosts = {} - @root.childEntity.each { |dc| - - ccrs = dc.hostFolder.childEntity.grep( - RbVmomi::VIM::ClusterComputeResource) + datacenters = get_entities(@root, 'Datacenter') + datacenters.each { |dc| + ccrs = get_entities(dc.hostFolder, 'ClusterComputeResource') vc_hosts[dc.name] = ccrs.collect { |c| c.name } }