From 945c0b5bef8e07cbd858ee231be460af5ac4dd01 Mon Sep 17 00:00:00 2001
From: Tino Vazquez <tinova@opennebula.org>
Date: Thu, 14 May 2015 19:36:52 +0200
Subject: [PATCH] Feature #3723: Add support for keymap in vCenter

---
 .../public/js/plugins/templates-tab.js        |  2 +-
 src/vmm_mad/remotes/vcenter/vcenter_driver.rb | 37 +++++++++++++------
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js
index 6b9a0cb99b..d49806a618 100644
--- a/src/sunstone/public/js/plugins/templates-tab.js
+++ b/src/sunstone/public/js/plugins/templates-tab.js
@@ -503,7 +503,7 @@ if (Config.isTemplateCreationTabEnabled('input_output')){
           '</label>'+
           '<input type="text" id="PORT" name="port" />'+
         '</div>'+
-        '<div class="large-6 columns hypervisor only_kvm only_vmware only_xen">'+
+        '<div class="large-6 columns">'+
           '<label for="KEYMAP">'+tr("Keymap")+
             '<span class="tip">'+tr("Keyboard configuration locale to use in the VNC/SPICE display")+'</span>'+
           '</label>'+
diff --git a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb
index aaba592cb3..6c4b4c8359 100644
--- a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb
+++ b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb
@@ -538,7 +538,8 @@ class VCenterHost < ::OpenNebula::Host
 
     ############################################################################
     # Generate an OpenNebula monitor string for this host. Reference:
-    # https://www.vmware.com/support/developer/vc-sdk/visdk25pubs/ReferenceGuide/vim.ComputeResource.Summary.html
+    # https://www.vmware.com/support/developer/vc-sdk/visdk25pubs/Reference
+    # Guide/vim.ComputeResource.Summary.html
     #   - effectiveCpu: Effective CPU resources (in MHz) available to run
     #     VMs. This is the aggregated from all running hosts excluding hosts in
     #     maintenance mode or unresponsive are not counted.
@@ -1058,6 +1059,8 @@ class VCenterVm
     #
     ########################################################################
     def vm_to_one
+        host_name = @vm.runtime.host.parent.name
+
         str = "NAME   = \"#{@vm.name}\"\n"\
               "CPU    = \"#{@vm.config.hardware.numCPU}\"\n"\
               "vCPU   = \"#{@vm.config.hardware.numCPU}\"\n"\
@@ -1068,21 +1071,25 @@ class VCenterVm
               "  VM_TEMPLATE =\"#{@vm.config.uuid}\"\n"\
               "]\n"\
               "IMPORT_VM_ID    = \"#{@vm.config.uuid}\"\n"\
-              "SCHED_REQUIREMENTS=\"NAME=\\\"#{@vm.runtime.host.parent.name}\\\"\"\n"
+              "SCHED_REQUIREMENTS=\"NAME=\\\"#{host_name}\\\"\"\n"
 
-        vp=@vm.config.extraConfig.select{|v| v[:key]=="remotedisplay.vnc.port"}
+        vp     = @vm.config.extraConfig.select{|v|
+                                           v[:key]=="remotedisplay.vnc.port"}
+        keymap = @vm.config.extraConfig.select{|v| 
+                                           v[:key]=="remotedisplay.vnc.keymap"}
 
         if vp.size > 0
             str << "GRAPHICS = [\n"\
                    "  TYPE     =\"vnc\",\n"\
                    "  LISTEN   =\"0.0.0.0\",\n"\
-                   "  PORT     =\"#{vp[0][:value]}\"\n"\
-                   "]\n"
+                   "  PORT     =\"#{vp[0][:value]}\"\n"
+            str << "  KEYMAP   =\"#{keymap[0][:value]}\"\n" if keymap[0]
+            str << "]\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"
+            str << "DESCRIPTION = \"vCenter Virtual Machine imported by"\
+                " OpenNebula from Cluster #{@vm.runtime.host.parent.name}\"\n"
         else
             notes = @vm.config.annotation.gsub("\\", "\\\\").gsub("\"", "\\\"")
             str << "DESCRIPTION = \"#{notes}\"\n"
@@ -1257,8 +1264,11 @@ private
 
         vm_uuid = vm.config.uuid
 
+        # VNC Section
+
         vnc_port   = xml.root.elements["/VM/TEMPLATE/GRAPHICS/PORT"]
         vnc_listen = xml.root.elements["/VM/TEMPLATE/GRAPHICS/LISTEN"]
+        vnc_keymap = xml.root.elements["/VM/TEMPLATE/GRAPHICS/KEYMAP"]
 
         if !vnc_listen
             vnc_listen = "0.0.0.0"
@@ -1271,11 +1281,16 @@ private
 
         if vnc_port
             config_array +=
-                     [{:key=>"remotedisplay.vnc.enabled", :value=>"TRUE"},
-                      {:key=>"remotedisplay.vnc.port", :value=>vnc_port.text},
-                      {:key=>"remotedisplay.vnc.ip",   :value=>vnc_listen}]
+                     [{:key=>"remotedisplay.vnc.enabled",:value=>"TRUE"},
+                      {:key=>"remotedisplay.vnc.port",   :value=>vnc_port.text},
+                      {:key=>"remotedisplay.vnc.ip",     :value=>vnc_listen}]
         end
 
+        config_array += [{:key=>"remotedisplay.vnc.keymap",
+                          :value=>vnc_keymap.text}] if vnc_keymap
+
+        # Context section
+
         if context
             # Remove <CONTEXT> (9) and </CONTEXT>\n (11)
             context_text = "# Context variables generated by OpenNebula\n"
@@ -1293,7 +1308,7 @@ private
             context_vnc_spec = {:extraConfig =>config_array}
         end
 
-        # Take care of the NIC section, build the reconfig hash
+        # NIC section, build the reconfig hash
         nics     = xml.root.get_elements("//TEMPLATE/NIC")
         nic_spec = {}