cert: fix CLI output of cert_remove_hold

cert_remove_hold uses output params instead of exceptions to convey
unsuccessful result. Move the output params to the client side before
the command is fixed to use exceptions.

https://fedorahosted.org/freeipa/ticket/4739

Reviewed-By: David Kupka <dkupka@redhat.com>

2 files changed, 13 insertions, 9 deletions

diff --git a/ipaclient/plugins/cert.py b/ipaclient/plugins/cert.py
index de4318b68..37e894efb 100644
--- a/ipaclient/plugins/cert.py
+++ b/ipaclient/plugins/cert.py
@@ -23,7 +23,7 @@ from ipaclient.frontend import MethodOverride
 from ipalib import errors
 from ipalib import x509
 from ipalib import util
-from ipalib.parameters import File
+from ipalib.parameters import File, Flag, Str
 from ipalib.plugable import Registry
 from ipalib.text import _
 
@@ -55,6 +55,18 @@ class cert_show(MethodOverride):
 
 
 @register(override=True)
+class cert_remove_hold(MethodOverride):
+    has_output_params = (
+        Flag('unrevoked',
+            label=_('Unrevoked'),
+        ),
+        Str('error_string',
+            label=_('Error'),
+        ),
+    )
+
+
+@register(override=True)
 class cert_find(MethodOverride):
     takes_options = (
         File(
diff --git a/ipaserver/plugins/cert.py b/ipaserver/plugins/cert.py
index 526360bb6..1007408ef 100644
--- a/ipaserver/plugins/cert.py
+++ b/ipaserver/plugins/cert.py
@@ -842,14 +842,6 @@ class cert_revoke(PKQuery, CertMethod, VirtualCommand):
 class cert_remove_hold(PKQuery, CertMethod, VirtualCommand):
     __doc__ = _('Take a revoked certificate off hold.')
 
-    has_output_params = (
-        Flag('unrevoked',
-            label=_('Unrevoked'),
-        ),
-        Str('error_string',
-            label=_('Error'),
-        ),
-    )
     operation = "certificate remove hold"
 
     def get_options(self):