From b304a6d896fc4e7f69a80daf1c6ace92f85fc06a Mon Sep 17 00:00:00 2001
From: Daniel Molina <danmolin@fdi.ucm.es>
Date: Tue, 13 Mar 2012 16:00:55 +0100
Subject: [PATCH] feature #1112: Fix CLI option procs

---
 src/cli/command_parser.rb                 | 2 +-
 src/cli/one_helper.rb                     | 2 +-
 src/cli/one_helper/onecluster_helper.rb   | 8 +++++++-
 src/cli/one_helper/onedatastore_helper.rb | 8 +++++++-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/cli/command_parser.rb b/src/cli/command_parser.rb
index fe3fc911ac..efe463d962 100755
--- a/src/cli/command_parser.rb
+++ b/src/cli/command_parser.rb
@@ -311,7 +311,7 @@ EOT
 
                     opts.on(*args) do |o|
                         if e[:proc]
-                            @options[e[:name].to_sym]=e[:proc].call(o, @options)
+                            e[:proc].call(o, @options)
                         elsif e[:name]=="help"
                             help
                             exit
diff --git a/src/cli/one_helper.rb b/src/cli/one_helper.rb
index c9646e0809..16f08400f3 100644
--- a/src/cli/one_helper.rb
+++ b/src/cli/one_helper.rb
@@ -202,7 +202,7 @@ EOT
 
             result = names.split(',').collect { |name|
                 if name.match(/^[0123456789]+$/)
-                    name
+                    name.to_i
                 else
                     rc = OneHelper.name_to_id(name, pool, poolname)
 
diff --git a/src/cli/one_helper/onecluster_helper.rb b/src/cli/one_helper/onecluster_helper.rb
index 4e837f9a29..40024d5b53 100644
--- a/src/cli/one_helper/onecluster_helper.rb
+++ b/src/cli/one_helper/onecluster_helper.rb
@@ -27,7 +27,13 @@ class OneClusterHelper < OpenNebulaHelper::OneHelper
         :proc   => lambda { |o, options|
             ch = OneClusterHelper.new
             rc, cid = ch.to_id(o)
-            cid
+            if rc == 0
+                options[:cluster] = cid
+            else
+                puts cid
+                puts "option cluster: Parsing error"
+                exit -1
+            end
         }
     }
     
diff --git a/src/cli/one_helper/onedatastore_helper.rb b/src/cli/one_helper/onedatastore_helper.rb
index 4f524bbd71..b94ad60a3f 100644
--- a/src/cli/one_helper/onedatastore_helper.rb
+++ b/src/cli/one_helper/onedatastore_helper.rb
@@ -26,7 +26,13 @@ class OneDatastoreHelper < OpenNebulaHelper::OneHelper
         :proc   => lambda { |o, options|
             ch = OneDatastoreHelper.new
             rc, dsid = ch.to_id(o)
-            dsid
+            if rc == 0
+                options[:datastore] = dsid
+            else
+                puts dsid
+                puts "option datastore: Parsing error"
+                exit -1
+            end
         }
     }