Normalize CDP, LLDP, ISDP capture groups #1469
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mjbear
requested review from
itdependsnetworks,
jmcgill298 and
jvanderaa
as code owners
This was referenced Sep 4, 2023
|
I am fixing up merge conflicts and putting this on @jvanderaa 's list 😅 |
mjbear
force-pushed
the
normalize_cap_grp_cdp_lldp
branch
from
4e7c86f to
be0fcaf
Compare
mjbear
force-pushed
the
normalize_cap_grp_cdp_lldp
branch
from
be0fcaf to
96d0b91
Compare
|
ironed out some merge conflicts |
|
rebasing off of current NTC master branch to help alleviate merge conflicts for the maintainers |
|
Is this close? Happy to help. |
|
Hello @ryanmerolle, This was waiting to be merged. (It was ready.) Thank you |
|
Thanks @mjbear I thought that I had all of them from earlier. |
hp_procurve_show_cdp_neighbors_detail to normalize
juniper_junos_show_lldp_neighbors to normalize
hp_procurve_show_lldp_info_remote-device_detail to normalize
normalize with CDP/LLDP
hp_procurve_show_lldp_info_remote-device_detail to normalize
hp_procurve_show_cdp_neighbors_detail to normalize
aruba_aoscx_show_lldp_neighbors-info_detail to normalize
…formation_verbose - replace NEIGHBOR_INTERFACE with NEIGHBOR_INTERFACE_DESCRIPTION - replace NEIGHBOR_PORT_ID with NEIGHBOR_INTERFACE
…in ipinfusion_ocnos_show_lldp_table to normalize
hp_procurve_show_lldp_info_remote-device_detail to normalize
…ances of system name with NEIGHBOR_NAME to normalize
hp_procurve_show_cdp_neighbors_detail to normalize
hp_procurve_show_lldp_info_remote-device_detail to normalize
templates to normalize
aruba_aoscx_show_lldp_neighbors-info_detail to normalize
LLDP templates - replace NEIGHBOR_PORTID with NEIGHBOR_INTERFACE - replace NEIGHBOR_DESCR with NEIGHBOR_DESCRIPTION
or LLDP templates - replace NEIGHBOR_PORTID with NEIGHBOR_INTERFACE - replace SYSTEM_DESCR with NEIGHBOR_DESCRIPTION
LLDP templates - replace CHASSIS_DESC with NEIGHBOR_DESCRIPTION - replace PORT_ID with NEIGHBOR_PORT_ID
…co_ios_show_lldp_neighbors_detail
…co_nxos_show_lldp_neighbors_detail
…wei_vrp_display_lldp_neighbor
…show_lldp_neighbors_detail - normalize SOFTWARE_VERSION with NEIGHBOR_DESCRIPTION in cisco_ios_show_cdp_neighbors_detail
…how_cdp_neighbors_detail - replace SOFTWARE_VERSION with NEIGHBOR_DESCRIPTION in cisco_wlc_ssh_show_cdp_neighbors_detail
hp_procurve_show_lldp_info_remote-device to normalize
…ghbors_detail - replace MODEL with PLATFORM in cisco_ios_show_lldp_neighbors_detail - replace MODEL_NAME with PLATFORM in huawei_vrp_display_lldp_neighbor
huawei_vrp_display_lldp_neighbor to normalize
- replace REMOTE_MANAGEMENT_ADDRESS with MGMT_ADDRESS in hp_procurve_show_lldp_info_remote-device_detail - replace MGMT_ADDR with MGMT_ADDRESS in aruba_aoscx_show_lldp_neighbors-info_detail - replace MGMT_IP with MGMT_ADDRESS in cisco_nxos and cisco_xr cdp template - replace MANAGEMENT_IP with MGMT_ADDRESS in several templates Note: Chose not to include "IP" in the capture group name because Arista data sometimes includes Ethernet MAC addresses
…ighbors_detail add mgmt_address to data_model.md
broadcom_icos_show_lldp_remote-device_all to normalize
brocade_netiron show_lldp_neighbors_detail templates
- HOLD_TIME > HOLDTIME in brocade_fastiron_show_lldp_neighbors - VERSION > NEIGHBOR_DESCRIPTION in cisco_nxos_show_cdp_neighbors_detail - VERSION > NEIGHBOR_DESCRIPTION in cisco_xr_show_cdp_neighbors_detail
mjbear
force-pushed
the
normalize_cap_grp_cdp_lldp
branch
from
96d0b91 to
fb98a56
Compare
|
This has been rebased. |
jvanderaa
approved these changes
Jun 21, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Normalization across several "discovery protocols", largely CDP and LLDP (though I did find broadcom_icos had ISDP as well). This huge effort started as a comment on #1405 and includes numerous capture group changes so it is likely the community will notice the breaking changes this PR brings.
Based off of #1468 so capture group documentation would end up in
data_model.mdTo the community: If I broke something, point it out, if I have time chances are I'll take ownership and fix it, but if not please realize I had good intentions and submit fix(es) in PR(s) to
ntc-templates.Hopefully all of this normalization brings positive change and improved usability for the project in the long term.
NOTE: it does seem like example raw Cisco IOS LLDP output had some data seemingly swapped (whether that's the LLDP sending or receiving end), but we end up with the output we have.