output_for_cli signature is now output_for_cli(textui, result, *args, **options)

3 files changed, 15 insertions, 10 deletions

diff --git a/ipalib/cli.py b/ipalib/cli.py
index 8878c2124..d86647c6a 100644
--- a/ipalib/cli.py
+++ b/ipalib/cli.py
@@ -535,7 +535,8 @@ class CLI(object):
         try:
             ret = cmd(**kw)
             if callable(cmd.output_for_cli):
-                cmd.output_for_cli(self.api.Backend.textui, ret, **kw)
+                (args, options) = cmd.params_2_args_options(kw)
+                cmd.output_for_cli(self.api.Backend.textui, ret, *args, **options)
             return 0
         except socket.error, e:
             print e[1]
diff --git a/ipalib/frontend.py b/ipalib/frontend.py
index ce4168bc9..56c4ea01f 100644
--- a/ipalib/frontend.py
+++ b/ipalib/frontend.py
@@ -511,7 +511,7 @@ class Command(plugable.Plugin):
         'options',
         'params',
         'args_to_kw',
-        'kw_to_args',
+        'params_2_args_options',
         'output_for_cli',
     ))
     takes_options = tuple()
@@ -536,8 +536,8 @@ class Command(plugable.Plugin):
         kw = self.convert(**kw)
         kw.update(self.get_default(**kw))
         self.validate(**kw)
-        args = tuple(kw.pop(name) for name in self.args)
-        return self.run(*args, **kw)
+        (args, options) = self.params_2_args_options(kw)
+        return self.run(*args, **options)
 
     def args_to_kw(self, *values):
         """
@@ -569,11 +569,15 @@ class Command(plugable.Plugin):
             else:
                 break
 
-    def kw_to_args(self, **kw):
+    def params_2_args_options(self, params):
         """
-        Map keyword into positional arguments.
+        Split params into (args, kw).
         """
-        return tuple(kw.get(name, None) for name in self.args)
+        args = tuple(params.get(name, None) for name in self.args)
+        options = dict(
+            (name, params.get(name, None)) for name in self.options
+        )
+        return (args, options)
 
     def normalize(self, **kw):
         """
diff --git a/ipalib/plugins/f_misc.py b/ipalib/plugins/f_misc.py
index 1acf1c999..05fd6d525 100644
--- a/ipalib/plugins/f_misc.py
+++ b/ipalib/plugins/f_misc.py
@@ -39,8 +39,8 @@ class env(Command):
         ),
     )
 
-    def run(self, variables, **kw):
-        if kw['server'] and not self.env.in_server:
+    def run(self, variables, **options):
+        if options['server'] and not self.env.in_server:
             return self.forward(variables)
         return self.execute(variables)
 
@@ -56,7 +56,7 @@ class env(Command):
             )
         return tuple(self.find_keys(variables))
 
-    def output_for_cli(self, textui, result, **kw):
+    def output_for_cli(self, textui, result, variables, **options):
         if len(result) == 0:
             return
         textui.print_name(self.name)