From 08b64e8090e95900a78f893168c8eb93b1fc5f63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartins@fdi.ucm.es>
Date: Fri, 1 Jul 2011 17:54:01 +0200
Subject: [PATCH] Bug in CLI: filter flag option for list and top commands was
 ignored

---
 src/cli/one_helper.rb | 17 +++++++++--------
 src/cli/oneimage      |  4 ++--
 src/cli/onetemplate   |  4 ++--
 src/cli/onevm         |  4 ++--
 src/cli/onevnet       |  2 +-
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/cli/one_helper.rb b/src/cli/one_helper.rb
index 5b734fb1fa..4c0cc4f35f 100644
--- a/src/cli/one_helper.rb
+++ b/src/cli/one_helper.rb
@@ -81,9 +81,10 @@ EOT
             end
         end
 
-        def list_pool(options, top=false)
-            user_flag = options[:filter_flag] ? options[:filter_flag] : -2
-            pool = factory_pool(user_flag)
+        def list_pool(options, top=false, filter_flag=-2)
+            filter_flag ||= -2
+
+            pool = factory_pool(filter_flag)
 
             rc = pool.info
             return -1, rc.message if OpenNebula.is_error?(rc)
@@ -200,15 +201,15 @@ EOT
 
         def filterflag_to_i(str)
             filter_flag = case str
-            when "a", "all" then "-2"
-            when "m", "mine" then "-3"
-            when "g", "group" then "-1"
+            when "a", "all" then -2
+            when "m", "mine" then -3
+            when "g", "group" then -1
             else
                 if str.match(/^[0123456789]+$/)
-                    str
+                    str.to_i
                 else
                     user = translation_hash[:users].select { |k,v| v==str }
-                    user.length > 0 ? user.first.first : "-2"
+                    user.length > 0 ? user.first.first.to_i : -2
                 end
             end
 
diff --git a/src/cli/oneimage b/src/cli/oneimage
index c9dab53b2e..7459f31118 100755
--- a/src/cli/oneimage
+++ b/src/cli/oneimage
@@ -195,7 +195,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :list, list_desc, [:filterflag, nil], :options=>list_options do
-        helper.list_pool(options)
+        helper.list_pool(options, false, args[0])
     end
 
     show_desc = <<-EOT.unindent
@@ -211,6 +211,6 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :top, top_desc, [:filterflag, nil], :options=>list_options do
-        helper.list_pool(options, true)
+        helper.list_pool(options, true, args[0])
     end
 end
diff --git a/src/cli/onetemplate b/src/cli/onetemplate
index fc6d40efe8..20fb6075b1 100755
--- a/src/cli/onetemplate
+++ b/src/cli/onetemplate
@@ -169,7 +169,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :list, list_desc, [:filterflag, nil], :options=>list_options do
-        helper.list_pool(options)
+        helper.list_pool(options, false, args[0])
     end
 
     show_desc = <<-EOT.unindent
@@ -185,6 +185,6 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :top, top_desc, [:filterflag, nil], :options=>list_options do
-        helper.list_pool(options, true)
+        helper.list_pool(options, true, args[0])
     end
 end
diff --git a/src/cli/onevm b/src/cli/onevm
index be2ce1bbb1..1079314d17 100755
--- a/src/cli/onevm
+++ b/src/cli/onevm
@@ -314,7 +314,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
     command :list, list_desc, [:filterflag, nil],
             :options=>CLIHelper::OPTIONS+OpenNebulaHelper::OPTIONS do
-        helper.list_pool(options)
+        helper.list_pool(options, false, args[0])
     end
 
     show_desc = <<-EOT.unindent
@@ -332,6 +332,6 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
     command :top, top_desc, [:filterflag, nil],
             :options=>CLIHelper::OPTIONS+OpenNebulaHelper::OPTIONS do
-        helper.list_pool(options, true)
+        helper.list_pool(options, true, args[0])
     end
 end
\ No newline at end of file
diff --git a/src/cli/onevnet b/src/cli/onevnet
index 030ce7cdfa..2a4c30517f 100755
--- a/src/cli/onevnet
+++ b/src/cli/onevnet
@@ -158,7 +158,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
     command :list, list_desc, [:filterflag, nil],
             :options=>CLIHelper::OPTIONS+OpenNebulaHelper::OPTIONS do
-        helper.list_pool(options)
+        helper.list_pool(options, false, args[0])
     end
 
     show_desc = <<-EOT.unindent