From dace9afa07742fc978bdce116cd11709c6ff3779 Mon Sep 17 00:00:00 2001
From: Javi Fontan <jfontan@fdi.ucm.es>
Date: Tue, 13 Jul 2010 18:20:04 +0200
Subject: [PATCH] feature #203: configuration loading and debug

---
 src/authm_mad/one_auth_mad.rb | 15 ++++++++++++++-
 src/authm_mad/quota.rb        |  5 +++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/authm_mad/one_auth_mad.rb b/src/authm_mad/one_auth_mad.rb
index a32bbf1c5d..eb4deefb5d 100755
--- a/src/authm_mad/one_auth_mad.rb
+++ b/src/authm_mad/one_auth_mad.rb
@@ -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'))
diff --git a/src/authm_mad/quota.rb b/src/authm_mad/quota.rb
index 23eb021e3e..f1e7a02d1f 100644
--- a/src/authm_mad/quota.rb
+++ b/src/authm_mad/quota.rb
@@ -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