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

junos_config: Remove reliance on ability to output configuration in set format (#23225)

Browse Source 
* Remove reliance on ability to output configuration in `set` format
* Support multiple warnings per rpc-reply
This commit is contained in:
Nathaniel Case
2017-04-04 15:00:00 -04:00
committed by GitHub
parent 01e27b1083
commit 597bca3129
4 changed files with 37 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -147,7 +147,7 @@ def get_diff(module):
if output is not None:
return output.text
def load_config(module, candidate, action='merge', commit=False, format='xml',
def load_config(module, candidate, warnings, action='merge', commit=False, format='xml',
comment=None, confirm=False, confirm_timeout=None):
with locked_config(module):
@@ -155,6 +155,8 @@ def load_config(module, candidate, action='merge', commit=False, format='xml',
candidate = '\n'.join(candidate)
reply = load_configuration(module, candidate, action=action, format=format)
if isinstance(reply, list):
warnings.extend(reply)
validate(module)
diff = get_diff(module)
@@ -168,4 +170,3 @@ def load_config(module, candidate, action='merge', commit=False, format='xml',
discard_changes(module)
return diff