From 42259dc87d22beac498c82bad0dda9b136990e82 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Thu, 19 Mar 2015 17:56:41 +0100 Subject: [PATCH] Backlog #3691: Check if running VM in vCenter has VNC open port and set GRAPHICS section with right port (cherry picked from commit 21bee73dc3c54a319c5a7c996a1179fb8799bb3a) --- src/vmm_mad/remotes/vcenter/vcenter_driver.rb | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb index b051e10053..9660c7328f 100644 --- a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb +++ b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb @@ -181,7 +181,7 @@ class VIClient false end end - end + end ######################################################################## # Builds a hash with the DataCenter / ClusterComputeResource hierarchy @@ -1066,6 +1066,16 @@ class VCenterVm "IMPORT_VM_ID = \"#{@vm.config.uuid}\"\n"\ "SCHED_REQUIREMENTS=\"NAME=\\\"#{@vm.runtime.host.parent.name}\\\"\"\n" + vp=@vm.config.extraConfig.select{|v| v[:key]=="remotedisplay.vnc.port"} + + if vp.size > 0 + str << "GRAPHICS = [\n"\ + " TYPE =\"vnc\",\n"\ + " LISTEN =\"0.0.0.0\",\n"\ + " PORT =\"#{vp[0][:value]}\"\n"\ + "]\n" + end + if @vm.config.annotation.nil? || @vm.config.annotation.empty? str << "DESCRIPTION = \"vCenter Virtual Machine imported by OpenNebula"\ " from Cluster #{@vm.runtime.host.parent.name}\"\n"