From c5b0932aca014e460c3532403f925c7cc7ceff75 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Thu, 15 Jul 2010 11:34:19 +0200 Subject: [PATCH] feature #203: bug fixes and debug messages --- src/authm_mad/one_usage.rb | 17 +++++++++++++++-- src/authm_mad/quota.rb | 4 ++-- src/authm_mad/simple_permissions.rb | 9 +++++++-- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/src/authm_mad/one_usage.rb b/src/authm_mad/one_usage.rb index 49c8ee9e28..b1af343d1f 100644 --- a/src/authm_mad/one_usage.rb +++ b/src/authm_mad/one_usage.rb @@ -43,9 +43,13 @@ 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 @@ -54,14 +58,23 @@ class OneUsage added_vms=one_ids-user_ids 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) - vm.info + STDERR.puts vm.info.inspect + STDERR.puts vm.inspect + STDERR.puts vm.to_hash.inspect hash=vm.to_hash['VM']['TEMPLATE'] + + STDERR.puts hash.inspect usage=VmUsage.new(hash['CPU'].to_f, hash['MEMORY'].to_i) vms[vmid.to_i]=usage end + + STDERR.puts Time.now.to_i end # Returns the cache of defined VMs for a user. It is a hash with @@ -79,7 +92,7 @@ class OneUsage @users[user].each do |id, vm| usage.cpu+=vm.cpu usage.memory+=vm.memory - end + end if @users[user] usage end diff --git a/src/authm_mad/quota.rb b/src/authm_mad/quota.rb index f1e7a02d1f..5e029c879c 100644 --- a/src/authm_mad/quota.rb +++ b/src/authm_mad/quota.rb @@ -92,8 +92,8 @@ class Quota usage=@usage.total(user) user_quota=get(user) if new_vm - usage.cpu+=new_vm.cpu - usage.memory+=new_vm.memory + usage.cpu+=new_vm.cpu.to_f + usage.memory+=new_vm.memory.to_i end STDERR.puts [user_quota, usage, new_vm].inspect diff --git a/src/authm_mad/simple_permissions.rb b/src/authm_mad/simple_permissions.rb index 62f418b51b..e35ee74f03 100644 --- a/src/authm_mad/simple_permissions.rb +++ b/src/authm_mad/simple_permissions.rb @@ -14,15 +14,19 @@ class SimplePermissions def get_vm_usage(data) vm_xml=Base64::decode64(data) - vm=OpenNebula::VirtualMachine.new(vm_xml) + vm=OpenNebula::VirtualMachine.new( + OpenNebula::XMLUtilsElement.initialize_xml(vm_xml, 'VM'), + OpenNebula::Client.new) vm_hash=vm.to_hash # Should set more sensible defaults or get driver configuration cpu=vm_hash['TEMPLATE']['CPU'] cpu||=1.0 + cpu=cpu.to_f memory=vm_hash['TEMPLATE']['MEMORY'] memory||=64 + memory=memory.to_f VmUsage.new(cpu, memory) end @@ -58,7 +62,8 @@ class SimplePermissions case action when 'CREATE' STDERR.puts "create vm" - if @quota.check(uid, get_vm_usage(id)) + #@quota.update(uid.to_i) + if @quota.check(uid.to_i, get_vm_usage(id)) return true else return "Quota exceeded"