From 3045b38356c99ac776d7239d6a4038ce3bf3b8cd Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Wed, 7 Oct 2015 18:02:41 +0200 Subject: [PATCH] bug: vCPU in vcenter follows OpenNebula convention --- src/vmm_mad/remotes/vcenter/vcenter_driver.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb index d24250d68a..96a76b48bc 100644 --- a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb +++ b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb @@ -798,7 +798,7 @@ class VCenterVm # Find out if we need to reconfigure capacity xml = REXML::Document.new xml_text - expected_cpu = xml.root.elements["//TEMPLATE/VCPU"].text rescue xml.root.elements["//TEMPLATE/CPU"].text.to_f.ceil rescue 1 + expected_cpu = xml.root.elements["//TEMPLATE/VCPU"] ? xml.root.elements["//TEMPLATE/CPU"].text : 1 expected_memory = xml.root.elements["//TEMPLATE/MEMORY"].text current_cpu = vm.config.hardware.numCPU current_memory = vm.config.hardware.memoryMB @@ -1512,7 +1512,7 @@ private # Capacity section - cpu = xml.root.elements["//TEMPLATE/VCPU"].text rescue xml.root.elements["//TEMPLATE/CPU"].text.to_f.ceil rescue 1 + cpu = xml.root.elements["//TEMPLATE/VCPU"] ? xml.root.elements["//TEMPLATE/CPU"].text : 1 memory = xml.root.elements["//TEMPLATE/MEMORY"].text capacity_spec = {:numCPUs => cpu.to_i, :memoryMB => memory }