summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Dodd <stevend@idahood.com>2018-11-12 00:01:27 -0700
committerMatt Clay <matt@mystile.com>2018-12-10 12:14:32 -0800
commit413df66ac5d6af3e3414681ad200b8f8342b0f59 (patch)
tree70d0231fe74f962b8951717552403e907134a947
parent303bf53eeced160cf1524489ed87eed7af40f287 (diff)
downloadansible-413df66ac5d6af3e3414681ad200b8f8342b0f59.tar.gz
Fix LLDP to use json (#48318)
(cherry picked from commit e51964e7a6552bab3cfb7c2dfe07dd33512f477a)
-rw-r--r--lib/ansible/modules/network/nxos/nxos_facts.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/ansible/modules/network/nxos/nxos_facts.py b/lib/ansible/modules/network/nxos/nxos_facts.py
index e8f8544463..40f6696926 100644
--- a/lib/ansible/modules/network/nxos/nxos_facts.py
+++ b/lib/ansible/modules/network/nxos/nxos_facts.py
@@ -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: