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

L #~: linting vcenter driver, folder merge (#664)

Browse Source 
Signed-off-by: Carlos Herrera <cherrera@opennebula.io>
This commit is contained in:
Carlos J. Herrera 2021-01-18 12:53:22 -05:00 committed by GitHub
parent b579de801c
commit c67652ac04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb
View File

@ -519,10 +519,9 @@ module VCenterDriver
# or create it if not exist
def find_or_create_folder(folder_root, name)
folder_root.childEntity.each do |child|
if child.instance_of? RbVmomi::VIM::Folder
if child.name == name
return child
end
if child.instance_of?(RbVmomi::VIM::Folder) &&
child.name == name
return child
end
end
@ -577,7 +576,7 @@ module VCenterDriver
if vcenter_vm_folder_object.nil?
begin
vcenter_vm_folder_list = vcenter_vm_folder.split("/")
vcenter_vm_folder_list = vcenter_vm_folder.split('/')
folder_root = dc.item.vmFolder
vcenter_vm_folder_list.each do |folder_name|
@ -588,10 +587,12 @@ module VCenterDriver
end
rescue StandardError => e
error_message = e.message
if VCenterDriver::CONFIG[:debug_information]
error_message += " " + e.backtrace
end
raise "Cannot create Folder in vCenter: #{error_message}"
if VCenterDriver::CONFIG[:debug_information]
error_message += ' ' + e.backtrace
end
raise 'Cannot create Folder in vCenter: '\
"#{error_message}"
end
end
end