diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/host.rb b/src/vmm_mad/remotes/lib/vcenter_driver/host.rb index 55b588ba71..4429199223 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/host.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/host.rb @@ -712,7 +712,7 @@ module VCenterDriver # Only take care of VMs, not templates if !hashed_properties['config.template'] - vms[r.obj._ref + "_" + vc_uuid] = hashed_properties + vms[r.obj._ref + '_' + vc_uuid] = hashed_properties vm_objects << r.obj end end diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/vi_helper.rb b/src/vmm_mad/remotes/lib/vcenter_driver/vi_helper.rb index a8d74659dd..a406e26c64 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/vi_helper.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/vi_helper.rb @@ -117,15 +117,15 @@ module VCenterDriver return_if_error(rc, item, exit_if_fail) end - + # Since https://github.com/OpenNebula/one/issues/5689 # there two deploy_ids allowed: # * moref, eg: vm-567 - # * moref +"_" + vcenter uuid, eg: - # 2499952a-6c85-480e-b7df-4cbd2137eb69_vm-456 + # * moref +"_" + vcenter uuid, eg: + # 2499952a-6c85-480e-b7df-4cbd2137eb69_vm-456 # This function will always return the moref def self.get_deploy_id(deploy_id) - return deploy_id.split("_")[0] + deploy_id.split('_')[0] end def self.find_by_name(the_class, name, pool = nil, raise_if_fail = true) diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/vmm_importer.rb b/src/vmm_mad/remotes/lib/vcenter_driver/vmm_importer.rb index 95850babb1..4e234ffb72 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/vmm_importer.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/vmm_importer.rb @@ -47,7 +47,7 @@ module VCenterDriver vm = selected[:one_item] || build template = selected[:template] || import_tmplt template = "DEPLOY_ID = #{vm_ref}\n" + template - host_id = selected[:host] || @list.keys[0] + host_id = selected[:host] || @list.keys[0] vc_uuid = @vi_client.vim.serviceContent.about.instanceUuid vc_name = @vi_client.vim.host diff --git a/src/vmm_mad/remotes/vcenter/deploy b/src/vmm_mad/remotes/vcenter/deploy index cfe0ca4250..0aa093a39d 100644 --- a/src/vmm_mad/remotes/vcenter/deploy +++ b/src/vmm_mad/remotes/vcenter/deploy @@ -133,7 +133,7 @@ begin vm.poweron(set_running) end - puts vm['_ref'] + "_" + vc_uuid + puts vm['_ref'] + '_' + vc_uuid rescue StandardError => e message = "Deploy of VM #{vm_id} on vCenter cluster #{cluster_name} " \ "with #{dfile} failed due to \"#{e.message}\"" \