From c0c1e8df4fee974af887ab896c548377e85a8730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Constantino=20V=C3=A1zquez=20Blanco?= Date: Tue, 15 Jul 2008 10:14:02 +0000 Subject: [PATCH] Migrate reasons has been simplified, these are client changes accordingly. Completes ticket #24 git-svn-id: http://svn.opennebula.org/trunk@58 3034c82b-c49b-4eb3-8279-a7acafdc01c0 --- src/client/ruby/one.rb | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/client/ruby/one.rb b/src/client/ruby/one.rb index 822051fd92..26ce199294 100644 --- a/src/client/ruby/one.rb +++ b/src/client/ruby/one.rb @@ -58,8 +58,7 @@ module ONE HOST_STATE=%w{INIT MONITORING MONITORED ERROR DISABLED} - MIGRATE_REASON=%w{NONE ERROR STOP_RESUME PERFORMANCE USER RESCHEDULING - KILL} + MIGRATE_REASON=%w{NONE ERROR STOP_RESUME USER CANCEL} ################## @@ -68,10 +67,6 @@ module ONE # Server class. This is the one that makes xml-rpc calls. class Server - #def initialize(host="localhost", port=60666, path="/RPC2") - # @server=XMLRPC::Client.new(host, path, port) - #end - def initialize(endpoint=nil) if endpoint one_endpoint=endpoint @@ -121,7 +116,6 @@ module ONE order_clause=( options[:order] ? "order by #{options[:order]}" : "" ) sql="select * from #{table} #{where_clause} #{order_clause}" - #pp sql begin result=@db.execute(sql) rescue Exception => e @@ -224,10 +218,8 @@ module ONE "NONE" => "none", "ERROR" => "erro", "STOP_RESUME" => "stop", - "PERFORMANCE" => "perf", "USER" => "user", - "RESCHEDULING" => "rsch", - "KILL" => "kill" + "CANCEL" => "canc" }