saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use clean_kwargs and invalid_kwargs utils funcs to handle invalid kwargs

Browse source
This commit is contained in:
Erik Johnson 2016-02-29 11:20:20 -06:00 • committed by rallytime
parent 43099a2b63
commit 9a296bd1bf
1 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
salt/modules/nspawn.py
View file

@ -37,6 +37,7 @@ import salt.defaults.exitcodes
import salt.utils
import salt.utils.systemd
from salt.exceptions import CommandExecutionError, SaltInvocationError
from salt.ext import six
from salt.ext.six.moves import range # pylint: disable=redefined-builtin
log = logging.getLogger(__name__)
@ -293,17 +294,6 @@ def _run(name,
return ret[output]
def _invalid_kwargs(*args, **kwargs):
'''
Raise an exception on bad kwarg input
'''
raise SaltInvocationError(
'The following invalid keyword arguments were passed: {0}'
.format(', '.join(['{0}={1}'.format(x, kwargs[x])
for x in args]))
)
@_ensure_exists
def pid(name):
'''
@ -935,11 +925,10 @@ def info(name, **kwargs):
salt myminion nspawn.info arch1
salt myminion nspawn.info arch1 force_start=False
'''
# Use kwargs to
kwargs = salt.utils.clean_kwargs(**kwargs)
start_ = kwargs.pop('start', False)
bad_kwargs = [x for x in kwargs if not x.startswith('__')]
if bad_kwargs:
_invalid_kwargs(*bad_kwargs, **kwargs)
if kwargs:
salt.utils.invalid_kwargs(kwargs)
if not start_:
_ensure_running(name)
@ -1310,18 +1299,20 @@ def _pull_image(pull_type, image, name, **kwargs):
if pull_type in ('raw', 'tar'):
valid_kwargs = ('verify',)
elif pull_type == 'dkr':
valid_kwargs = 'index'
valid_kwargs = ('index',)
else:
raise SaltInvocationError(
'Unsupported image type \'{0}\''.format(pull_type)
)
bad_kwargs = [x for x in kwargs
if not x.startswith('__')
and x not in valid_kwargs]
kwargs = salt.utils.clean_kwargs(**kwargs)
bad_kwargs = dict(
[(x, y) for x, y in six.iteritems(salt.utils.clean_kwargs(**kwargs))
if x not in valid_kwargs]
)
if bad_kwargs:
_invalid_kwargs(*bad_kwargs, **kwargs)
salt.utils.invalid_kwargs(bad_kwargs)
pull_opts = []