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

Merge branch 'feature-1540-2'

Browse Source
This commit is contained in:
Tino Vazquez 2019-01-31 10:47:22 +01:00
commit 26204d11dc
No known key found for this signature in database
GPG Key ID: 2FE9C32E94AEABBE
3 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tm_mad/vcenter/mv
View File

@ -50,7 +50,7 @@ begin
if src_ds == dsid
VCenterDriver::VirtualMachine.migrate_routine(vmid, host_orig, host_dest)
else
VCenterDriver::VirtualMachine.migrate_routine(vmid, host_orig, host_dest, dsid)
VCenterDriver::VirtualMachine.migrate_routine(vmid, host_orig, host_dest, false, dsid)
end
rescue StandardError => e

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

@ -2435,6 +2435,16 @@ class VirtualMachine < VCenterDriver::Template
datastore: datastore,
}
if config[:esx_migration_list].is_a?(String)
if config[:esx_migration_list]==""
relocate_spec_params[:host] = config[:cluster].host.sample
elsif config[:esx_migration_list]!="Selected_by_DRS"
hosts = config[:esx_migration_list].split(' ')
relocate_spec_params[:host] = hosts.sample
end
end
relocate_spec = RbVmomi::VIM.VirtualMachineRelocateSpec(relocate_spec_params)
@item.RelocateVM_Task(spec: relocate_spec, priority: "defaultPriority").wait_for_completion
else
@ -2888,7 +2898,13 @@ class VirtualMachine < VCenterDriver::Template
return one_vm
end
def self.migrate_routine(vm_id, src_host, dst_host, ds = nil)
# Migrate a VM to another cluster and/or datastore
# @params [int] vm_id ID of the VM to be migrated
# params [String] src_host Name of the source cluster
# params [String] dst_host Name of the target cluster
# params [Bool] hot_ds Wether this is a DS migration with the VM running or not
# params [int] Destination datastore ID
def self.migrate_routine(vm_id, src_host, dst_host, hot_ds = false, ds = nil)
one_client = OpenNebula::Client.new
pool = OpenNebula::HostPool.new(one_client)
pool.info
@ -2913,6 +2929,8 @@ class VirtualMachine < VCenterDriver::Template
vm.info
dst_host.info
esx_migration_list = dst_host['/HOST/TEMPLATE/ESX_MIGRATION_LIST']
# required vcenter objects
vc_vm = VCenterDriver::VirtualMachine.new_without_id(vi_client, vm['/VM/DEPLOY_ID'])
ccr_ref = dst_host['/HOST/TEMPLATE/VCENTER_CCR_REF']
@ -2921,6 +2939,12 @@ class VirtualMachine < VCenterDriver::Template
config = { :cluster => vc_host }
config[:datastore] = datastore if datastore
if hot_ds
config[:esx_migration_list] = esx_migration_list if esx_migration_list
else
config[:esx_migration_list] = "Selected_by_DRS"
end
vc_vm.migrate(config)
vm.replace({ 'VCENTER_CCR_REF' => ccr_ref})

17
src/vmm_mad/remotes/vcenter/migrate
View File

@ -32,12 +32,21 @@ require 'vcenter_driver'
vm_id = ARGV[-2]
src_host = ARGV[-3]
dst_host = ARGV[-4]
dsid = ARGV[-5]
begin
# TODO: grab destination ds
VCenterDriver::VirtualMachine.migrate_routine(vm_id,
src_host,
dst_host)
one_client = OpenNebula::Client.new
vm = OpenNebula::VirtualMachine.new_with_id(vm_id, one_client)
vm.info
src_ds = vm.retrieve_elements("HISTORY_RECORDS/HISTORY/DS_ID")[-2]
if src_ds == dsid
VCenterDriver::VirtualMachine.migrate_routine(vm_id, src_host, dst_host)
else
VCenterDriver::VirtualMachine.migrate_routine(vm_id, src_host, dst_host, true, dsid)
end
rescue StandardError => e
message = "Cannot migrate for VM #{vm_id}"\
'failed due to '\