Skip to content

Adjusts parser for "show ap cdp neighbor" #948

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

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Adjusts parser for "show ap cdp neighbor" #948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
953a894
Adjusts parser for "show ap cdp neighbor"
Jun 11, 2025
203d3f2
Add comment to show match, and update schema
Jun 17, 2025
dac85b8
Clean up code as suggested by @ThomasJRyan in #984
Jun 17, 2025
58191fa
Add additional unittest for IOSXE ShowApCdpNeighbor parser
Jun 17, 2025
20c0170
Add missing import
Jun 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ...g/undistributed/changelog_show_ap_cdp_neighbor_iosxe_2025061749625685170805.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
--------------------------------------------------------------------------------
Fix
--------------------------------------------------------------------------------
* IOSXE
* Modified ShowApCdpNeighbor:
* Updated regex pattern neighbor_info_capture to optionally capture the Neighbors IP if it exists
14 changes: 10 additions & 4 deletions src/genie/libs/parser/iosxe/show_ap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import re

from genie.metaparser import MetaParser
from genie.metaparser.util.schemaengine import Any, Optional, Or
from genie.metaparser.util.schemaengine import Any, Optional, Or, ListOf


# ====================
Expand Down Expand Up @@ -1149,7 +1149,7 @@ class ShowApCdpNeighborSchema(MetaParser):
Optional("neighbor_name"): str,
Optional("neighbor_port"): str,
Optional("neighbor_ip_count"): int,
Optional("neighbor_ip_addresses"): list
Optional("neighbor_ip_addresses"): ListOf(str)
}
}
}
Expand Down Expand Up @@ -1199,8 +1199,9 @@ def cli(self, output=None):

neighbor_count_capture = re.compile(r"^Number\s+of\s+neighbors:\s+(?P<neighbor_count>\d+)$")
# 0221-cap22 10.8.33.106 a02-21-sd-sw1.cisco.com TenGigabitEthernet3/0/47
# 0221-cap22 10.8.33.106 a02-21-sd-sw1.cisco.com 10.8.32.1 TenGigabitEthernet3/0/47
neighbor_info_capture = re.compile(
r"^(?P<ap_name>\S+)\s+(?P<ap_ip>\d+\.\d+\.\d+\.\d+)\s+(?P<neighbor_name>\S+)\s+(?P<neighbor_port>\S+)$")
r"^(?P<ap_name>\S+)\s+(?P<ap_ip>\d+\.\d+\.\d+\.\d+)\s+(?P<neighbor_name>\S+)\s+((?P<neighbor_ip>\S+))?\s+(?P<neighbor_port>\S+)$")
# Neighbor IP Count: 1
neighbor_ip_count_capture = re.compile(r"^Neighbor\s+IP\s+Count:\s+(?P<neighbor_ip_count>\d+)$")
# 10.8.32.1
Expand Down Expand Up @@ -1235,6 +1236,11 @@ def cli(self, output=None):
ap_cdp_neighbor_dict['ap_name'][ap_name]['ap_ip'] = ap_ip
ap_cdp_neighbor_dict['ap_name'][ap_name]['neighbor_name'] = neighbor_name
ap_cdp_neighbor_dict['ap_name'][ap_name]['neighbor_port'] = neighbor_port
if groups['neighbor_ip']:
neighbor_ip = groups['neighbor_ip']
address_list = ap_cdp_neighbor_dict['ap_name'][ap_name].setdefault('neighbor_ip_addresses', [])
address_list.append(neighbor_ip)

# Neighbor IP Count: 1
elif neighbor_ip_count_capture.match(line):
neighbor_ip_count_match = neighbor_ip_count_capture.match(line)
Expand Down Expand Up @@ -3198,4 +3204,4 @@ def filter_lines(raw_output, remove_lines):
ap_image_data = {}
continue

