From f065251d92969240c2d09115692960253f3d3612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Font=C3=A1n=20Mui=C3=B1os?= <jfontan@fdi.ucm.es>
Date: Tue, 21 Jul 2009 17:50:33 +0000
Subject: [PATCH] Client class now exposes one_auth variable

git-svn-id: http://svn.opennebula.org/one/trunk@718 3034c82b-c49b-4eb3-8279-a7acafdc01c0
---
 src/client/ruby/lib/OpenNebula.rb |  2 ++
 src/oca/ec2/eco.rb                | 14 ++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/client/ruby/lib/OpenNebula.rb b/src/client/ruby/lib/OpenNebula.rb
index fdb33da45d..3569cf3d68 100644
--- a/src/client/ruby/lib/OpenNebula.rb
+++ b/src/client/ruby/lib/OpenNebula.rb
@@ -51,6 +51,8 @@ module OpenNebula
     # xml-rpc calls.
     # -------------------------------------------------------------------------
     class Client
+        attr_accessor :one_auth
+        
         begin
             require 'xmlparser'
             XMLPARSER=true
diff --git a/src/oca/ec2/eco.rb b/src/oca/ec2/eco.rb
index d0664c0da5..7e3879c5fd 100644
--- a/src/oca/ec2/eco.rb
+++ b/src/oca/ec2/eco.rb
@@ -91,7 +91,12 @@ end
 def get_one_client_user(user_name)
     user=get_user(user_name)
     
-    Client.new("#{user[:name]}:#{user[:password]}")
+    
+    auth="#{user[:name]}:#{user[:password]}"
+    
+    client=Client.new("dummy:dummy")
+    client.one_auth=auth
+    client
 end
 
 def get_user(name)
@@ -120,7 +125,6 @@ def render_state(vm)
 end
 
 def render_launch_time(vm)
-    pp vm[:stime]
     "<launchTime>#{Time.at(vm[:stime].to_i).xmlschema}</launchTime>"
 end
 
@@ -202,7 +206,9 @@ end
 def describe_instances(params)
     @user=get_user(params['AWSAccessKeyId'])
     
-    @vmpool=VirtualMachinePool.new(get_one_client_user(@user[:name]))
+    client=get_one_client_user(@user[:name])
+    
+    @vmpool=VirtualMachinePool.new(client)
     @vmpool.info
     
     pp @vmpool
@@ -298,7 +304,7 @@ __END__
       </groupSet> 
       <instancesSet> 
         <% @vmpool.each do |vm| %>
-        <% vm.info %>
+        <% vm.info ; pp vm ; puts 'hostia' %>
         <item> 
           <instanceId><%= vm.id %></instanceId> 
           <imageId><%= vm['TEMPLATE/IMAGE_ID'] %></imageId>