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

Fixes #23960 junos_config fail with config in xml (#23962)

Browse Source 
If config is in xml format append it to <configuration>
tag as a instance of Element class.
This commit is contained in:
Ganesh Nalawade
2017-04-25 22:40:16 +05:30
committed by GitHub
parent 8e7c546ef9
commit 15c19367d6
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ansible/module_utils/junos.py
View File

@@ -18,7 +18,7 @@
# #
from contextlib import contextmanager from contextlib import contextmanager
from xml.etree.ElementTree import Element, SubElement from xml.etree.ElementTree import Element, SubElement, fromstring
from ansible.module_utils.basic import env_fallback, return_values from ansible.module_utils.basic import env_fallback, return_values
from ansible.module_utils.netconf import send_request, children from ansible.module_utils.netconf import send_request, children
@@ -108,10 +108,12 @@ def load_configuration(module, candidate=None, action='merge', rollback=None, fo
cfg = SubElement(obj, lookup[format]) cfg = SubElement(obj, lookup[format])
if isinstance(candidate, string_types): if isinstance(candidate, string_types):
cfg.text = candidate if format == 'xml':
cfg.append(fromstring(candidate))
else:
cfg.text = candidate
else: else:
cfg.append(candidate) cfg.append(candidate)
return send_request(module, obj) return send_request(module, obj)
def get_configuration(module, compare=False, format='xml', rollback='0'): def get_configuration(module, compare=False, format='xml', rollback='0'):