cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

pulls the jsonrpc request builder code into top level function (#25833)

Browse source 
refactors the Connection class to use the top level function.  This will
make the request_builder() function useful for other components such as
action handlers.
This commit is contained in:
Peter Sprygada 2017-06-17 16:14:48 -04:00 committed by GitHub
parent 450263e934
commit 3f17e87c5a
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/ansible/module_utils/connection.py
View file

@ -82,6 +82,17 @@ def exec_command(module, command):
return rc, to_native(stdout), to_native(stderr)
def request_builder(method, *args, **kwargs):
reqid = str(uuid.uuid4())
req = {'jsonrpc': '2.0', 'method': method, 'id': reqid}
params = list(args) or kwargs or None
if params:
req['params'] = params
return req
class Connection:
def __init__(self, module):
@ -104,13 +115,8 @@ class Connection:
For usage refer the respective connection plugin docs.
"""
reqid = str(uuid.uuid4())
req = {'jsonrpc': '2.0', 'method': name, 'id': reqid}
params = list(args) or kwargs or None
if params:
req['params'] = params
req = request_builder(name, *args, **kwargs)
reqid = req['id']
if not self._module._socket_path:
self._module.fail_json(msg='provider support not available for this host')