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

B #2526: improvement in vCenter VM monitoring

Browse Source 
Do not fail if VM does not have DS associated
This commit is contained in:
Tino Vazquez 2018-10-22 19:22:19 +02:00 committed by Ruben S. Montero
parent 2e8ed7896c
commit 57dd5f1254
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -509,8 +509,9 @@ class ClusterComputeResource
str_info << "POLL=\"#{vm.info.gsub('"', "\\\"")}\"]"
rescue Exception => e
STDERR.puts e.inspect
STDERR.puts e.backtrace
tmp_str = e.inspect
tmp_str << e.backtrace.join("\n")
str_info << "ERROR=\"#{Base64.encode64(tmp_str).gsub("\n","")}\"]"
end
end

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

@ -806,12 +806,13 @@ class Template
@state = 'POWEROFF' if @state == 'd'
str << "IMPORT_STATE =\"#{@state}\"\n"
# Get DS information
if !@vm_info["datastore"].last._ref.nil?
# Get DS information
if !@vm_info["datastore"].nil?
!@vm_info["datastore"].last.nil? &&
!@vm_info["datastore"].last._ref.nil?
str << "VCENTER_DS_REF = \"#{@vm_info["datastore"].last._ref}\"\n"
end
vnc_port = nil
keymap = VCenterDriver::VIHelper.get_default("VM/TEMPLATE/GRAPHICS/KEYMAP")