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

Define some client internal keywords which are expected(and skip errors on them)

Browse Source
This commit is contained in:
Pedro Algarvio 2015-01-11 16:04:10 +00:00
parent f2276afac9
commit 64566a37ef
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
salt/client/mixins.py
View File

@ -15,6 +15,14 @@ from salt.utils.doc import strip_rst as _strip_rst
log = logging.getLogger(__name__)
CLIENT_INTERNAL_KEYWORDS = frozenset([
'client',
'cmd',
'eauth',
'fun',
'match'
])
class SyncClientMixin(object):
'''
@ -39,7 +47,7 @@ class SyncClientMixin(object):
'''
self._verify_fun(fun)
l_fun = self.functions[fun]
f_call = salt.utils.format_call(l_fun, low)
f_call = salt.utils.format_call(l_fun, low, expected_extra_kws=CLIENT_INTERNAL_KEYWORDS)
ret = l_fun(*f_call.get('args', ()), **f_call.get('kwargs', {}))
return ret