diff --git a/src/cli/etc/onehook.yaml b/src/cli/etc/onehook.yaml index 2b8b882074..415cf6bff7 100644 --- a/src/cli/etc/onehook.yaml +++ b/src/cli/etc/onehook.yaml @@ -2,13 +2,11 @@ :ID: :desc: ONE identifier for Hook :size: 4 - :adjust: true :NAME: :desc: Name of the Hook :size: 19 :left: true - :expand: true :TYPE: :desc: Type of the hook diff --git a/src/cli/onehook b/src/cli/onehook index b33e3af683..962db9cc17 100755 --- a/src/cli/onehook +++ b/src/cli/onehook @@ -79,12 +79,8 @@ CommandParser::CmdParser.new(ARGV) do :description => 'execution ID' } - set :format, :hookid, OneHookHelper.to_id_desc do |arg| - helper.rname_to_id(arg) - end - - set :format, :hookid_list, OneHookHelper.list_to_id_desc do |arg| - helper.list_to_id(arg) + set :format, :hookid, OpenNebulaHelper.rname_to_id_desc('HOOK') do |arg| + OpenNebulaHelper.rname_to_id(arg, 'HOOK') end ######################################################################## @@ -176,8 +172,8 @@ CommandParser::CmdParser.new(ARGV) do EOT command :delete, delete_desc, [:range, :hookid_list] do - helper.perform_actions(args[0], options, 'deleted') do |hook| - hook.delete + helper.perform_actions(args[0], options, 'deleted') do |t| + t.delete end end