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

Revert "Fix iosxr discard_changes netconf rpc issue (#57931)" (#57954)

Browse source 
This actually broken junos netconf_rpc, and was merged without properly
testing.

This reverts commit 795cb90367.
This commit is contained in:
Paul Belanger 2019-06-17 11:45:30 -04:00 committed by GitHub
parent d40c44bd56
commit fa738613dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/plugins/netconf/__init__.py
View file

@ -26,7 +26,6 @@ from ansible.errors import AnsibleError
from ansible.plugins import AnsiblePlugin
from ansible.module_utils._text import to_native
from ansible.module_utils.basic import missing_required_lib
from ansible.module_utils.six import string_types
try:
from ncclient.operations import RPCError
@ -224,9 +223,9 @@ class NetconfBase(AnsiblePlugin):
"""
if rpc_command is None:
raise ValueError('rpc_command value must be provided')
req = fromstring(rpc_command)
resp = self.m.dispatch(req, source=source, filter=filter)
return resp.data_xml if resp.data_ele else resp.xml
resp = self.m.dispatch(fromstring(rpc_command), source=source, filter=filter)
return resp.data_xml if hasattr(resp, 'data_xml') else resp.xml
@ensure_connected
def lock(self, target="candidate"):