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

Merge wrapped lines.

Browse source 
Some devices return their description on multiple lines such as:

    lldp.eth0.chassis.descr=cisco CISCO7609-S running on
    Cisco IOS Software, c7600s72033_rp Software (c7600s72033_rp-IPSERVICESK9-M), Version 12.2(33)SRE3, RELEASE SOFTWARE (fc1)
    Technical Support: http://www.cisco.com/techsupport
    Copyright (c) 1986-2011 by Cisco Systems, Inc.
    Compiled Wed 26-Jan-11 06:54 by prod_rel_team

The generated fact will result as:

    "descr": "cisco CISCO7609-S running on"

This patch fixes the line wrapping to return the full description
handling line breaks:

    "descr": "cisco CISCO7609-S running on\nCisco IOS Software, c7600s72033_rp Software (c7600s72033_rp-IPSERVICESK9-M), Version 12.2(33)SRE3, RELEASE SOFTWARE (fc1)\nTechnical Support: http://www.cisco.com/techsupport\nCopyright (c) 1986-2011 by Cisco Systems, Inc.\nCompiled Wed 26-Jan-11 06:54 by prod_rel_team"
This commit is contained in:
Sébastien Gross 2015-04-08 18:33:40 +02:00 committed by Matt Clay
parent d72734ed47
commit 95031a8bea
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/modules/extras/network/lldp.py
View file

@ -58,6 +58,8 @@ def gather_lldp():
path, value = entry.strip().split("=", 1) path, value = entry.strip().split("=", 1)
path = path.split(".") path = path.split(".")
path_components, final = path[:-1], path[-1] path_components, final = path[:-1], path[-1]
else:
value = current_dict[final] + '\n' + entry
current_dict = output_dict current_dict = output_dict
for path_component in path_components: for path_component in path_components: