1
0
mirror of https://github.com/OpenNebula/one.git synced 2025-02-03 13:47:01 +03:00

feature #203: configuration loading and debug

This commit is contained in:
Javi Fontan 2010-07-13 18:20:04 +02:00
parent 213029ad26
commit dace9afa07
2 changed files with 19 additions and 1 deletions

View File

@ -30,16 +30,29 @@ $: << RUBY_LIB_LOCATION
require 'pp'
require 'rubygems'
require 'OpenNebulaDriver'
require 'simple_auth'
require 'simple_permissions'
require 'yaml'
require 'sequel'
class AuthorizationManager < OpenNebulaDriver
def initialize
super(1, false)
config_data=File.read(ETC_LOCATION+'/auth/auth.conf')
STDERR.puts(config_data)
@config=YAML::load(config_data)
STDERR.puts @config.inspect
database_url=@config[:database]
@db=Sequel.connect(database_url)
@authenticate=SimpleAuth.new
@permissions=SimplePermissions.new
@permissions=SimplePermissions.new(@db, OpenNebula::Client.new,
@config)
register_action(:AUTHENTICATE, method('action_authenticate'))
register_action(:AUTHORIZE, method('action_authorize'))

View File

@ -36,6 +36,9 @@ class Quota
}
}.merge(conf)
STDERR.puts conf.inspect
STDERR.puts @conf.inspect
@defaults=@conf[:defaults]
@usage=OneUsage.new(@client)
@ -93,6 +96,8 @@ class Quota
usage.memory+=new_vm.memory
end
STDERR.puts [user_quota, usage, new_vm].inspect
(!user_quota[:cpu] || usage.cpu<=user_quota[:cpu]) &&
(!user_quota[:memory] || usage.memory<=user_quota[:memory])
end