return ap_image_dict
return ap_image_dict
75 changes: 75 additions & 0 deletions src/genie/libs/parser/iosxe/tests/ShowApCdpNeighbor/cli/equal/golden_output_2_expected.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
expected_output = {
"ap_cdp_neighbor_count": 149,
"ap_name": {
"0221-cap22": {
"ap_ip": "10.8.33.106",
"neighbor_name": "a02-21-sd-sw1.cisco.com",
"neighbor_port": "TenGigabitEthernet3/0/47",
"neighbor_ip_count": 1,
"neighbor_ip_addresses": ["10.8.32.1"]
},
"0232-cap15": {
"ap_ip": "10.8.32.46",
"neighbor_name": "a02-32-sd-sw1.cisco.com",
"neighbor_port": "TenGigabitEthernet9/0/47",
"neighbor_ip_count": 1,
"neighbor_ip_addresses": ["10.8.32.1"]
},
"0211-cap27": {
"ap_ip": "10.8.32.188",
"neighbor_name": "a02-11-sd-sw1.cisco.com",
"neighbor_port": "TenGigabitEthernet4/0/46",
"neighbor_ip_count": 1,
"neighbor_ip_addresses": ["10.8.32.1"]
},
"0212-cap11": {
"ap_ip": "10.8.33.160",
"neighbor_name": "a02-12-sd-sw2.cisco.com",
"neighbor_port": "TenGigabitEthernet1/0/40",
"neighbor_ip_count": 1,
"neighbor_ip_addresses": ["10.8.32.1"]
},
"0212-cap10": {
"ap_ip": "10.8.33.102",
"neighbor_name": "a02-12-sd-sw1.cisco.com",
"neighbor_port": "TenGigabitEthernet1/0/43",
"neighbor_ip_count": 1,
"neighbor_ip_addresses": ["10.8.32.1"]
},
"0212-cap17": {
"ap_ip": "10.8.32.203",
"neighbor_name": "a02-12-sd-sw2.cisco.com",
"neighbor_port": "TenGigabitEthernet1/0/47",
"neighbor_ip_count": 1,
"neighbor_ip_addresses": ["10.8.32.1"]
},
"0212-ca.4": {
"ap_ip": "10.8.32.202",
"neighbor_name": "a02-12-sd-sw1.cisco.com",
"neighbor_port": "TenGigabitEthernet1/0/48",
"neighbor_ip_count": 1,
"neighbor_ip_addresses": ["10.8.32.1"]
},
"0222-cap09": {
"ap_ip": "10.8.33.33",
"neighbor_name": "a02-22-sd-sw2.cisco.com",
"neighbor_port": "TenGigabitEthernet8/0/48",
"neighbor_ip_count": 1,
"neighbor_ip_addresses": ["10.8.32.1"]
},
"0231-cap43": {
"ap_ip": "10.8.33.93",
"neighbor_name": "a02-31-sd-sw1.cisco.com",
"neighbor_port": "TenGigabitEthernet4/0/47",
"neighbor_ip_count": 1,
"neighbor_ip_addresses": ["10.8.32.1"]
},
"0222-cap08": {
"ap_ip": "10.8.32.166",
"neighbor_name": "a02-22-sd-sw2.cisco.com",
"neighbor_port": "TenGigabitEthernet4/0/47",
"neighbor_ip_count": 1,
"neighbor_ip_addresses": ["10.8.32.1"]
}
}
}
14 changes: 14 additions & 0 deletions src/genie/libs/parser/iosxe/tests/ShowApCdpNeighbor/cli/equal/golden_output_2_output.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Number of neighbors: 149

AP Name AP IP Neighbor Name Neighbor IP Neighbor Port
-------------------------------------------------------------------------------------------------------------------------------------------------------------
0221-cap22 10.8.33.106 a02-21-sd-sw1.cisco.com 10.8.31.1 TenGigabitEthernet3/0/47
0232-cap15 10.8.32.46 a02-32-sd-sw1.cisco.com 10.8.31.1 TenGigabitEthernet9/0/47
0211-cap27 10.8.32.188 a02-11-sd-sw1.cisco.com 10.8.31.1 TenGigabitEthernet4/0/46
0212-cap11 10.8.33.160 a02-12-sd-sw2.cisco.com 10.8.31.1 TenGigabitEthernet1/0/40
0212-cap10 10.8.33.102 a02-12-sd-sw1.cisco.com 10.8.31.1 TenGigabitEthernet1/0/43
0212-cap17 10.8.32.203 a02-12-sd-sw2.cisco.com 10.8.31.1 TenGigabitEthernet1/0/47
0212-ca.4 10.8.32.202 a02-12-sd-sw1.cisco.com 10.8.31.1 TenGigabitEthernet1/0/48
0222-cap09 10.8.33.33 a02-22-sd-sw2.cisco.com 10.8.31.1 TenGigabitEthernet8/0/48
0231-cap43 10.8.33.93 a02-31-sd-sw1.cisco.com 10.8.31.1 TenGigabitEthernet4/0/47
0222-cap08 10.8.32.166 a02-22-sd-sw2.cisco.com 10.8.31.1 TenGigabitEthernet4/0/47
Loading