valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add outputter support to salt-call

Browse Source
This commit is contained in:
Thomas S Hatch 2011-09-08 22:46:20 -06:00
parent 77830d2379
commit eb5bebcb21
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
salt/cli/caller.py
View File

@ -27,7 +27,12 @@ class Caller(object):
''' '''
Call the module Call the module
''' '''
return self.minion.functions[self.opts['fun']](*self.opts['arg']) ret['return'] = self.minion.functions[self.opts['fun']](*self.opts['arg'])
if hasattr(self.functions[self.opts['fun']], '__outputter__'):
oput = self.functions[self.opts['fun']].__outputter__
if isinstance(oput, str):
ret['out'] = oput
return ret
def print_docs(self): def print_docs(self):
''' '''
@ -60,6 +65,24 @@ class Caller(object):
elif self.opts['grains_run']: elif self.opts['grains_run']:
self.print_grains() self.print_grains()
else: else:
pprint.pprint(self.call()) ret = self.call()
if isinstance(ret['return'], list)\
or isinstance(ret['return'], dict):
# Determine the proper output method and run it
get_outputter = salt.output.get_outputter
if self.opts['raw_out']:
printout = get_outputter('raw')
elif self.opts['json_out']:
printout = get_outputter('json')
elif self.opts['txt_out']:
printout = get_outputter('txt')
elif self.opts['yaml_out']:
printout = get_outputter('yaml')
elif ret.has_key('out'):
printout = get_outputter(ret['out'])
else:
printout = get_outputter(None)
printout(ret['return'])