ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-22 21:00:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ios_facts: Add check to skip lldp neighbors if lldp doesn't exist or isn't enabled. (#40109)

Browse source 
* Add check to skip lldp neighbors if lldp doesn't exist or isn't enabled.

* Re-enable check_rc on ios' run_commands
This commit is contained in:
Tyler Bigler 2018-05-16 09:33:57 -04:00 • committed by Nathaniel Case
commit 39bed45baf
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/module_utils/network/ios/ios.py
View file

@ -29,7 +29,7 @@ import json
from ansible.module_utils._text import to_text from ansible.module_utils._text import to_text
from ansible.module_utils.basic import env_fallback, return_values from ansible.module_utils.basic import env_fallback, return_values
from ansible.module_utils.network.common.utils import to_list, ComplexList from ansible.module_utils.network.common.utils import to_list, ComplexList
from ansible.module_utils.connection import Connection from ansible.module_utils.connection import Connection, ConnectionError
_DEVICE_CONFIGS = {} _DEVICE_CONFIGS = {}
@ -144,7 +144,13 @@ def run_commands(module, commands, check_rc=True):
prompt = None prompt = None
answer = None answer = None
out = connection.get(command, prompt, answer) try:
out = connection.get(command, prompt, answer)
except ConnectionError as e:
if check_rc:
raise
else:
out = e
try: try:
out = to_text(out, errors='surrogate_or_strict') out = to_text(out, errors='surrogate_or_strict')

4
lib/ansible/modules/network/ios/ios_facts.py
View file

@ -281,7 +281,9 @@ class Interfaces(FactsBase):
self.populate_ipv6_interfaces(data) self.populate_ipv6_interfaces(data)
data = self.responses[3] data = self.responses[3]
if data: lldp_errs = ['Invalid input', 'LLDP is not enabled']
if data and not any(err in data for err in lldp_errs):
neighbors = self.run(['show lldp neighbors detail']) neighbors = self.run(['show lldp neighbors detail'])
if neighbors: if neighbors:
self.facts['neighbors'] = self.parse_neighbors(neighbors[0]) self.facts['neighbors'] = self.parse_neighbors(neighbors[0])