diff --git a/src/cli/one_helper/oneacl_helper.rb b/src/cli/one_helper/oneacl_helper.rb index da721f8d2d..6d920ab909 100644 --- a/src/cli/one_helper/oneacl_helper.rb +++ b/src/cli/one_helper/oneacl_helper.rb @@ -49,7 +49,7 @@ class OneAclHelper < OpenNebulaHelper::OneHelper end end - def delete_rule(id) + def delete_rule(options, id) acl = OpenNebula::AclPool.new( OpenNebula::Client.new() ) rc = acl.delrule( id ) @@ -151,7 +151,7 @@ class OneAclHelper < OpenNebulaHelper::OneHelper OneAclHelper::right_mask d['STRING'].split(" ")[2] end - default :ID, :USER, :RESOURCE_VHNIUTG, :RID, :OPERATION_CDUMIPpTW + default :ID, :USER, :RES_VHNIUTG, :RID, :OPE_CDUMIPpTW end table.show(pool, options) diff --git a/src/cli/oneacl b/src/cli/oneacl index d291668361..30bcd8819c 100755 --- a/src/cli/oneacl +++ b/src/cli/oneacl @@ -63,7 +63,7 @@ cmd = CommandParser::CmdParser.new(ARGV) do EOT command :delrule, delrule_desc, :id do - helper.delete_rule( args[0] ) + helper.delete_rule( options, args[0] ) end list_desc = <<-EOT.unindent diff --git a/src/oca/ruby/OpenNebula/AclPool.rb b/src/oca/ruby/OpenNebula/AclPool.rb index 3f77fa7764..e42b68759d 100644 --- a/src/oca/ruby/OpenNebula/AclPool.rb +++ b/src/oca/ruby/OpenNebula/AclPool.rb @@ -86,14 +86,9 @@ module OpenNebula # Deletes an existing ACL rule. # - # +user+ A hex number, e.g. 0x100000001 - # +resource+ A hex number, e.g. 0x2100000001 - # +rights+ A hex number, e.g. 0x10 - def delrule(user, resource, rights) - rc = @client.call( ACL_POOL_METHODS[:delrule], - user, - resource, - rights ) + # +id+ An existing ACL rule ID + def delrule(id) + rc = @client.call( ACL_POOL_METHODS[:delrule], id.to_i ) rc = nil if !OpenNebula.is_error?(rc)