From 3276069da2cbfeed8f88cedec5490e476007f513 Mon Sep 17 00:00:00 2001
From: Daniel Molina <danmolin@fdi.ucm.es>
Date: Wed, 21 Sep 2011 19:02:30 +0200
Subject: [PATCH] feature #795: Use yaml conf file in OCCI

---
 src/cloud/occi/lib/VirtualMachineOCCI.rb |  4 ++--
 src/cloud/occi/lib/occi-server.rb        | 30 ++++++++++++------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/cloud/occi/lib/VirtualMachineOCCI.rb b/src/cloud/occi/lib/VirtualMachineOCCI.rb
index 6d62bfe724..7ed361cc00 100755
--- a/src/cloud/occi/lib/VirtualMachineOCCI.rb
+++ b/src/cloud/occi/lib/VirtualMachineOCCI.rb
@@ -77,8 +77,8 @@ class VirtualMachineOCCI < VirtualMachine
         if @vm_info != nil
             itype = @vm_info['INSTANCE_TYPE']
             
-            if itype != nil and types[itype] != nil
-                @template = base + "/#{types[itype]['TEMPLATE']}"
+            if itype != nil and types[itype.to_sym] != nil
+                @template = base + "/#{types[itype.to_sym][:template]}"
             end
         end
         
diff --git a/src/cloud/occi/lib/occi-server.rb b/src/cloud/occi/lib/occi-server.rb
index 81950cc5ae..012dcb5912 100755
--- a/src/cloud/occi/lib/occi-server.rb
+++ b/src/cloud/occi/lib/occi-server.rb
@@ -45,34 +45,34 @@ require 'rubygems'
 require 'sinatra'
 
 require 'OCCIServer'
-require 'Configuration'
 
 include OpenNebula
 
+##############################################################################
+# Parse Configuration file
+##############################################################################
 begin
-    config = Configuration.new(CONFIGURATION_FILE)
-    config.add_configuration_value("TEMPLATE_LOCATION", TEMPLATE_LOCATION)
-
-    instance_types = CloudServer.get_instance_types(config)
-    config.add_configuration_value("INSTANCE_TYPES", instance_types)
-
-    CloudServer.print_configuration(config)
-
-    set :config, config
+    conf = YAML.load_file(CONFIGURATION_FILE)
 rescue Exception => e
-    puts "Error starting server: #{e}"
-    exit(-1)
+    puts "Error parsing config file #{CONFIGURATION_FILE}: #{e.message}"
+    exit 1
 end
 
+conf[:template_location] = TEMPLATE_LOCATION
+
+CloudServer.print_configuration(conf)
+
+##############################################################################
+# Sinatra Configuration
+##############################################################################
+set :config, conf
+
 if CloudServer.is_port_open?(settings.config[:server],
                              settings.config[:port])
     puts "Port busy, please shutdown the service or move occi server port."
     exit
 end
 
-##############################################################################
-# Sinatra Configuration
-##############################################################################
 set :host, settings.config[:server]
 set :port, settings.config[:port]