wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update netconf_config module doc and return diff (#44634)

Browse source 
* Update netconf_config module doc
* Return santizied before and after config
  in diff key
This commit is contained in:
Ganesh Nalawade 2018-08-24 17:57:12 +05:30 committed by GitHub
parent d20b4ee56a
commit b454fbe684
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/ansible/modules/network/netconf/netconf_config.py
View file

@ -206,11 +206,13 @@ backup_path:
type: string type: string
sample: /playbooks/ansible/backup/config.2016-07-16@22:28:34 sample: /playbooks/ansible/backup/config.2016-07-16@22:28:34
diff: diff:
description: If --diff option in enabled while running, the before and after configration change are description: If --diff option in enabled while running, the before and after configuration change are
returned as part of before and after key. returned as part of before and after key.
returned: when diff is enabled returned: when diff is enabled
type: string type: dict
sample: /playbooks/ansible/backup/config.2016-07-16@22:28:34 sample:
"after": "<rpc-reply>\n<data>\n<configuration>\n<version>17.3R1.10</version>...<--snip-->"
"before": "<rpc-reply>\n<data>\n<configuration>\n <version>17.3R1.10</version>...<--snip-->"
''' '''
from ansible.module_utils._text import to_text from ansible.module_utils._text import to_text
@ -369,12 +371,14 @@ def main():
after = to_text(conn.get_config(source='running'), errors='surrogate_then_replace').strip() after = to_text(conn.get_config(source='running'), errors='surrogate_then_replace').strip()
if sanitize_xml(before) != sanitize_xml(after): sanitized_before = sanitize_xml(before)
sanitized_after = sanitize_xml(after)
if sanitized_before != sanitized_after:
result['changed'] = True result['changed'] = True
if module._diff: if module._diff:
if result['changed']: if result['changed']:
result['diff'] = {'before': before, 'after': after} result['diff'] = {'before': sanitized_before, 'after': sanitized_after}
except ConnectionError as e: except ConnectionError as e:
module.fail_json(msg=to_text(e, errors='surrogate_then_replace').strip()) module.fail_json(msg=to_text(e, errors='surrogate_then_replace').strip())