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

implement keyword arguments for dockerng.call

Browse Source
This commit is contained in:
Duncan Mac-Vicar P 2016-07-06 14:11:17 +02:00
parent c869885415
commit 59d8ce480e
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
salt/modules/dockerng.py
View File

@ -5612,18 +5612,19 @@ def _gather_pillar(pillarenv, pillar_override, grains={}):
return ret
def call(name, function=None, args=[], **kwargs):
def call(name, function, *args, **kwargs):
'''
Executes a salt function inside a container
.. code-block:: bash
salt myminion dockerimage.call function=test.ping
salt myminion dockerng.call test.ping
salt myminion test.arg arg1 arg2 key1=val1
The container does not need to have Salt installed, but Python
is required.
TODO: support kwargs
'''
# put_archive reqires the path to exist
ret = __salt__['dockerng.run_all'](name, 'mkdir -p /tmp/salt_thin')
@ -5647,7 +5648,7 @@ def call(name, function=None, args=[], **kwargs):
'-l', 'quiet',
'--',
function
] + args
] + list(args) + ['{0}={1}'.format(key, value) for (key, value) in kwargs.items() if not key.startswith('__')]
ret = __salt__['dockerng.run_all'](name,
list2cmdline(map(str, salt_argv)))
@ -5676,7 +5677,7 @@ def sls(name, mods=None, saltenv='base', **kwargs):
.. code-block:: bash
salt myminion dockerimage.sls compassionate_mirzakhani mods=rails,web
salt myminion dockerng.sls compassionate_mirzakhani mods=rails,web
The container does not need to have Salt installed, but Python
is required.
@ -5727,7 +5728,7 @@ def sls_build(name, base='fedora', mods=None, saltenv='base',
.. code-block:: bash
salt myminion dockerimage.build_image imgname mods=rails,web
salt myminion dockerng.build_image imgname mods=rails,web
The base image does not need to have Salt installed, but Python
is required.

9
tests/unit/modules/dockerng_test.py
View File

@ -711,15 +711,14 @@ class DockerngTestCase(TestCase):
):
ret = dockerng_mod.call(
'ID',
function='test.arg',
args=[1, 2],
kwargs={'arg1': 'val1'}
)
'test.arg',
1, 2,
arg1='val1')
docker_run_all_mock.assert_called_with(
'ID',
"python /tmp/salt_thin/salt-call"
" --retcode-passthrough --local "
"--out json -l quiet -- test.arg 1 2")
"--out json -l quiet -- test.arg 1 2 arg1=val1")
self.assertEqual(
{"retcode": 0, "comment": "container cmd"}, ret)