mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-07-22 12:50:22 -07:00
Connection plugins network_cli and netconf (#32521)
* implements jsonrpc message passing for ansible-connection * implements more generic mechanism for persistent connections * starts persistent connection in task_executor if enabled and supported * supports using network_cli as top level connection plugin * enhances logging for persistent connection to stdout * Update action plugins * Fix Python3 RPC * Fix Junos bytes<-->str issues * supports using netconf as top level connection plugin * Error message when running netconf on an unsupported platform * Update tests * Fix `authorize: yes` for `connection: local` * Handle potentially JSON data in terminal * Add clarifying detail if possible on ConnectionError
This commit is contained in:
parent
897b31f249
commit
9c0275a879
26 changed files with 722 additions and 798 deletions
|
@ -1,28 +1,16 @@
|
|||
#
|
||||
# (c) 2016 Red Hat Inc.
|
||||
#
|
||||
# This file is part of Ansible
|
||||
#
|
||||
# Ansible is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# Ansible is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
|
||||
# (c) 2017, Peter Sprygada <psprygad@redhat.com>
|
||||
# (c) 2017 Ansible Project
|
||||
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
|
||||
from __future__ import (absolute_import, division, print_function)
|
||||
__metaclass__ = type
|
||||
|
||||
import json
|
||||
import traceback
|
||||
|
||||
from ansible import constants as C
|
||||
from ansible.module_utils._text import to_text
|
||||
|
||||
|
||||
try:
|
||||
from __main__ import display
|
||||
except ImportError:
|
||||
|
@ -30,13 +18,13 @@ except ImportError:
|
|||
display = Display()
|
||||
|
||||
|
||||
class Rpc:
|
||||
class JsonRpcServer(object):
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
self._rpc = set()
|
||||
super(Rpc, self).__init__(*args, **kwargs)
|
||||
_objects = set()
|
||||
|
||||
def handle_request(self, request):
|
||||
request = json.loads(to_text(request, errors='surrogate_then_replace'))
|
||||
|
||||
def _exec_rpc(self, request):
|
||||
method = request.get('method')
|
||||
|
||||
if method.startswith('rpc.') or method.startswith('_'):
|
||||
|
@ -45,6 +33,7 @@ class Rpc:
|
|||
|
||||
params = request.get('params')
|
||||
setattr(self, '_identifier', request.get('id'))
|
||||
|
||||
args = []
|
||||
kwargs = {}
|
||||
|
||||
|
@ -54,10 +43,15 @@ class Rpc:
|
|||
kwargs = params
|
||||
|
||||
rpc_method = None
|
||||
for obj in self._rpc:
|
||||
rpc_method = getattr(obj, method, None)
|
||||
if rpc_method:
|
||||
break
|
||||
|
||||
if method in ('shutdown', 'reset'):
|
||||
rpc_method = getattr(self, 'shutdown')
|
||||
|
||||
else:
|
||||
for obj in self._objects:
|
||||
rpc_method = getattr(obj, method, None)
|
||||
if rpc_method:
|
||||
break
|
||||
|
||||
if not rpc_method:
|
||||
error = self.method_not_found()
|
||||
|
@ -66,7 +60,7 @@ class Rpc:
|
|||
try:
|
||||
result = rpc_method(*args, **kwargs)
|
||||
except Exception as exc:
|
||||
display.display(traceback.format_exc(), log_only=True)
|
||||
display.vvv(traceback.format_exc())
|
||||
error = self.internal_error(data=to_text(exc, errors='surrogate_then_replace'))
|
||||
response = json.dumps(error)
|
||||
else:
|
||||
|
@ -78,8 +72,12 @@ class Rpc:
|
|||
response = json.dumps(response)
|
||||
|
||||
delattr(self, '_identifier')
|
||||
|
||||
return response
|
||||
|
||||
def register(self, obj):
|
||||
self._objects.add(obj)
|
||||
|
||||
def header(self):
|
||||
return {'jsonrpc': '2.0', 'id': self._identifier}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue