From fc41d302f776f253eddb7e5ec8b71849dfe63660 Mon Sep 17 00:00:00 2001 From: mcabrerizo Date: Fri, 31 Mar 2017 20:12:03 +0200 Subject: [PATCH] F #4913: Add vi_client resource pool confinement using host's VCENTER_RESOURCE_POOL --- .../remotes/lib/vcenter_driver/vi_client.rb | 49 +++++++++++++++++-- 1 file changed, 46 insertions(+), 3 deletions(-) diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/vi_client.rb b/src/vmm_mad/remotes/lib/vcenter_driver/vi_client.rb index c30d3bc5c3..dbe19abb21 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/vi_client.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/vi_client.rb @@ -7,17 +7,59 @@ class VIClient attr_accessor :rp def initialize(opts) + opts = {:insecure => true}.merge(opts) @vim = RbVmomi::VIM.connect(opts) - rp_ref = opts.delete(:rp) - @rp = RbVmomi::VIM::ResourcePool(@vim, rp_ref) if rp_ref + # Get ccr + ccr_ref = opts.delete(:ccr) + ccr = RbVmomi::VIM::ClusterComputeResource.new(@vim, ccr_ref) + + #Get ref for rp + if ccr + rp = opts.delete(:rp) + rp_list = get_resource_pool_list(ccr) + rp_ref = rp_list.select { |r| r[:name] == rp }.first._ref rescue nil + @rp = RbVmomi::VIM::ResourcePool(@vim, rp_ref) if rp_ref + end end def rp_confined? !!@rp end + def get_resource_pool_list(ccr, rp = nil, parent_prefix = "", rp_array = []) + + current_rp = "" + + if rp.nil? + rp = ccr.resourcePool + else + if !parent_prefix.empty? + current_rp << parent_prefix + current_rp << "/" + end + current_rp << rp.name + end + + if rp.resourcePool.size == 0 + rp_info = {} + rp_info[:name] = current_rp + rp_info[:ref] = rp._ref + rp_array << rp_info + else + rp.resourcePool.each do |child_rp| + get_resource_pool_list(ccr, child_rp, current_rp, rp_array) + end + rp_info = {} + rp_info[:name] = current_rp + rp_info[:ref] = rp._ref + rp_array << rp_info if !current_rp.empty? + end + + rp_array + end + def close_connection @vim.close end @@ -66,7 +108,8 @@ class VIClient connection = { :host => host["TEMPLATE/VCENTER_HOST"], :user => host["TEMPLATE/VCENTER_USER"], - :rp => host["TEMPLATE/VCENTER_RP_REF"], + :rp => host["TEMPLATE/VCENTER_RESOURCE_POOL"], + :ccr => host["TEMPLATE/VCENTER_CCR_REF"], :password => password }