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

Fix LLDP to use json (#48318)

Browse source 
(cherry picked from commit e51964e7a6)
This commit is contained in:
Steve Dodd 2018-11-12 00:01:27 -07:00 committed by Matt Clay
parent 303bf53eec
commit 413df66ac5
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/modules/network/nxos/nxos_facts.py
View file

@ -400,9 +400,12 @@ class Interfaces(FactsBase):
interfaces = self.parse_interfaces(data)
self.populate_ipv6_interfaces(interfaces)
data = self.run('show lldp neighbors')
data = self.run('show lldp neighbors', output='json')
if data:
self.facts['neighbors'].update(self.populate_neighbors(data))
if isinstance(data, dict):
self.facts['neighbors'].update(self.populate_structured_neighbors_lldp(data))
else:
self.facts['neighbors'].update(self.populate_neighbors(data))
data = self.run('show cdp neighbors detail', output='json')
if data: