From 56af55f57fc566f0e6bb99c52ba8034c79e68131 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Mon, 8 Jun 2015 12:42:42 +0200 Subject: [PATCH] Small refactor to have a self-contained deploy action in vCenter --- src/vmm_mad/remotes/vcenter/vcenter_driver.rb | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb index 5c52d9b232..e86d9cde30 100644 --- a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb +++ b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb @@ -736,9 +736,12 @@ class VCenterVm 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 + xml = REXML::Document.new xml_text + + expected_cpu = xml.root.elements["//TEMPLATE/CPU"].text + expected_memory = xml.root.elements["//TEMPLATE/MEMORY"].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, @@ -1250,15 +1253,6 @@ 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 ########################################################################