From eda92c4b82552a5b02633e7278eb450927e27632 Mon Sep 17 00:00:00 2001
From: Alejandro Huertas Herrero <ahuertas@opennebula.systems>
Date: Tue, 18 Feb 2020 21:01:59 +0100
Subject: [PATCH] F #4203: onehook CLI improvements (#4206)

---
 src/cli/etc/onehook.yaml |  2 ++
 src/cli/onehook          | 12 ++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/cli/etc/onehook.yaml b/src/cli/etc/onehook.yaml
index 415cf6bff7..2b8b882074 100644
--- a/src/cli/etc/onehook.yaml
+++ b/src/cli/etc/onehook.yaml
@@ -2,11 +2,13 @@
 :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 962db9cc17..b33e3af683 100755
--- a/src/cli/onehook
+++ b/src/cli/onehook
@@ -79,8 +79,12 @@ CommandParser::CmdParser.new(ARGV) do
         :description => 'execution ID'
     }
 
-    set :format, :hookid, OpenNebulaHelper.rname_to_id_desc('HOOK') do |arg|
-        OpenNebulaHelper.rname_to_id(arg, 'HOOK')
+    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)
     end
 
     ########################################################################
@@ -172,8 +176,8 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :delete, delete_desc, [:range, :hookid_list] do
-        helper.perform_actions(args[0], options, 'deleted') do |t|
-            t.delete
+        helper.perform_actions(args[0], options, 'deleted') do |hook|
+            hook.delete
         end
     end