From fd1a050e088126147e7e8fd16d71e31925bb2372 Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Wed, 7 Oct 2015 18:03:07 +0200 Subject: [PATCH] Bug #4009: Importing vms from EC2 provides a wrong CPU value (cherry picked from commit 8023e2146e426b7ca373c74ac632c25988524aad) --- src/vmm_mad/remotes/ec2/ec2_driver.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/vmm_mad/remotes/ec2/ec2_driver.rb b/src/vmm_mad/remotes/ec2/ec2_driver.rb index 95e8119b2e..f62deea805 100755 --- a/src/vmm_mad/remotes/ec2/ec2_driver.rb +++ b/src/vmm_mad/remotes/ec2/ec2_driver.rb @@ -592,11 +592,13 @@ private def vm_to_one(instance) cpu, mem = instance_type_capacity(instance.instance_type) - mem = mem.to_i / 1024 # Memory for templates expressed in MB + cpu = cpu.to_f / 100 + vcpu = cpu.ceil + mem = mem.to_i / 1024 # Memory for templates expressed in MB str = "NAME = \"Instance from #{instance.id}\"\n"\ "CPU = \"#{cpu}\"\n"\ - "vCPU = \"#{cpu}\"\n"\ + "VCPU = \"#{vcpu}\"\n"\ "MEMORY = \"#{mem}\"\n"\ "HYPERVISOR = \"ec2\"\n"\ "PUBLIC_CLOUD = [\n"\