Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Have the ios_interface module include CDP when checking neighbors #38046

Merged
merged 2 commits into from
Apr 5, 2018
Merged

Have the ios_interface module include CDP when checking neighbors #38046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8799bab
Add CDP support for the neighbors option (#37655)
orgito Mar 20, 2018
08e1f57
Add ios_interface CDP support to changelog
orgito Mar 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/ios_interface_cdp_support.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bugfixes:
- ios_interface - neighbors option now include CDP neighbors (https://github.com/ansible/ansible/pull/37667)
27 changes: 22 additions & 5 deletions lib/ansible/modules/network/ios/ios_interface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,8 @@ def map_obj_to_commands(updates):

def check_declarative_intent_params(module, want, result):
failed_conditions = []
have_neighbors = None
have_neighbors_lldp = None
have_neighbors_cdp = None
for w in want:
want_state = w.get('state')
want_tx_rate = w.get('tx_rate')
Expand Down Expand Up @@ -375,13 +376,15 @@ def check_declarative_intent_params(module, want, result):
if want_neighbors:
have_host = []
have_port = []
if have_neighbors is None:
rc, have_neighbors, err = exec_command(module, 'show lldp neighbors detail')

# Process LLDP neighbors
if have_neighbors_lldp is None:
rc, have_neighbors_lldp, err = exec_command(module, 'show lldp neighbors detail')
if rc != 0:
module.fail_json(msg=to_text(err, errors='surrogate_then_replace'), command=command, rc=rc)

if have_neighbors:
lines = have_neighbors.strip().split('Local Intf: ')
if have_neighbors_lldp:
lines = have_neighbors_lldp.strip().split('Local Intf: ')
for line in lines:
field = line.split('\n')
if field[0].strip() == w['name']:
Expand All @@ -390,6 +393,20 @@ def check_declarative_intent_params(module, want, result):
have_host.append(item.split(':')[1].strip())
if item.startswith('Port Description:'):
have_port.append(item.split(':')[1].strip())

# Process CDP neighbors
if have_neighbors_cdp is None:
rc, have_neighbors_cdp, err = exec_command(module, 'show cdp neighbors detail')
if rc != 0:
module.fail_json(msg=to_text(err, errors='surrogate_then_replace'), command=command, rc=rc)

if have_neighbors_cdp:
neighbors_cdp = re.findall('Device ID: (.*?)\n.*?Interface: (.*?), Port ID .outgoing port.: (.*?)\n', have_neighbors_cdp, re.S)
for host, localif, remoteif in neighbors_cdp:
if localif == w['name']:
have_host.append(host)
have_port.append(remoteif)

for item in want_neighbors:
host = item.get('host')
port = item.get('port')
Expand Down