From 41aabcd3cbead9d57907eb74192ecafbe649a973 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Fri, 23 Jul 2010 17:16:51 +0200 Subject: [PATCH] one_usage now does not use to_hash --- src/authm_mad/one_usage.rb | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/authm_mad/one_usage.rb b/src/authm_mad/one_usage.rb index b1af343d1f..159dc74de8 100644 --- a/src/authm_mad/one_usage.rb +++ b/src/authm_mad/one_usage.rb @@ -43,13 +43,9 @@ class OneUsage def update_user(user) @users[user]=Hash.new if !@users[user] - STDERR.puts Time.now.to_i - vmpool=OpenNebula::VirtualMachinePool.new(@client, user) vmpool.info - STDERR.puts Time.now.to_i - one_ids=vmpool.map {|vm| vm.id } vms=@users[user] user_ids=vms.keys @@ -59,18 +55,13 @@ class OneUsage deleted_vms.each {|vmid| vms.delete(vmid) } - STDERR.puts Time.now.to_i - added_vms.each do |vmid| vm=OpenNebula::VirtualMachine.new( OpenNebula::VirtualMachine.build_xml(vmid), @client) - STDERR.puts vm.info.inspect - STDERR.puts vm.inspect - STDERR.puts vm.to_hash.inspect - hash=vm.to_hash['VM']['TEMPLATE'] + vm.info - STDERR.puts hash.inspect - usage=VmUsage.new(hash['CPU'].to_f, hash['MEMORY'].to_i) + usage=VmUsage.new(vm['TEMPLATE/CPU'].to_f, + vm['TEMPLATE/MEMORY'].to_i) vms[vmid.to_i]=usage end