internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 06:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Netconf bytes fixes (#41607)

Browse Source 
* Solve some bytes issues on iosxr

* Solve some bytes issues in junos

* Do the correct thing with tostring based on lxml or not
This commit is contained in:
Nathaniel Case
2018-06-22 11:50:44 -04:00
committed by GitHub
parent c144adc9de
commit 9aa8c652ba
23 changed files with 54 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/ansible/modules/network/junos/junos_rpc.py
View File

@@ -95,15 +95,15 @@ output_lines:
"""
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.network.common.netconf import exec_rpc
from ansible.module_utils.network.junos.junos import junos_argument_spec
from ansible.module_utils.network.junos.junos import junos_argument_spec, tostring
from ansible.module_utils.six import iteritems
USE_PERSISTENT_CONNECTION = True
try:
from lxml.etree import Element, SubElement, tostring
from lxml.etree import Element, SubElement
except ImportError:
from xml.etree.ElementTree import Element, SubElement, tostring
from xml.etree.ElementTree import Element, SubElement
def main():
@@ -153,7 +153,7 @@ def main():
reply = exec_rpc(module, tostring(element), ignore_warning=False)
result['xml'] = str(tostring(reply))
result['xml'] = tostring(reply)
if module.params['output'] == 'text':
data = reply.find('.//output')
@@ -164,7 +164,7 @@ def main():
result['output'] = module.from_json(reply.text.strip())
else:
result['output'] = str(tostring(reply)).split('\n')
result['output'] = tostring(reply).split('\n')
module.exit_json(**result)