From 4a186ea04601279d8d1eccd0fc8c21a4452fc0bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tino=20V=C3=A1zquez?= <tinova@fdi.ucm.es>
Date: Tue, 5 Jul 2011 18:58:25 +0200
Subject: [PATCH] feature #667: Improved ACLs CLI (cherry picked from commit
 e3314e9a236451fdc18045058d123dedd3fa833f)

Conflicts:

	src/oca/ruby/OpenNebula/AclPool.rb
---
 src/cli/one_helper/oneacl_helper.rb | 6 +++---
 src/cli/oneacl                      | 4 ++--
 src/oca/ruby/OpenNebula/AclPool.rb  | 6 +-----
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/cli/one_helper/oneacl_helper.rb b/src/cli/one_helper/oneacl_helper.rb
index 6d920ab909..d82d64c6df 100644
--- a/src/cli/one_helper/oneacl_helper.rb
+++ b/src/cli/one_helper/oneacl_helper.rb
@@ -35,10 +35,10 @@ class OneAclHelper < OpenNebulaHelper::OneHelper
         end  
         
         if OpenNebula.is_error?(rc)
-            [-1, rc.message]
+            return [-1, rc.message]
         else
-            if !rc
-                puts "Rule added" if options[:verbose]
+            if rc.class == Fixnum
+                puts "Rule added with ID #{rc}" if options[:verbose]
                 return 0
             end
             return [-1, rc[:users].message] if OpenNebula.is_error?(rc[:users])
diff --git a/src/cli/oneacl b/src/cli/oneacl
index 30bcd8819c..98a55278c0 100755
--- a/src/cli/oneacl
+++ b/src/cli/oneacl
@@ -54,7 +54,7 @@ cmd = CommandParser::CmdParser.new(ARGV) do
         Adds a new ACL rule
     EOT
 
-    command :addrule, addrule_desc, [:user,:rulestr], [:resource, nil], [:rights, nil] do
+    command :create, addrule_desc, [:user,:rulestr], [:resource, nil], [:rights, nil] do
         helper.add_rule(options, args[0], args[1], args[2] )
     end
 
@@ -62,7 +62,7 @@ cmd = CommandParser::CmdParser.new(ARGV) do
         Deletes an existing ACL rule
     EOT
 
-    command :delrule, delrule_desc, :id do
+    command :delete, delrule_desc, :id do
         helper.delete_rule( options, args[0] )
     end
 
diff --git a/src/oca/ruby/OpenNebula/AclPool.rb b/src/oca/ruby/OpenNebula/AclPool.rb
index 9c012a61b8..9b767e21c8 100644
--- a/src/oca/ruby/OpenNebula/AclPool.rb
+++ b/src/oca/ruby/OpenNebula/AclPool.rb
@@ -56,14 +56,10 @@ module OpenNebula
         # +resource+    A string containing a hex number, e.g. 0x2100000001
         # +rights+      A string containing a hex number, e.g. 0x10
         def addrule(user, resource, rights)
-            rc = @client.call( ACL_POOL_METHODS[:addrule],
+             return @client.call( ACL_POOL_METHODS[:addrule],
                                user,
                                resource,
                                rights )
-
-            rc = nil if !OpenNebula.is_error?(rc)
-
-            return rc
         end
 
         # Adds a new ACL rule.