Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Back-port #31546 to 2015.8 #31592

Merged
merged 2 commits into from Mar 1, 2016
Merged

Back-port #31546 to 2015.8 #31592

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43099a2
nspawn.py: Fix bad keyword assignment
llua Feb 28, 2016
9a296bd
Use clean_kwargs and invalid_kwargs utils funcs to handle invalid kwargs
terminalmage Feb 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 11 additions & 20 deletions salt/modules/nspawn.py
View file
Open in desktop
Expand Up @@ -37,6 +37,7 @@
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__)
Expand Down Expand Up @@ -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):
'''
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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('__')
or 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 = []

Expand Down