From 94105537f4674591a531dec9b5b1538879fa51f5 Mon Sep 17 00:00:00 2001
From: Tino Vazquez <tinova@opennebula.org>
Date: Thu, 4 Jun 2015 18:46:33 +0200
Subject: [PATCH] Add capacity resizing and honoring capacity changes in VM
 templates in the VM drivers

(cherry picked from commit d2f7e7bb28468451f1b73ab1eb0c30a1b692a8f9)
---
 src/vmm_mad/remotes/vcenter/vcenter_driver.rb | 64 +++++++++++++------
 1 file changed, 44 insertions(+), 20 deletions(-)

diff --git a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb
index f16fb7bf54..5c52d9b232 100644
--- a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb
+++ b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb
@@ -734,6 +734,19 @@ class VCenterVm
             hid         = VIClient::translate_hostname(hostname)
             connection  = VIClient.new(hid)
             vm          = connection.find_vm_template(deploy_id)
+
+            # Find out if we need to reconfigure capacity
+            expected_cpu, expected_memory = get_cpu_and_memory(xml_text)
+            current_cpu    = vm.config.hardware.numCPU
+            current_memory = vm.config.hardware.memoryMB
+
+            if current_cpu != expected_cpu or current_memory != expected_memory
+                capacity_hash = {:numCPUs  => expected_cpu.to_i, 
+                                 :memoryMB => expected_memory }
+                spec = RbVmomi::VIM.VirtualMachineConfigSpec(capacity_hash)
+                vm.ReconfigVM_Task(:spec => spec).wait_for_completion
+            end
+
             vm.PowerOnVM_Task.wait_for_completion
             return vm.config.uuid
         end
@@ -1237,13 +1250,21 @@ private
                }
     end
 
+    def self.get_cpu_and_memory(xml_text)
+        xml = REXML::Document.new xml_text
+
+        cpu    = xml.root.elements["//TEMPLATE/CPU"].text
+        memory = xml.root.elements["//TEMPLATE/MEMORY"].text
+
+        return cpu, memory
+    end
+
     ########################################################################
     #  Clone a vCenter VM Template and leaves it powered on
     ########################################################################
     def self.clone_vm(xml_text)
 
         xml = REXML::Document.new xml_text
-
         pcs = xml.root.get_elements("//USER_TEMPLATE/PUBLIC_CLOUD")
 
         raise "Cannot find VCenter element in VM template." if pcs.nil?
@@ -1260,33 +1281,29 @@ private
         raise "Cannot find VM_TEMPLATE in VCenter element." if uuid.nil?
 
         uuid = uuid.text
-
         vmid = xml.root.elements["/VM/ID"].text
-
         hid = xml.root.elements["//HISTORY_RECORDS/HISTORY/HID"]
 
         raise "Cannot find host id in deployment file history." if hid.nil?
 
         context = xml.root.elements["//TEMPLATE/CONTEXT"]
-
         connection  = VIClient.new(hid)
-
         vc_template = connection.find_vm_template(uuid)
 
         relocate_spec = RbVmomi::VIM.VirtualMachineRelocateSpec(
-            :diskMoveType => :moveChildMostDiskBacking,
-            :pool         => connection.resource_pool)
+                          :diskMoveType => :moveChildMostDiskBacking,
+                          :pool         => connection.resource_pool)
 
         clone_spec = RbVmomi::VIM.VirtualMachineCloneSpec(
-            :location => relocate_spec,
-            :powerOn  => false,
-            :template => false)
+                      :location => relocate_spec,
+                      :powerOn  => false,
+                      :template => false)
 
         begin
             vm = vc_template.CloneVM_Task(
-                :folder => vc_template.parent,
-                :name   => "one-#{vmid}",
-                :spec   => clone_spec).wait_for_completion
+                   :folder => vc_template.parent,
+                   :name   => "one-#{vmid}",
+                   :spec   => clone_spec).wait_for_completion
         rescue Exception => e
 
             if !e.message.start_with?('DuplicateName')
@@ -1297,8 +1314,7 @@ private
 
             raise "Cannot clone VM Template" if vm.nil?
 
-            vm.Destroy_Task.wait_for_completion
-            
+            vm.Destroy_Task.wait_for_completion   
             vm = vc_template.CloneVM_Task(
                 :folder => vc_template.parent,
                 :name   => "one-#{vmid}",
@@ -1352,6 +1368,7 @@ private
         end
 
         # NIC section, build the reconfig hash
+
         nics     = xml.root.get_elements("//TEMPLATE/NIC")
         nic_spec = {}
 
@@ -1367,12 +1384,19 @@ private
             nic_spec = {:deviceChange => nic_array}
         end
 
-        if !context_vnc_spec.empty? or !nic_spec.empty?
-            spec_hash = context_vnc_spec.merge(nic_spec)
-            spec      = RbVmomi::VIM.VirtualMachineConfigSpec(spec_hash)
-            vm.ReconfigVM_Task(:spec => spec).wait_for_completion
-        end
+        # Capacity section
 
+        cpu           = xml.root.elements["//TEMPLATE/CPU"].text
+        memory        = xml.root.elements["//TEMPLATE/MEMORY"].text
+        capacity_spec = {:numCPUs  => cpu.to_i, 
+                         :memoryMB => memory }
+
+        # Perform the VM reconfiguration
+        spec_hash = context_vnc_spec.merge(nic_spec).merge(capacity_spec)
+        spec      = RbVmomi::VIM.VirtualMachineConfigSpec(spec_hash)
+        vm.ReconfigVM_Task(:spec => spec).wait_for_completion
+
+        # Power on the VM
         vm.PowerOnVM_Task.wait_for_completion
 
         return vm_uuid