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

F #4302: Adapt vcenter driver to commit #3859 (#4730)

Browse Source 
Co-authored-by: mouyaq <amoya@opennebula.io>
This commit is contained in:
Angel Luis Moya Gonzalez 2020-05-14 12:49:05 +02:00 committed by GitHub
parent 49e62d5d98
commit 476ac338a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/im_mad/remotes/lib/vcenter.rb
View File

@ -469,7 +469,6 @@ class VcenterMonitor
"VCENTER_INSTANCE_ID =\"#{@vc_uuid}\"\n"\
"VCENTER_CCR_REF =\"#{@ccr_ref}\"\n"
str << "IMPORT_VM_ID =\"#{vm._ref}\"\n"
str << "DEPLOY_ID =\"#{vm._ref}\"\n"
@state = vm_state(vm.summary.runtime.powerState)
str << "IMPORT_STATE =\"#{@state}\"\n"

2
src/vmm_mad/remotes/lib/vcenter_driver/host.rb
View File

@ -699,7 +699,6 @@ class ClusterComputeResource
vm_info << "VM = [ ID=\"#{id}\", "
vm_info << "VM_NAME=\"#{vm_name}\", "
vm_info << "DEPLOY_ID=\"#{vm_ref}\", "
vm_info << "UUID=\"#{vm_ref + vc_uuid}\", "
# if the machine does not exist in opennebula it means that is a wild:
unless vm.one_exist?
@ -732,7 +731,6 @@ class ClusterComputeResource
error_info << "VM = [ ID=\"#{id}\", "
error_info << "VM_NAME=\"#{vm_name}\", "
error_info << "DEPLOY_ID=\"#{vm_ref}\", "
error_info << "UUID=\"#{vm_ref + vc_uuid}\", "
error_info << "ERROR=\"#{Base64.encode64(tmp_str).gsub("\n", '')}\"]\n"
end

2
src/vmm_mad/remotes/lib/vcenter_driver/vm_template.rb
View File

@ -962,7 +962,7 @@ class Template
"VCENTER_INSTANCE_ID =\"#{@vm_info[:vc_uuid]}\"\n"\
"VCENTER_CCR_REF =\"#{@vm_info[:cluster_ref]}\"\n"
str << "IMPORT_VM_ID =\"#{self["_ref"]}\"\n"
str << "DEPLOY_ID =\"#{self["_ref"]}\"\n"
@state = 'POWEROFF' if @state == 'd'
str << "IMPORT_STATE =\"#{@state}\"\n"