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

F #~: fix network import configurations (#1058)

Browse Source 
Signed-off-by: Carlos Herrera <cherrera@opennebula.io>
This commit is contained in:
Carlos J. Herrera 2021-04-05 06:28:48 -04:00 committed by GitHub
parent 8bae70ff9d
commit e1384b89c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/vmm_mad/remotes/lib/vcenter_driver/network.rb
View File

@ -486,7 +486,7 @@ module VCenterDriver
@defaults = { :size => '255', :type => 'ether' }
end
def process_import(indexes, opts = {}, &block)
def process_import(indexes, opts = {}, &_block)
indexes = indexes.gsub(/\s*\,\s*/, ',').strip.split(',')
dc_folder = VCenterDriver::DatacenterFolder.new(@vi_client)
@ -526,30 +526,20 @@ module VCenterDriver
"#{hpool.message}"
end
opts = {}
params = {}
params[:vc_network] = vc_cluster_network
params[:vcenter_instance_name] = vcenter_instance_name
params[:vcenter_uuid] = vcenter_uuid
params[:_hpool] = hpool
params[:one_host] = one_host
params[:args] = opts
params[:args] = {}
selected = dc_folder.process_network(params)
selected = selected[index]
if block_given?
@info[index][:opts] = block.call(selected)
elsif opts[index]
@info[index][:opts] = opts[index]
else
@info[index][:opts] = defaults
end
# import the object
@info[:success] << import(selected)
@info[:success] << import(selected, opts[index])
rescue StandardError => e
@info[:error] << { index => e.message }
@info[index][:e] = e
@ -645,8 +635,8 @@ module VCenterDriver
str
end
def import(selected)
opts = @info[selected[:ref]][:opts]
def import(selected, opts = nil)
opts = @info[selected[:ref]][:opts] if opts.nil?
net = VCenterDriver::Network
.new_from_ref(selected[:ref], @vi_client)