shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-25 02:50:08 +03:00
Code Releases Wiki Activity

F #4913: Fix ccr and rp may not exist in vi_client connection options

Browse Source
This commit is contained in:
mcabrerizo 2017-04-02 19:34:54 +02:00
parent fc41d302f7
commit ad51adc060
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/vmm_mad/remotes/lib/vcenter_driver/vi_client.rb
View File

@ -11,16 +11,20 @@ class VIClient
opts = {:insecure => true}.merge(opts)
@vim = RbVmomi::VIM.connect(opts)
# Get ccr
# Get ccr and get rp
ccr_ref = opts.delete(:ccr)
ccr = RbVmomi::VIM::ClusterComputeResource.new(@vim, ccr_ref)
if ccr_ref
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
#Get ref for rp
if ccr
rp = opts.delete(:rp)
if 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
end
end
@ -32,7 +36,7 @@ class VIClient
current_rp = ""
if rp.nil?
if !rp
rp = ccr.resourcePool
else
if !parent_prefix.empty?