From 19242269bb66e8b0687c1cfb26df566dddbc0620 Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sat, 2 Sep 2023 16:09:26 -0400 Subject: [PATCH 01/41] replace LOCAL_PORT with LOCAL_INTERFACE in CDP/LLDP templates to normalize --- ...sta_eos_show_lldp_neighbors_detail.textfsm | 4 +- ...cx_show_lldp_neighbors-info_detail.textfsm | 4 +- ...isco_ios_show_cdp_neighbors_detail.textfsm | 4 +- ...sco_nxos_show_cdp_neighbors_detail.textfsm | 4 +- ..._wlc_ssh_show_cdp_neighbors_detail.textfsm | 4 +- ...cisco_xr_show_cdp_neighbors_detail.textfsm | 4 +- ...procurve_show_cdp_neighbors_detail.textfsm | 4 +- ...curve_show_lldp_info_remote-device.textfsm | 8 +- ...how_lldp_info_remote-device_detail.textfsm | 4 +- .../arista_eos_show_lldp_neighbors_detail.yml | 188 +++++++++--------- .../show_lldp_neighbors-info_detail.yml | 60 +++--- .../cisco_ios_show_cdp_neighbors_detail.yml | 40 ++-- .../cisco_ios_show_cdp_neighbors_detail2.yml | 6 +- .../cisco_nxos_show_cdp_neighbors_detail.yml | 38 ++-- .../cisco_nxos_show_cdp_neighbors_detail1.yml | 33 +-- .../cisco_nxos_show_cdp_neighbors_detail2.yml | 8 +- ..._show_cdp_neighbors_detail_move_record.yml | 20 +- ...isco_wlc_ssh_show_cdp_neighbors_detail.yml | 30 +-- .../cisco_xr_show_cdp_neighbors_detail.yml | 144 +++++++------- .../hp_procurve_show_cdp_neighbors_detail.yml | 24 +-- ..._procurve_show_lldp_info_remote-device.yml | 16 +- ...ve_show_lldp_info_remote-device_detail.yml | 32 +-- 22 files changed, 340 insertions(+), 339 deletions(-) diff --git a/ntc_templates/templates/arista_eos_show_lldp_neighbors_detail.textfsm b/ntc_templates/templates/arista_eos_show_lldp_neighbors_detail.textfsm index 0425d376b8..065fa61774 100644 --- a/ntc_templates/templates/arista_eos_show_lldp_neighbors_detail.textfsm +++ b/ntc_templates/templates/arista_eos_show_lldp_neighbors_detail.textfsm @@ -3,12 +3,12 @@ Value SYSTEM_ID (.+?) Value MGMT_ADDRESS (.+?) Value PLATFORM_VERSION (.+?) Value REMOTE_PORT (.+?) -Value Filldown LOCAL_PORT (\S+?) +Value Filldown LOCAL_INTERFACE (\S+?) Value Filldown NEIGH_COUNT ([1-9]\d*) Value AGE (.+?) Start - ^\S+\s+${LOCAL_PORT}\s+\S+\s+${NEIGH_COUNT}.* + ^\S+\s+${LOCAL_INTERFACE}\s+\S+\s+${NEIGH_COUNT}.* ^.*age\s+${AGE}$$ -> Interface Interface diff --git a/ntc_templates/templates/aruba_aoscx_show_lldp_neighbors-info_detail.textfsm b/ntc_templates/templates/aruba_aoscx_show_lldp_neighbors-info_detail.textfsm index 3c67334b12..edb8d88dac 100644 --- a/ntc_templates/templates/aruba_aoscx_show_lldp_neighbors-info_detail.textfsm +++ b/ntc_templates/templates/aruba_aoscx_show_lldp_neighbors-info_detail.textfsm @@ -1,4 +1,4 @@ -Value Required LOCAL_PORT (\S+) +Value Required LOCAL_INTERFACE (\S+) Value Required CHASSIS_ID (\S+) Value CHASSIS_NAME (\S+) Value CHASSIS_DESC (.+) @@ -10,7 +10,7 @@ Value PORT_DESC (\S+) Start - ^Port\s*:\s*${LOCAL_PORT} + ^Port\s*:\s*${LOCAL_INTERFACE} ^Neighbor\s*Chassis-Name\s*:\s*${CHASSIS_NAME} ^Neighbor\s+System-Name\s*:\s*${CHASSIS_NAME} ^Neighbor\s*Chassis-Description\s*:\s*${CHASSIS_DESC} diff --git a/ntc_templates/templates/cisco_ios_show_cdp_neighbors_detail.textfsm b/ntc_templates/templates/cisco_ios_show_cdp_neighbors_detail.textfsm index 95c72275df..6bcf5787c9 100644 --- a/ntc_templates/templates/cisco_ios_show_cdp_neighbors_detail.textfsm +++ b/ntc_templates/templates/cisco_ios_show_cdp_neighbors_detail.textfsm @@ -2,7 +2,7 @@ Value Required DESTINATION_HOST (\S+) Value MANAGEMENT_IP (\d+\.\d+\.\d+\.\d+|\w+\.\w+\.\w+) Value PLATFORM (.*) Value REMOTE_PORT (.*) -Value LOCAL_PORT (.*) +Value LOCAL_INTERFACE (.*) Value SOFTWARE_VERSION (.*$) Value CAPABILITIES (.+?) @@ -11,7 +11,7 @@ Start ^Entry address\(es\)\s*:\s* -> ParseIP ^Platform\s*:\s*${PLATFORM}\s*,\s*Capabilities\s*:\s*${CAPABILITIES}\s+$$ ^Platform\s*:\s*${PLATFORM}\s*,\s*Capabilities\s*:\s*${CAPABILITIES}$$ - ^Interface: ${LOCAL_PORT}, Port ID \(outgoing port\): ${REMOTE_PORT} + ^Interface: ${LOCAL_INTERFACE}, Port ID \(outgoing port\): ${REMOTE_PORT} ^Version : -> GetVersion # Capture time-stamp if vty line has command time-stamping turned on ^Load\s+for\s+ diff --git a/ntc_templates/templates/cisco_nxos_show_cdp_neighbors_detail.textfsm b/ntc_templates/templates/cisco_nxos_show_cdp_neighbors_detail.textfsm index 645e08985f..de0a3bf8a4 100644 --- a/ntc_templates/templates/cisco_nxos_show_cdp_neighbors_detail.textfsm +++ b/ntc_templates/templates/cisco_nxos_show_cdp_neighbors_detail.textfsm @@ -3,7 +3,7 @@ Value SYSNAME (.*) Value MGMT_IP (.*) Value PLATFORM (.*) Value REMOTE_PORT (.*) -Value LOCAL_PORT (.*) +Value LOCAL_INTERFACE (.*) Value VERSION (.*) Value INTERFACE_IP (.*) Value CAPABILITIES (.*[^\s]) @@ -15,7 +15,7 @@ Start ^Interface address\(es\):\s*(^[1-9]\d*|$$) -> GetInterfaceIP ^Mgmt address\(es\): -> GetIP ^Platform: ${PLATFORM}, Capabilities: ${CAPABILITIES}\s*$$ - ^Interface: ${LOCAL_PORT}, Port ID \(outgoing port\): ${REMOTE_PORT} + ^Interface: ${LOCAL_INTERFACE}, Port ID \(outgoing port\): ${REMOTE_PORT} ^Version: -> GetVersion GetIP diff --git a/ntc_templates/templates/cisco_wlc_ssh_show_cdp_neighbors_detail.textfsm b/ntc_templates/templates/cisco_wlc_ssh_show_cdp_neighbors_detail.textfsm index 7b1b8ac54f..4209283eca 100644 --- a/ntc_templates/templates/cisco_wlc_ssh_show_cdp_neighbors_detail.textfsm +++ b/ntc_templates/templates/cisco_wlc_ssh_show_cdp_neighbors_detail.textfsm @@ -2,7 +2,7 @@ Value Required DESTINATION_HOST (\S+) Value MANAGEMENT_IP (\d+\.\d+\.\d+\.\d+|\w+\.\w+\.\w+) Value PLATFORM (.*) Value REMOTE_PORT (.*) -Value LOCAL_PORT (.*) +Value LOCAL_INTERFACE (.*) Value SOFTWARE_VERSION (.*$) Value CAPABILITIES (.*) @@ -10,7 +10,7 @@ Start ^Device ID: ${DESTINATION_HOST} ^Entry address\(es\)\s*:\s* -> ParseIP ^Platform\s*:\s*${PLATFORM}\s*,\s*Capabilities\s*:\s*${CAPABILITIES} - ^Interface: ${LOCAL_PORT}, Port ID \(outgoing port\): ${REMOTE_PORT} + ^Interface: ${LOCAL_INTERFACE}, Port ID \(outgoing port\): ${REMOTE_PORT} ^Version : -> GetVersion ParseIP diff --git a/ntc_templates/templates/cisco_xr_show_cdp_neighbors_detail.textfsm b/ntc_templates/templates/cisco_xr_show_cdp_neighbors_detail.textfsm index 1ea80985d4..04dbf3b121 100644 --- a/ntc_templates/templates/cisco_xr_show_cdp_neighbors_detail.textfsm +++ b/ntc_templates/templates/cisco_xr_show_cdp_neighbors_detail.textfsm @@ -3,7 +3,7 @@ Value SYSNAME (.*) Value MGMT_IP (.*) Value PLATFORM (.*) Value REMOTE_PORT (.*) -Value LOCAL_PORT (.*) +Value LOCAL_INTERFACE (.*) Value VERSION (.*) Value CAPABILITIES (.*) @@ -12,7 +12,7 @@ Start ^SysName : ${SYSNAME} ^Entry address\(es\): -> GetIP ^Platform: ${PLATFORM}, Capabilities: ${CAPABILITIES} - ^Interface: ${LOCAL_PORT} + ^Interface: ${LOCAL_INTERFACE} ^Port ID \(outgoing port\): ${REMOTE_PORT} ^Version : -> GetVersion diff --git a/ntc_templates/templates/hp_procurve_show_cdp_neighbors_detail.textfsm b/ntc_templates/templates/hp_procurve_show_cdp_neighbors_detail.textfsm index 9f67c53697..720e2e3a4a 100644 --- a/ntc_templates/templates/hp_procurve_show_cdp_neighbors_detail.textfsm +++ b/ntc_templates/templates/hp_procurve_show_cdp_neighbors_detail.textfsm @@ -1,4 +1,4 @@ -Value Required LOCAL_PORT (.+?) +Value Required LOCAL_INTERFACE (.+?) Value NEIGHBOR_ID (.+?) Value NEIGHBOR_ADDRESS (.+?) Value NEIGHBOR_PLATFORM (.+?) @@ -8,7 +8,7 @@ Value NEIGHBOR_VERSION (.+?) Start ^\s*CDP\s+neighbors\s+information - ^\s*Port\s*:\s*${LOCAL_PORT}\s*$$ + ^\s*Port\s*:\s*${LOCAL_INTERFACE}\s*$$ ^\s*Device\s+ID\s*:\s*${NEIGHBOR_ID}\s*$$ ^\s*Address\s+Type ^\s*Address\s*:\s*${NEIGHBOR_ADDRESS}\s*$$ diff --git a/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device.textfsm b/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device.textfsm index d2c5e956a2..f5bf9d3a31 100644 --- a/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device.textfsm +++ b/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device.textfsm @@ -1,4 +1,4 @@ -Value Required LOCAL_PORT (\S+) +Value Required LOCAL_INTERFACE (\S+) Value NEIGHBOR_CHASSIS_ID ((?:[a-z0-9]{2}\s){5}[a-z0-9]{2}|\S+) Value NEIGHBOR_PORTID ((?:[a-z0-9]{2}\s){5}[a-z0-9]{2}|\S+) Value NEIGHBOR_DESCR (\S+|.*?) @@ -12,9 +12,9 @@ Start ^. -> Error LLDP - ^\s+${LOCAL_PORT}\s+\|\s${NEIGHBOR_CHASSIS_ID}\s+${NEIGHBOR_PORTID}\s*$$ -> Record - ^\s+${LOCAL_PORT}\s+\|\s${NEIGHBOR_CHASSIS_ID}\s+${NEIGHBOR_PORTID}\s+${NEIGHBOR_SYSNAME}\s*$$ -> Record - ^\s+${LOCAL_PORT}\s+\|\s${NEIGHBOR_CHASSIS_ID}\s+${NEIGHBOR_PORTID}\s+${NEIGHBOR_DESCR}\s+${NEIGHBOR_SYSNAME}\s*$$ -> Record + ^\s+${LOCAL_INTERFACE}\s+\|\s${NEIGHBOR_CHASSIS_ID}\s+${NEIGHBOR_PORTID}\s*$$ -> Record + ^\s+${LOCAL_INTERFACE}\s+\|\s${NEIGHBOR_CHASSIS_ID}\s+${NEIGHBOR_PORTID}\s+${NEIGHBOR_SYSNAME}\s*$$ -> Record + ^\s+${LOCAL_INTERFACE}\s+\|\s${NEIGHBOR_CHASSIS_ID}\s+${NEIGHBOR_PORTID}\s+${NEIGHBOR_DESCR}\s+${NEIGHBOR_SYSNAME}\s*$$ -> Record ^\S+\#\s*$$ ^\s*$$ ^. -> Error diff --git a/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device_detail.textfsm b/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device_detail.textfsm index 8d9cbe51ec..13aa7e657c 100644 --- a/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device_detail.textfsm +++ b/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device_detail.textfsm @@ -1,4 +1,4 @@ -Value Required LOCAL_PORT (\S+) +Value Required LOCAL_INTERFACE (\S+) Value NEIGHBOR_CHASSIS_TYPE (\S+) Value NEIGHBOR_CHASSIS_ID ([a-f0-9]{6}-[a-f0-9]{6}|(?:[a-z0-9]{2}\s){5}[a-z0-9]{2}|\S+) Value PORT_TYPE (\S+) @@ -17,7 +17,7 @@ Start ^. -> Error LLDP - ^\s+Local\sPort\s+:\s${LOCAL_PORT}\s*$$ + ^\s+Local\sPort\s+:\s${LOCAL_INTERFACE}\s*$$ ^\s+ChassisType\s+:\s${NEIGHBOR_CHASSIS_TYPE}\s*$$ ^\s+ChassisId\s+:\s${NEIGHBOR_CHASSIS_ID}\s*$$ ^\s+PortType\s+:\s${PORT_TYPE}\s*$$ diff --git a/tests/arista_eos/show_lldp_neighbors_detail/arista_eos_show_lldp_neighbors_detail.yml b/tests/arista_eos/show_lldp_neighbors_detail/arista_eos_show_lldp_neighbors_detail.yml index 732b00ea7c..78dede1047 100644 --- a/tests/arista_eos/show_lldp_neighbors_detail/arista_eos_show_lldp_neighbors_detail.yml +++ b/tests/arista_eos/show_lldp_neighbors_detail/arista_eos_show_lldp_neighbors_detail.yml @@ -1,181 +1,181 @@ --- parsed_sample: - - dest_host: "spine2.company.com" - system_id: "2cc2.6081.eaf9" + - age: "12 seconds" + dest_host: "spine2.company.com" + local_interface: "Ethernet1" mgmt_address: "2cc2.6081.eaf9" + neigh_count: "1" platform_version: "Arista Networks EOS version 4.15.2F running on an Arista Networks\ \ vEOS" remote_port: "Ethernet1" - local_port: "Ethernet1" - neigh_count: "1" - age: "12 seconds" - - dest_host: "spine2.company.com" system_id: "2cc2.6081.eaf9" + - age: "12 seconds" + dest_host: "spine2.company.com" + local_interface: "Ethernet2" mgmt_address: "2cc2.6081.eaf9" + neigh_count: "1" platform_version: "Arista Networks EOS version 4.15.2F running on an Arista Networks\ \ vEOS" remote_port: "Ethernet2" - local_port: "Ethernet2" - neigh_count: "1" - age: "12 seconds" - - dest_host: "spine2.company.com" system_id: "2cc2.6081.eaf9" + - age: "12 seconds" + dest_host: "spine2.company.com" + local_interface: "Ethernet3" mgmt_address: "2cc2.6081.eaf9" + neigh_count: "1" platform_version: "Arista Networks EOS version 4.15.2F running on an Arista Networks\ \ vEOS" remote_port: "Ethernet3" - local_port: "Ethernet3" - neigh_count: "1" - age: "12 seconds" - - dest_host: "spine2.company.com" system_id: "2cc2.6081.eaf9" + - age: "12 seconds" + dest_host: "spine2.company.com" + local_interface: "Ethernet4" mgmt_address: "2cc2.6081.eaf9" + neigh_count: "1" platform_version: "Arista Networks EOS version 4.15.2F running on an Arista Networks\ \ vEOS" remote_port: "Ethernet4" - local_port: "Ethernet4" - neigh_count: "1" - age: "12 seconds" - - dest_host: "vmx1" - system_id: "0005.8671.4ec0" + system_id: "2cc2.6081.eaf9" + - age: "27 seconds" + dest_host: "vmx1" + local_interface: "Management1" mgmt_address: "10.0.0.31" + neigh_count: "2" platform_version: "Juniper Networks, Inc. vmx internet router, kernel JUNOS 15.1F4.15,\ \ Build date: 2015-12-23 19:22:55 UTC Copyright (c) 1996-2015 Juniper Networks,\ \ Inc." remote_port: "fxp0" - local_port: "Management1" - neigh_count: "2" - age: "27 seconds" - - dest_host: "spine2.company.com" - system_id: "2cc2.6081.eaf9" + system_id: "0005.8671.4ec0" + - age: "17 seconds" + dest_host: "spine2.company.com" + local_interface: "Management1" mgmt_address: "2cc2.6081.eaf9" + neigh_count: "2" platform_version: "Arista Networks EOS version 4.15.2F running on an Arista Networks\ \ vEOS" remote_port: "Management1" - local_port: "Management1" - neigh_count: "2" - age: "17 seconds" - - dest_host: "cvx" - system_id: "0050.56eb.3ef3" + system_id: "2cc2.6081.eaf9" + - age: "4 seconds" + dest_host: "cvx" + local_interface: "Ethernet8" mgmt_address: "172.16.2.141" + neigh_count: "3" platform_version: "Arista Networks EOS version 4.15.5M running on an Arista Networks\ \ CVX" remote_port: "Management1" - local_port: "Ethernet8" - neigh_count: "3" - age: "4 seconds" - - dest_host: "cvx-client-1" - system_id: "0050.568b.67c8" + system_id: "0050.56eb.3ef3" + - age: "29 seconds" + dest_host: "cvx-client-1" + local_interface: "Ethernet8" mgmt_address: "172.16.2.142" + neigh_count: "3" platform_version: "Arista Networks EOS version 4.15.5M running on an Arista Networks\ \ CVX" remote_port: "Ethernet1" - local_port: "Ethernet8" - neigh_count: "3" - age: "29 seconds" - - dest_host: "cvx-client-1" system_id: "0050.568b.67c8" + - age: "30 seconds" + dest_host: "cvx-client-1" + local_interface: "Ethernet8" mgmt_address: "172.16.2.142" + neigh_count: "3" platform_version: "Arista Networks EOS version 4.15.5M running on an Arista Networks\ \ CVX" remote_port: "Management1" - local_port: "Ethernet8" - neigh_count: "3" - age: "30 seconds" - - dest_host: "Leaf1.cliqr.com" - system_id: "7c0e.cecb.659b" + system_id: "0050.568b.67c8" + - age: "29 seconds" + dest_host: "Leaf1.cliqr.com" + local_interface: "Ethernet9" mgmt_address: "7c0e.cecb.659b" + neigh_count: "1" platform_version: "topology/pod-1/node-101" remote_port: "Eth1/23" - local_port: "Ethernet9" - neigh_count: "1" - age: "29 seconds" - - dest_host: "Leaf1.cliqr.com" - system_id: "7c0e.cecb.659c" + system_id: "7c0e.cecb.659b" + - age: "29 seconds" + dest_host: "Leaf1.cliqr.com" + local_interface: "Ethernet10" mgmt_address: "7c0e.cecb.659c" + neigh_count: "1" platform_version: "topology/pod-1/node-101" remote_port: "Eth1/24" - local_port: "Ethernet10" - neigh_count: "1" - age: "29 seconds" - - dest_host: "MX" - system_id: "3c8a.b089.9898" + system_id: "7c0e.cecb.659c" + - age: "21 seconds" + dest_host: "MX" + local_interface: "Ethernet23" mgmt_address: "" + neigh_count: "1" platform_version: "Juniper Networks, Inc. mx5-t internet router, kernel JUNOS\ \ 14.2R5.8, Build date: 2015-11-25 01:57:41 UTC Copyright (c) 1996-2015 Juniper\ \ Networks, Inc." remote_port: "527" - local_port: "Ethernet23" - neigh_count: "1" - age: "21 seconds" - - dest_host: "cvx-client-2" - system_id: "0050.560b.66ea" + system_id: "3c8a.b089.9898" + - age: "29 seconds" + dest_host: "cvx-client-2" + local_interface: "Ethernet33" mgmt_address: "172.16.2.143" + neigh_count: "4" platform_version: "Arista Networks EOS version 4.15.5M running on an Arista Networks\ \ CVX" remote_port: "Management1" - local_port: "Ethernet33" - neigh_count: "4" - age: "29 seconds" - - dest_host: "cvx-client-2" system_id: "0050.560b.66ea" + - age: "29 seconds" + dest_host: "cvx-client-2" + local_interface: "Ethernet33" mgmt_address: "172.16.2.143" + neigh_count: "4" platform_version: "Arista Networks EOS version 4.15.5M running on an Arista Networks\ \ CVX" remote_port: "Ethernet1" - local_port: "Ethernet33" - neigh_count: "4" - age: "29 seconds" - - dest_host: "aci-compute" - system_id: "0050.56ac.4cd9" + system_id: "0050.560b.66ea" + - age: "29 seconds" + dest_host: "aci-compute" + local_interface: "Ethernet33" mgmt_address: "fe80::250:56ff:feac:4cd9" + neigh_count: "4" platform_version: "Red Hat Enterprise Linux Linux 3.10.0-327.13.1.el7.x86_64 #1\ \ SMP Mon Feb 29 13:22:02 EST 2016 x86_64" remote_port: "0050.56ac.4cd9" - local_port: "Ethernet33" - neigh_count: "4" - age: "29 seconds" - - dest_host: "aci-control" - system_id: "0050.56ac.4e29" + system_id: "0050.56ac.4cd9" + - age: "29 seconds" + dest_host: "aci-control" + local_interface: "Ethernet33" mgmt_address: "fe80::250:56ff:feac:4e29" + neigh_count: "4" platform_version: "Red Hat Enterprise Linux Linux 3.10.0-327.13.1.el7.x86_64 #1\ \ SMP Mon Feb 29 13:22:02 EST 2016 x86_64" remote_port: "0050.56ac.4e29" - local_port: "Ethernet33" - neigh_count: "4" - age: "29 seconds" - - dest_host: "R4-Arista-L3-SDNLAB-SW1" - system_id: "001c.737d.77fb" + system_id: "0050.56ac.4e29" + - age: "19 seconds" + dest_host: "R4-Arista-L3-SDNLAB-SW1" + local_interface: "Ethernet49/1" mgmt_address: "2.2.2.2" + neigh_count: "1" platform_version: "Arista Networks EOS version 4.15.0FXA running on an Arista\ \ Networks DCS-7050SX-64" remote_port: "Ethernet49/1" - local_port: "Ethernet49/1" - neigh_count: "1" - age: "19 seconds" - - dest_host: "R4-Arista-L3-SDNLAB-SW2" - system_id: "001c.737d.745f" + system_id: "001c.737d.77fb" + - age: "28 seconds" + dest_host: "R4-Arista-L3-SDNLAB-SW2" + local_interface: "Ethernet51/1" mgmt_address: "172.16.1.3" + neigh_count: "1" platform_version: "Arista Networks EOS version 4.15.0FXA running on an Arista\ \ Networks DCS-7050SX-64" remote_port: "Ethernet49/1" - local_port: "Ethernet51/1" - neigh_count: "1" - age: "28 seconds" - - dest_host: "R4-Arista-L3-SDNLAB-SW2" system_id: "001c.737d.745f" + - age: "28 seconds" + dest_host: "R4-Arista-L3-SDNLAB-SW2" + local_interface: "Ethernet52/1" mgmt_address: "172.16.1.3" + neigh_count: "1" platform_version: "Arista Networks EOS version 4.15.0FXA running on an Arista\ \ Networks DCS-7050SX-64" remote_port: "Ethernet50/1" - local_port: "Ethernet52/1" - neigh_count: "1" - age: "28 seconds" - - dest_host: "test-host.domain.com" - system_id: "0cca.01c0.e8e1" + system_id: "001c.737d.745f" + - age: "2 seconds" + dest_host: "test-host.domain.com" + local_interface: "Management1" mgmt_address: "172.16.208.5" + neigh_count: "1" platform_version: "" remote_port: "Management1" - local_port: "Management1" - neigh_count: "1" - age: "2 seconds" + system_id: "0cca.01c0.e8e1" diff --git a/tests/aruba_aoscx/show_lldp_neighbors-info_detail/show_lldp_neighbors-info_detail.yml b/tests/aruba_aoscx/show_lldp_neighbors-info_detail/show_lldp_neighbors-info_detail.yml index 2626b5fbf8..7c7fb2e6e9 100644 --- a/tests/aruba_aoscx/show_lldp_neighbors-info_detail/show_lldp_neighbors-info_detail.yml +++ b/tests/aruba_aoscx/show_lldp_neighbors-info_detail/show_lldp_neighbors-info_detail.yml @@ -1,56 +1,56 @@ --- parsed_sample: - - local_port: "1/1/1" + - capabilities: "Bridge, WLAN" + capabilities_enabled: "WLAN" + chassis_desc: "ArubaOS (MODEL: 335), Version Aruba AP" chassis_id: "70:3a:0e:cd:41:fe" chassis_name: "ap-9999-335-fe" - chassis_desc: "ArubaOS (MODEL: 335), Version Aruba AP" - capabilities: "Bridge, WLAN" - capabilities_enabled: "WLAN" + local_interface: "1/1/1" mgmt_addr: "10.252.99.12" - port_id: "70:3a:0e:cd:41:fe" port_desc: "eth0" - - local_port: "1/1/2" + port_id: "70:3a:0e:cd:41:fe" + - capabilities: "Bridge, WLAN" + capabilities_enabled: "WLAN" + chassis_desc: "ArubaOS (MODEL: 535), Version Aruba AP" chassis_id: "00:4e:35:c5:d2:2e" chassis_name: "ap-9999-535-fe" - chassis_desc: "ArubaOS (MODEL: 535), Version Aruba AP" - capabilities: "Bridge, WLAN" - capabilities_enabled: "WLAN" + local_interface: "1/1/2" mgmt_addr: "10.252.99.11" - port_id: "00:4e:35:c5:d2:2e" port_desc: "eth0" - - local_port: "1/1/52" + port_id: "00:4e:35:c5:d2:2e" + - capabilities: "Bridge, Router" + capabilities_enabled: "Bridge, Router" + chassis_desc: "Aruba JL635A GL.10.05.0021" chassis_id: "90:20:c2:bf:ae:00" chassis_name: "rtr-agg-0620-a" - chassis_desc: "Aruba JL635A GL.10.05.0021" - capabilities: "Bridge, Router" - capabilities_enabled: "Bridge, Router" + local_interface: "1/1/52" mgmt_addr: "10.252.15.17" - port_id: "1/1/1" port_desc: "1/1/1" - - local_port: "2/1/1" + port_id: "1/1/1" + - capabilities: "Bridge, WLAN" + capabilities_enabled: "WLAN" + chassis_desc: "ArubaOS (MODEL: 335), Version Aruba AP" chassis_id: "70:3a:0e:cd:41:fe" chassis_name: "ap-9999-335-fe" - chassis_desc: "ArubaOS (MODEL: 335), Version Aruba AP" - capabilities: "Bridge, WLAN" - capabilities_enabled: "WLAN" + local_interface: "2/1/1" mgmt_addr: "10.252.99.12" - port_id: "70:3a:0e:cd:41:ff" port_desc: "eth1" - - local_port: "2/1/2" + port_id: "70:3a:0e:cd:41:ff" + - capabilities: "Bridge, WLAN" + capabilities_enabled: "WLAN" + chassis_desc: "ArubaOS (MODEL: 535), Version Aruba AP" chassis_id: "00:4e:35:c5:d2:2e" chassis_name: "ap-9999-535-fe" - chassis_desc: "ArubaOS (MODEL: 535), Version Aruba AP" - capabilities: "Bridge, WLAN" - capabilities_enabled: "WLAN" + local_interface: "2/1/2" mgmt_addr: "10.252.99.11" - port_id: "00:4e:35:c5:d2:2f" port_desc: "eth1" - - local_port: "2/1/52" + port_id: "00:4e:35:c5:d2:2f" + - capabilities: "Bridge, Router" + capabilities_enabled: "Bridge, Router" + chassis_desc: "Aruba JL635A GL.10.05.0021" chassis_id: "90:20:c2:bf:ed:00" chassis_name: "rtr-agg-0620-b" - chassis_desc: "Aruba JL635A GL.10.05.0021" - capabilities: "Bridge, Router" - capabilities_enabled: "Bridge, Router" + local_interface: "2/1/52" mgmt_addr: "10.252.15.18" - port_id: "1/1/1" port_desc: "1/1/1" + port_id: "1/1/1" diff --git a/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail.yml b/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail.yml index d5490d91e6..5abe7df841 100644 --- a/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail.yml +++ b/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail.yml @@ -1,35 +1,35 @@ --- parsed_sample: - - platform: "cisco WS-C2960-8TC-L" + - capabilities: "Switch IGMP" + destination_host: "desktop-switch" + local_interface: "GigabitEthernet1/0/16" management_ip: "10.1.1.2" + platform: "cisco WS-C2960-8TC-L" + remote_port: "GigabitEthernet0/1" software_version: "Cisco IOS Software, C2960 Software (C2960-LANBASEK9-M), Version\ \ 12.2(55)SE9, RELEASE SOFTWARE (fc1)" - destination_host: "desktop-switch" - remote_port: "GigabitEthernet0/1" - local_port: "GigabitEthernet1/0/16" - capabilities: "Switch IGMP" - - platform: "Cisco 3825" + - capabilities: "Router Switch IGMP" + destination_host: "ce-router" + local_interface: "GigabitEthernet1/0/22" management_ip: "10.1.1.1" + platform: "Cisco 3825" + remote_port: "GigabitEthernet0/0" software_version: "Cisco IOS Software, 3800 Software (C3825-ADVENTERPRISEK9-M),\ \ Version 12.4(24)T1, RELEASE SOFTWARE (fc3)" - destination_host: "ce-router" - remote_port: "GigabitEthernet0/0" - local_port: "GigabitEthernet1/0/22" - capabilities: "Router Switch IGMP" - - platform: "VMware" + - capabilities: "Host" + destination_host: "server" + local_interface: "GigabitEthernet1/0/19" management_ip: "10.1.1.232" + platform: "VMware" + remote_port: "eth0" software_version: "Linux 2.6.32-431.20.3.el6.x86_64 #1 SMP Fri Jun 6 18:30:54\ \ EDT 2014 CCM:10.5.2.10000-5.i386" - destination_host: "server" - remote_port: "eth0" - local_port: "GigabitEthernet1/0/19" - capabilities: "Host" - - platform: "Cisco " + - capabilities: "Router Switch IGMP" + destination_host: "vIOS-L2-1" + local_interface: "GigabitEthernet0/3" management_ip: "" + platform: "Cisco " + remote_port: "GigabitEthernet0/3" software_version: "Cisco IOS Software, vios_l2 Software (vios_l2-ADVENTERPRISEK9-M),\ \ Version 15.2(CML_NIGHTLY_20150414)FLO_DSGS7, EARLY DEPLOYMENT DEVELOPMENT\ \ BUILD, synced to DSGS_PI5_POSTCOLLAPSE_TEAM_TRACK_CLONE" - destination_host: "vIOS-L2-1" - remote_port: "GigabitEthernet0/3" - local_port: "GigabitEthernet0/3" - capabilities: "Router Switch IGMP" diff --git a/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail2.yml b/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail2.yml index a41866de2c..23b256af0b 100644 --- a/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail2.yml +++ b/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail2.yml @@ -1,10 +1,10 @@ --- parsed_sample: - - destination_host: "switchxxxxx" + - capabilities: "Switch IGMP" + destination_host: "switchxxxxx" + local_interface: "GigabitEthernet0/3" management_ip: "1.1.1.1" platform: "cisco WS-C3560X-24P" remote_port: "GigabitEthernet0/8" - local_port: "GigabitEthernet0/3" software_version: "Cisco IOS Software, C3560E Software (C3560E-UNIVERSALK9-M),\ \ Version 12.2(55)SE10, RELEASE SOFTWARE (fc2)" - capabilities: "Switch IGMP" diff --git a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail.yml b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail.yml index 0ab9ac3026..ba11571abe 100644 --- a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail.yml +++ b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail.yml @@ -1,48 +1,48 @@ --- parsed_sample: - - dest_host: "PERIMETER" - local_port: "mgmt0" + - capabilities: "Router Switch IGMP Filtering" + dest_host: "PERIMETER" + interface_ip: "10.1.100.1" + local_interface: "mgmt0" mgmt_ip: "10.1.100.1" platform: "cisco WS-C3750-48TS" remote_port: "FastEthernet1/0/32" sysname: "" version: "Cisco IOS Software, C3750 Software (C3750-IPBASEK9-M), Version 12.2(44)SE2,\ \ RELEASE SOFTWARE (fc2)" - interface_ip: "10.1.100.1" - capabilities: "Router Switch IGMP Filtering" - - dest_host: "dc-lf03(SAL19069XXX)" - local_port: "Ethernet1/1" + - capabilities: "Router Switch IGMP Filtering Supports-STP-Dispute" + dest_host: "dc-lf03(SAL19069XXX)" + interface_ip: "10.1.100.226" + local_interface: "Ethernet1/1" mgmt_ip: "10.1.100.226" platform: "N9K-C9372TX" remote_port: "Ethernet1/1" sysname: "dc-lf03" version: "Cisco Nexus Operating System (NX-OS) Software, Version 7.0(3)I5(1)" + - capabilities: "Router Switch IGMP Filtering Supports-STP-Dispute" + dest_host: "dc-lf03(SAL1906XXXX)" interface_ip: "10.1.100.226" - capabilities: "Router Switch IGMP Filtering Supports-STP-Dispute" - - dest_host: "dc-lf03(SAL1906XXXX)" - local_port: "Ethernet1/3" + local_interface: "Ethernet1/3" mgmt_ip: "10.1.100.226" platform: "N9K-C9372TX" remote_port: "Ethernet1/3" sysname: "dc-lf03" version: "Cisco Nexus Operating System (NX-OS) Software, Version 7.0(3)I5(1)" - interface_ip: "10.1.100.226" - capabilities: "Router Switch IGMP Filtering Supports-STP-Dispute" - - dest_host: "dc-sp01(SAL19069XXX)" - local_port: "Ethernet1/49" + - capabilities: "Router Switch IGMP Filtering Supports-STP-Dispute" + dest_host: "dc-sp01(SAL19069XXX)" + interface_ip: "10.1.1.1" + local_interface: "Ethernet1/49" mgmt_ip: "10.1.100.222" platform: "N9K-C9372TX" remote_port: "Ethernet1/52" sysname: "dc-sp01" version: "Cisco Nexus Operating System (NX-OS) Software, Version 7.0(3)I2(2d)" - interface_ip: "10.1.1.1" - capabilities: "Router Switch IGMP Filtering Supports-STP-Dispute" - - dest_host: "dc-sp02(SAL19069XXX)" - local_port: "Ethernet1/50" + - capabilities: "Router Switch IGMP Filtering Supports-STP-Dispute" + dest_host: "dc-sp02(SAL19069XXX)" + interface_ip: "10.1.1.9" + local_interface: "Ethernet1/50" mgmt_ip: "10.1.100.223" platform: "N9K-C9372TX" remote_port: "Ethernet1/52" sysname: "dc-sp02" version: "Cisco Nexus Operating System (NX-OS) Software, Version 7.0(3)I2(2d)" - interface_ip: "10.1.1.9" - capabilities: "Router Switch IGMP Filtering Supports-STP-Dispute" diff --git a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail1.yml b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail1.yml index eeac035473..caa489b400 100644 --- a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail1.yml +++ b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail1.yml @@ -1,38 +1,39 @@ --- parsed_sample: - - dest_host: "DC3P01SW01.test.co.nz" - local_port: "mgmt0" + - capabilities: "Switch IGMP Filtering" + dest_host: "DC3P01SW01.test.co.nz" + interface_ip: "10.115.143.251" + local_interface: "mgmt0" mgmt_ip: "10.115.143.251" platform: "WS-C3560X-24" remote_port: "GigabitEthernet0/20" sysname: "" - version: "Cisco IOS Software, C3560E Software (C3560E-UNIVERSALK9-M), Version 12.2(55)SE5, RELEASE SOFTWARE (fc1)" - interface_ip: "10.115.143.251" - capabilities: "Switch IGMP Filtering" - - dest_host: "DC3TESTW01-55.test.co.nz(SSI3707070J)" - local_port: "Ethernet1/1" + version: "Cisco IOS Software, C3560E Software (C3560E-UNIVERSALK9-M), Version\ + \ 12.2(55)SE5, RELEASE SOFTWARE (fc1)" + - capabilities: "Router Switch IGMP Filtering Supports-STP-Dispute" + dest_host: "DC3TESTW01-55.test.co.nz(SSI3707070J)" + interface_ip: "10.115.17.253" + local_interface: "Ethernet1/1" mgmt_ip: "10.115.143.120" platform: "N5K-C5548UP" remote_port: "Ethernet1/31" sysname: "DC3TESTW01-55" version: "Cisco Nexus Operating System (NX-OS) Software, Version 5.2(1)N1(4)" - interface_ip: "10.115.17.253" - capabilities: "Router Switch IGMP Filtering Supports-STP-Dispute" - - dest_host: "DC3TESTW02.test.co.nz(SSI11111D2M)" - local_port: "Ethernet1/21" + - capabilities: "Switch IGMP Filtering Supports-STP-Dispute" + dest_host: "DC3TESTW02.test.co.nz(SSI11111D2M)" + interface_ip: "10.115.143.21" + local_interface: "Ethernet1/21" mgmt_ip: "10.115.143.21" platform: "N5K-C5020P-BF" remote_port: "Ethernet1/21" sysname: "DC3TESTW02" version: "Cisco Nexus Operating System (NX-OS) Software, Version 5.2(1)N1(4)" + - capabilities: "Switch IGMP Filtering Supports-STP-Dispute" + dest_host: "DC3TESTW02.test.co.nz(SSI44444D2M)" interface_ip: "10.115.143.21" - capabilities: "Switch IGMP Filtering Supports-STP-Dispute" - - dest_host: "DC3TESTW02.test.co.nz(SSI44444D2M)" - local_port: "Ethernet1/22" + local_interface: "Ethernet1/22" mgmt_ip: "10.115.143.21" platform: "N5K-C5020P-BF" remote_port: "Ethernet1/22" sysname: "DC3TESTW02" version: "Cisco Nexus Operating System (NX-OS) Software, Version 5.2(1)N1(4)" - interface_ip: "10.115.143.21" - capabilities: "Switch IGMP Filtering Supports-STP-Dispute" diff --git a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail2.yml b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail2.yml index fe8087a36f..931082f4f9 100644 --- a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail2.yml +++ b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail2.yml @@ -1,11 +1,11 @@ --- parsed_sample: - - dest_host: "MKT1" - local_port: "Ethernet1/1" + - capabilities: "Router" + dest_host: "MKT1" + interface_ip: "" + local_interface: "Ethernet1/1" mgmt_ip: "" platform: "MikroTik" remote_port: "ether1" sysname: "" version: "6.47.10 (long-term)" - interface_ip: "" - capabilities: "Router" diff --git a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail_move_record.yml b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail_move_record.yml index 1cb4b50399..4b235414b0 100644 --- a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail_move_record.yml +++ b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail_move_record.yml @@ -1,22 +1,22 @@ --- parsed_sample: - - dest_host: "redacted.test.com" - sysname: "" + - capabilities: "Switch IGMP Filtering" + dest_host: "redacted.test.com" + interface_ip: "10.0.0.1" + local_interface: "Ethernet7/14" mgmt_ip: "10.0.0.1" platform: "C9300-48UXM" remote_port: "TenGigabitEthernet1/1/7" - local_port: "Ethernet7/14" + sysname: "" version: "Cisco IOS Software [Everest], Catalyst L3 Switch Software (CAT9K_IOSXE),\ \ Version 16.6.6, RELEASE SOFTWARE (fc1)" - interface_ip: "10.0.0.1" - capabilities: "Switch IGMP Filtering" - - dest_host: "redacted.test.com" - sysname: "" + - capabilities: "Switch IGMP Filtering" + dest_host: "redacted.test.com" + interface_ip: "10.0.0.3" + local_interface: "Ethernet7/15" mgmt_ip: "10.0.0.4" platform: "C9300-48UXM" remote_port: "TenGigabitEthernet1/1/8" - local_port: "Ethernet7/15" + sysname: "" version: "Cisco IOS Software [Everest], Catalyst L3 Switch Software (CAT9K_IOSXE),\ \ Version 16.6.6, RELEASE SOFTWARE (fc1)" - interface_ip: "10.0.0.3" - capabilities: "Switch IGMP Filtering" diff --git a/tests/cisco_wlc_ssh/show_cdp_neighbors_detail/cisco_wlc_ssh_show_cdp_neighbors_detail.yml b/tests/cisco_wlc_ssh/show_cdp_neighbors_detail/cisco_wlc_ssh_show_cdp_neighbors_detail.yml index 6b7913a4f7..d352c17802 100644 --- a/tests/cisco_wlc_ssh/show_cdp_neighbors_detail/cisco_wlc_ssh_show_cdp_neighbors_detail.yml +++ b/tests/cisco_wlc_ssh/show_cdp_neighbors_detail/cisco_wlc_ssh_show_cdp_neighbors_detail.yml @@ -1,29 +1,29 @@ --- parsed_sample: - - platform: "N77-C7706" - management_ip: "1.2.3.4" - software_version: "Cisco Nexus Operating System (NX-OS) Software, Version 6.2(10)" + - capabilities: "Router Switch IGMP" destination_host: "AAA.pizza.com(FXS1828Q2JH)" + local_interface: "GigabitEthernet0/0/2" + management_ip: "1.2.3.4" + platform: "N77-C7706" remote_port: "Ethernet1/15" - local_port: "GigabitEthernet0/0/2" - capabilities: "Router Switch IGMP" - - platform: "cisco WS-C3750G-12S" + software_version: "Cisco Nexus Operating System (NX-OS) Software, Version 6.2(10)" + - capabilities: "Router Switch IGMP" + destination_host: "BBB.beer.com" + local_interface: "GigabitEthernet0/0/7" management_ip: "172.5.6.7" + platform: "cisco WS-C3750G-12S" + remote_port: "GigabitEthernet1/0/11" software_version: "Cisco IOS Software, C3750 Software (C3750-IPSERVICESK9-M),\ \ Version 12.2(55)SE11, RELEASE SOFTWARE (fc3) Technical Support: http://www.cisco.com/techsupport\ \ Copyright (c) 1986-2016 by Cisco Systems, Inc. Compiled Wed 17-Aug-16 13:28\ \ by prod_rel_team" - destination_host: "BBB.beer.com" - remote_port: "GigabitEthernet1/0/11" - local_port: "GigabitEthernet0/0/7" - capabilities: "Router Switch IGMP" - - platform: "cisco WS-C3750G-12S" + - capabilities: "Router Switch IGMP" + destination_host: "CCC.cake.com" + local_interface: "GigabitEthernet0/0/8" management_ip: "172.9.10.11" + platform: "cisco WS-C3750G-12S" + remote_port: "GigabitEthernet1/0/1" software_version: "Cisco IOS Software, C3750 Software (C3750-IPSERVICESK9-M),\ \ Version 12.2(55)SE11, RELEASE SOFTWARE (fc3) Technical Support: http://www.cisco.com/techsupport\ \ Copyright (c) 1986-2016 by Cisco Systems, Inc. Compiled Wed 17-Aug-16 13:28\ \ by prod_rel_team" - destination_host: "CCC.cake.com" - remote_port: "GigabitEthernet1/0/1" - local_port: "GigabitEthernet0/0/8" - capabilities: "Router Switch IGMP" diff --git a/tests/cisco_xr/show_cdp_neighbors_detail/cisco_xr_show_cdp_neighbors_detail.yml b/tests/cisco_xr/show_cdp_neighbors_detail/cisco_xr_show_cdp_neighbors_detail.yml index b8c155cd9a..234040a990 100644 --- a/tests/cisco_xr/show_cdp_neighbors_detail/cisco_xr_show_cdp_neighbors_detail.yml +++ b/tests/cisco_xr/show_cdp_neighbors_detail/cisco_xr_show_cdp_neighbors_detail.yml @@ -1,198 +1,198 @@ --- parsed_sample: - - dest_host: "nyc-dc-dcm005.ntc.com" - local_port: "MgmtEth0/RSP0/CPU0/0" + - capabilities: "Router Switch IGMP" + dest_host: "nyc-dc-dcm005.ntc.com" + local_interface: "MgmtEth0/RSP0/CPU0/0" mgmt_ip: "10.100.1.54" platform: "cisco WS-C4948E" remote_port: "GigabitEthernet1/9" sysname: "" version: "Cisco IOS Software, Catalyst 4500 L3 Switch Software (cat4500e-ENTSERVICESK9-M),\ \ Version 15.0(2)SG10, RELEASE SOFTWARE (fc1)" - capabilities: "Router Switch IGMP" - - dest_host: "nyc-dc-dcm006.ntc.com" - local_port: "MgmtEth0/RSP1/CPU0/0" + - capabilities: "Router Switch IGMP" + dest_host: "nyc-dc-dcm006.ntc.com" + local_interface: "MgmtEth0/RSP1/CPU0/0" mgmt_ip: "10.100.1.55" platform: "cisco WS-C4948E" remote_port: "GigabitEthernet1/9" sysname: "" version: "Cisco IOS Software, Catalyst 4500 L3 Switch Software (cat4500e-ENTSERVICESK9-M),\ \ Version 15.0(2)SG10, RELEASE SOFTWARE (fc1)" - capabilities: "Router Switch IGMP" - - dest_host: "nyc-dc-c90.ntc.com" - local_port: "FortyGigE0/0/1/0" + - capabilities: "Router Switch IGMP" + dest_host: "nyc-dc-c90.ntc.com" + local_interface: "FortyGigE0/0/1/0" mgmt_ip: "10.100.100.141" platform: "cisco CRS" remote_port: "FortyGigE0/0/0/2" sysname: "nyc-dc-c90.ntc.com" version: "Cisco IOS XR Software, Version 5.1.2[Default]" - capabilities: "Router Switch IGMP" - - dest_host: "nyc-dc-d02.ntc.com(FXS182XXXXX)" - local_port: "FortyGigE0/0/1/1" + - capabilities: "Router Switch" + dest_host: "nyc-dc-d02.ntc.com(FXS182XXXXX)" + local_interface: "FortyGigE0/0/1/1" mgmt_ip: "10.100.100.162" platform: "N77-C7706" remote_port: "Ethernet6/1" sysname: "nyc-dc-d02" version: "Cisco Nexus Operating System (NX-OS) Software, Version 6.2(12)" - capabilities: "Router Switch" - - dest_host: "nyc-dc-c97" - local_port: "FortyGigE0/0/0/0" + - capabilities: "Router" + dest_host: "nyc-dc-c97" + local_interface: "FortyGigE0/0/0/0" mgmt_ip: "10.100.100.19" platform: "cisco ASR9K Series" remote_port: "FortyGigE0/0/0/0" sysname: "nyc-dc-c97" version: "Cisco IOS XR Software, Version 5.3.4[Default]" - capabilities: "Router" - - dest_host: "nyc-dc-c91.ntc.com" - local_port: "FortyGigE0/0/0/1" + - capabilities: "Router" + dest_host: "nyc-dc-c91.ntc.com" + local_interface: "FortyGigE0/0/0/1" mgmt_ip: "10.100.100.125" platform: "cisco CRS" remote_port: "FortyGigE0/0/0/2" sysname: "nyc-dc-c91.ntc.com" version: "Cisco IOS XR Software, Version 5.1.2[Default]" - capabilities: "Router" - - dest_host: "nyc-dc-c97" - local_port: "FortyGigE0/1/0/0" + - capabilities: "Router" + dest_host: "nyc-dc-c97" + local_interface: "FortyGigE0/1/0/0" mgmt_ip: "10.100.100.113" platform: "cisco ASR9K Series" remote_port: "FortyGigE0/1/0/0" sysname: "nyc-dc-c97" version: "Cisco IOS XR Software, Version 5.3.4[Default]" - capabilities: "Router" - - dest_host: "nyc-dc-d03.ntc.com(FXS182XXXXX)" - local_port: "FortyGigE0/1/0/1" + - capabilities: "Router Switch" + dest_host: "nyc-dc-d03.ntc.com(FXS182XXXXX)" + local_interface: "FortyGigE0/1/0/1" mgmt_ip: "10.100.100.190" platform: "N77-C7706" remote_port: "Ethernet6/1" sysname: "nyc-dc-d03" version: "Cisco Nexus Operating System (NX-OS) Software, Version 6.2(12)" - capabilities: "Router Switch" - - dest_host: "nyc-dc-c90.ntc.com" - local_port: "FortyGigE0/1/1/0" + - capabilities: "Router" + dest_host: "nyc-dc-c90.ntc.com" + local_interface: "FortyGigE0/1/1/0" mgmt_ip: "10.100.100.145" platform: "cisco CRS" remote_port: "FortyGigE0/4/0/2" sysname: "nyc-dc-c90.ntc.com" version: "Cisco IOS XR Software, Version 5.1.2[Default]" - capabilities: "Router" - - dest_host: "nyc-dc-z50a.ntc.com(JAF18XXXXX)" - local_port: "FortyGigE0/1/1/1" + - capabilities: "Router Switch" + dest_host: "nyc-dc-z50a.ntc.com(JAF18XXXXX)" + local_interface: "FortyGigE0/1/1/1" mgmt_ip: "10.100.100.116" platform: "N77-C7710" remote_port: "Ethernet4/3" sysname: "nyc-dc-z50a" version: "Cisco Nexus Operating System (NX-OS) Software, Version 6.2(12)" - capabilities: "Router Switch" - - dest_host: "nyc-dc-d04.ntc.com(FXS18XXXXXX)" - local_port: "FortyGigE0/2/1/0" + - capabilities: "Router Switch" + dest_host: "nyc-dc-d04.ntc.com(FXS18XXXXXX)" + local_interface: "FortyGigE0/2/1/0" mgmt_ip: "10.100.100.194" platform: "N77-C7706" remote_port: "Ethernet6/1" sysname: "nyc-dc-d04" version: "Cisco Nexus Operating System (NX-OS) Software, Version 6.2(12)" - capabilities: "Router Switch" - - dest_host: "nyc-dc-c91.ntc.com" - local_port: "FortyGigE0/2/1/1" + - capabilities: "Router" + dest_host: "nyc-dc-c91.ntc.com" + local_interface: "FortyGigE0/2/1/1" mgmt_ip: "10.100.100.129" platform: "cisco CRS" remote_port: "FortyGigE0/4/0/2" sysname: "nyc-dc-c91.ntc.com" version: "Cisco IOS XR Software, Version 5.1.2[Default]" - capabilities: "Router" - - dest_host: "nyc-dc-d01.ntc.com(FXS182XXXXX)" - local_port: "FortyGigE0/2/0/0" + - capabilities: "Router Switch" + dest_host: "nyc-dc-d01.ntc.com(FXS182XXXXX)" + local_interface: "FortyGigE0/2/0/0" mgmt_ip: "10.100.100.158" platform: "N77-C7706" remote_port: "Ethernet6/1" sysname: "nyc-dc-d01" version: "Cisco Nexus Operating System (NX-OS) Software, Version 6.2(12)" - capabilities: "Router Switch" - - dest_host: "nyc-dc-z50b.ntc.com(JAF181XXXXX)" - local_port: "FortyGigE0/2/0/1" + - capabilities: "Router Switch" + dest_host: "nyc-dc-z50b.ntc.com(JAF181XXXXX)" + local_interface: "FortyGigE0/2/0/1" mgmt_ip: "10.100.100.111" platform: "N77-C7710" remote_port: "Ethernet4/3" sysname: "nyc-dc-z50b" version: "Cisco Nexus Operating System (NX-OS) Software, Version 6.2(12)" - capabilities: "Router Switch" - - dest_host: "nyc-dc-dcc001.ntc.com" - local_port: "TenGigE0/3/0/0" + - capabilities: "Router Switch IGMP" + dest_host: "nyc-dc-dcc001.ntc.com" + local_interface: "TenGigE0/3/0/0" mgmt_ip: "10.100.100.174" platform: "cisco WS-C4510R+E" remote_port: "TenGigabitEthernet6/1" sysname: "" version: "Cisco IOS Software, Catalyst 4500 L3 Switch Software (cat4500e-UNIVERSALK9-M),\ \ Version 15.2(2)E3, RELEASE SOFTWARE (fc3)" - capabilities: "Router Switch IGMP" - - dest_host: "nyc-dc-d57" - local_port: "TenGigE0/3/0/1" + - capabilities: "Router" + dest_host: "nyc-dc-d57" + local_interface: "TenGigE0/3/0/1" mgmt_ip: "10.100.100.115" platform: "cisco ASR9K Series" remote_port: "TenGigE0/2/0/0" sysname: "nyc-dc-d57" version: "Cisco IOS XR Software, Version 4.3.2[Default]" - capabilities: "Router" - - dest_host: "nyc-dc-d40b.ntc.com(JAF182XXXXX)" - local_port: "TenGigE0/3/0/2" + - capabilities: "Router Switch" + dest_host: "nyc-dc-d40b.ntc.com(JAF182XXXXX)" + local_interface: "TenGigE0/3/0/2" mgmt_ip: "10.100.100.114" platform: "N77-C7710" remote_port: "Ethernet4/1" sysname: "nyc-dc-d40b" version: "Cisco Nexus Operating System (NX-OS) Software, Version 6.2(12)" - capabilities: "Router Switch" - - dest_host: "nyc-dc-d80.ntc.com(FOC184XXXXX)" - local_port: "TenGigE0/3/0/3" + - capabilities: "Router Switch IGMP" + dest_host: "nyc-dc-d80.ntc.com(FOC184XXXXX)" + local_interface: "TenGigE0/3/0/3" mgmt_ip: "10.100.100.117" platform: "N5K-C56128P" remote_port: "Ethernet2/1" sysname: "nyc-dc-d80" version: "Cisco Nexus Operating System (NX-OS) Software, Version 7.0(7)N1(1)" - capabilities: "Router Switch IGMP" - - dest_host: "nyc-dc-dcc002.ntc.com" - local_port: "TenGigE0/4/0/0" + - capabilities: "Router Switch IGMP" + dest_host: "nyc-dc-dcc002.ntc.com" + local_interface: "TenGigE0/4/0/0" mgmt_ip: "10.100.100.178" platform: "cisco WS-C4510R+E" remote_port: "TenGigabitEthernet6/1" sysname: "" version: "Cisco IOS Software, Catalyst 4500 L3 Switch Software (cat4500e-UNIVERSALK9-M),\ \ Version 15.2(2)E3, RELEASE SOFTWARE (fc3)" - capabilities: "Router Switch IGMP" - - dest_host: "nyc-dc-d57" - local_port: "TenGigE0/4/0/1" + - capabilities: "Router" + dest_host: "nyc-dc-d57" + local_interface: "TenGigE0/4/0/1" mgmt_ip: "10.100.100.115" platform: "cisco ASR9K Series" remote_port: "TenGigE1/2/0/0" sysname: "nyc-dc-d57" version: "Cisco IOS XR Software, Version 4.3.2[Default]" - capabilities: "Router" - - dest_host: "nyc-dc-d40a.ntc.com(JAF182XXXXX)" - local_port: "TenGigE0/4/0/2" + - capabilities: "Router Switch" + dest_host: "nyc-dc-d40a.ntc.com(JAF182XXXXX)" + local_interface: "TenGigE0/4/0/2" mgmt_ip: "10.100.100.113" platform: "N77-C7710" remote_port: "Ethernet4/1" sysname: "nyc-dc-d40a" version: "Cisco Nexus Operating System (NX-OS) Software, Version 6.2(12)" - capabilities: "Router Switch" - - dest_host: "nyc-dc-d81.ntc.com(FOC182XXXXX)" - local_port: "TenGigE0/4/0/3" + - capabilities: "Router Switch IGMP" + dest_host: "nyc-dc-d81.ntc.com(FOC182XXXXX)" + local_interface: "TenGigE0/4/0/3" mgmt_ip: "10.100.100.118" platform: "N5K-C56128P" remote_port: "Ethernet1/1" sysname: "nyc-dc-d81" version: "Cisco Nexus Operating System (NX-OS) Software, Version 7.0(7)N1(1)" - capabilities: "Router Switch IGMP" - - dest_host: "nyc-dc-c97" - local_port: "FortyGigE0/6/0/0" + - capabilities: "Router" + dest_host: "nyc-dc-c97" + local_interface: "FortyGigE0/6/0/0" mgmt_ip: "192.168.169.21" platform: "cisco ASR9K Series" remote_port: "FortyGigE0/6/0/0" sysname: "nyc-dc-c97" version: "Cisco IOS XR Software, Version 5.3.4[Default]" - capabilities: "Router" - - dest_host: "nyc-dc-c97" - local_port: "FortyGigE0/6/0/0" + - capabilities: "Router" + dest_host: "nyc-dc-c97" + local_interface: "FortyGigE0/6/0/0" mgmt_ip: "192.168.169.21" platform: "cisco ASR9K Series" remote_port: "FortyGigE0/7/0/0" sysname: "nyc-dc-c97" version: "Cisco IOS XR Software, Version 5.3.4[Default]" - capabilities: "Router" diff --git a/tests/hp_procurve/show_cdp_neighbors_detail/hp_procurve_show_cdp_neighbors_detail.yml b/tests/hp_procurve/show_cdp_neighbors_detail/hp_procurve_show_cdp_neighbors_detail.yml index 2f3e95e652..b35cc763c3 100644 --- a/tests/hp_procurve/show_cdp_neighbors_detail/hp_procurve_show_cdp_neighbors_detail.yml +++ b/tests/hp_procurve/show_cdp_neighbors_detail/hp_procurve_show_cdp_neighbors_detail.yml @@ -1,30 +1,30 @@ --- parsed_sample: - - local_port: "1" - neighbor_id: "AP01-Site" + - local_interface: "1" neighbor_address: "10.11.11.16" - neighbor_platform: "5.9.1.5-001RAP-6521-60020-WR" neighbor_capability: "Router" + neighbor_id: "AP01-Site" + neighbor_platform: "5.9.1.5-001RAP-6521-60020-WR" neighbor_port: "ge1" neighbor_version: "5.9.1.5-001RAP-6521-60020-WR" - - local_port: "1" - neighbor_id: "5c 0e 8b 11 11 11" + - local_interface: "1" neighbor_address: "10.11.11.16" - neighbor_platform: "AP-6521-60020-WR, Version 5.9.1.5-001R" neighbor_capability: "Router" + neighbor_id: "5c 0e 8b 11 11 11" + neighbor_platform: "AP-6521-60020-WR, Version 5.9.1.5-001R" neighbor_port: "ge1" neighbor_version: "AP-6521-60020-WR, Version 5.9.1.5-001R" - - local_port: "2" - neighbor_id: "5c 0e 8b 12 22 22" + - local_interface: "2" neighbor_address: "Unsupported format" - neighbor_platform: "AP-6521-60020-WR, Version 5.9.1.5-001R" neighbor_capability: "Router" + neighbor_id: "5c 0e 8b 12 22 22" + neighbor_platform: "AP-6521-60020-WR, Version 5.9.1.5-001R" neighbor_port: "ge1" neighbor_version: "AP-6521-60020-WR, Version 5.9.1.5-001R" - - local_port: "2" - neighbor_id: "AP02-Site" + - local_interface: "2" neighbor_address: "10.11.11.17" - neighbor_platform: "5.9.1.5-001RAP-6521-60020-WR" neighbor_capability: "Router" + neighbor_id: "AP02-Site" + neighbor_platform: "5.9.1.5-001RAP-6521-60020-WR" neighbor_port: "ge1" neighbor_version: "5.9.1.5-001RAP-6521-60020-WR" diff --git a/tests/hp_procurve/show_lldp_info_remote-device/hp_procurve_show_lldp_info_remote-device.yml b/tests/hp_procurve/show_lldp_info_remote-device/hp_procurve_show_lldp_info_remote-device.yml index 91ee37824c..4f3d2afbd4 100644 --- a/tests/hp_procurve/show_lldp_info_remote-device/hp_procurve_show_lldp_info_remote-device.yml +++ b/tests/hp_procurve/show_lldp_info_remote-device/hp_procurve_show_lldp_info_remote-device.yml @@ -1,41 +1,41 @@ --- parsed_sample: - - local_port: "1" + - local_interface: "1" neighbor_chassis_id: "3821c7-c1cd00" neighbor_descr: "1" neighbor_portid: "1" neighbor_sysname: "65432p-swi006-g..." - - local_port: "3" + - local_interface: "3" neighbor_chassis_id: "3ce1a1-2218f0" neighbor_descr: "" neighbor_portid: "3c e1 a1 22 18 f0" neighbor_sysname: "" - - local_port: "7" + - local_interface: "7" neighbor_chassis_id: "bcf310-1f8b40" neighbor_descr: "" neighbor_portid: "mgt0" neighbor_sysname: "AH-cust-AP21" - - local_port: "25" + - local_interface: "25" neighbor_chassis_id: "d8cb8a-6d303c" neighbor_descr: "" neighbor_portid: "d8 cb 8a 6d 30 3c" neighbor_sysname: "" - - local_port: "29" + - local_interface: "29" neighbor_chassis_id: "484d7e-e66c42" neighbor_descr: "" neighbor_portid: "48 4d 7e e6 6c 42" neighbor_sysname: "" - - local_port: "36" + - local_interface: "36" neighbor_chassis_id: "603197-7aa548" neighbor_descr: "UPLINK" neighbor_portid: "1" neighbor_sysname: "NAP203" - - local_port: "37" + - local_interface: "37" neighbor_chassis_id: "b00cd1-359a98" neighbor_descr: "" neighbor_portid: "b0 0c d1 35 9a 98" neighbor_sysname: "" - - local_port: "42" + - local_interface: "42" neighbor_chassis_id: "d8cb8a-894644" neighbor_descr: "" neighbor_portid: "d8 cb 8a 89 46 44" diff --git a/tests/hp_procurve/show_lldp_info_remote-device_detail/hp_procurve_show_lldp_info_remote-device_detail.yml b/tests/hp_procurve/show_lldp_info_remote-device_detail/hp_procurve_show_lldp_info_remote-device_detail.yml index 90ea5ad185..aede064d46 100644 --- a/tests/hp_procurve/show_lldp_info_remote-device_detail/hp_procurve_show_lldp_info_remote-device_detail.yml +++ b/tests/hp_procurve/show_lldp_info_remote-device_detail/hp_procurve_show_lldp_info_remote-device_detail.yml @@ -1,8 +1,8 @@ --- parsed_sample: - - local_port: "1" - neighbor_chassis_type: "mac-address" + - local_interface: "1" neighbor_chassis_id: "3821c7-c1cd00" + neighbor_chassis_type: "mac-address" neighbor_portid: "1" neighbor_sysname: "65432p-swi006-abcd-srvroom-4asd" port_descr: "1" @@ -12,9 +12,9 @@ parsed_sample: system_capabilities_enabled: "bridge" system_capabilities_supported: "bridge, router" system_descr: "Aruba JL357A 2540-48G-PoE+-4SFP+ Switch, revision YC.16.0..." - - local_port: "3" - neighbor_chassis_type: "mac-address" + - local_interface: "3" neighbor_chassis_id: "3ce1a1-2218f0" + neighbor_chassis_type: "mac-address" neighbor_portid: "3c e1 a1 22 18 f0" neighbor_sysname: "" port_descr: "" @@ -24,9 +24,9 @@ parsed_sample: system_capabilities_enabled: "" system_capabilities_supported: "" system_descr: "" - - local_port: "7" - neighbor_chassis_type: "mac-address" + - local_interface: "7" neighbor_chassis_id: "bcf310-1f8b40" + neighbor_chassis_type: "mac-address" neighbor_portid: "mgt0" neighbor_sysname: "AH-cust-AP21" port_descr: "" @@ -36,9 +36,9 @@ parsed_sample: system_capabilities_enabled: "bridge, wlan-access-point" system_capabilities_supported: "bridge, wlan-access-point" system_descr: "" - - local_port: "25" - neighbor_chassis_type: "mac-address" + - local_interface: "25" neighbor_chassis_id: "d8cb8a-6d303c" + neighbor_chassis_type: "mac-address" neighbor_portid: "d8 cb 8a 6d 30 3c" neighbor_sysname: "" port_descr: "" @@ -48,9 +48,9 @@ parsed_sample: system_capabilities_enabled: "" system_capabilities_supported: "" system_descr: "" - - local_port: "29" - neighbor_chassis_type: "mac-address" + - local_interface: "29" neighbor_chassis_id: "484d7e-e66c42" + neighbor_chassis_type: "mac-address" neighbor_portid: "48 4d 7e e6 6c 42" neighbor_sysname: "" port_descr: "" @@ -60,9 +60,9 @@ parsed_sample: system_capabilities_enabled: "" system_capabilities_supported: "" system_descr: "" - - local_port: "36" - neighbor_chassis_type: "mac-address" + - local_interface: "36" neighbor_chassis_id: "603197-7aa548" + neighbor_chassis_type: "mac-address" neighbor_portid: "1" neighbor_sysname: "NAP203" port_descr: "UPLINK" @@ -72,9 +72,9 @@ parsed_sample: system_capabilities_enabled: "bridge, wlan-access-point, router" system_capabilities_supported: "bridge, wlan-access-point, router" system_descr: "ZLD 6.00(###.8)B1 (cannon)" - - local_port: "37" - neighbor_chassis_type: "mac-address" + - local_interface: "37" neighbor_chassis_id: "b00cd1-359a98" + neighbor_chassis_type: "mac-address" neighbor_portid: "b0 0c d1 35 9a 98" neighbor_sysname: "" port_descr: "" @@ -84,9 +84,9 @@ parsed_sample: system_capabilities_enabled: "" system_capabilities_supported: "" system_descr: "" - - local_port: "42" - neighbor_chassis_type: "mac-address" + - local_interface: "42" neighbor_chassis_id: "d8cb8a-894644" + neighbor_chassis_type: "mac-address" neighbor_portid: "d8 cb 8a 89 46 44" neighbor_sysname: "" port_descr: "" From 5f308ec3ee90a7cb5cfa6506696b827cc6d612da Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sat, 2 Sep 2023 16:23:25 -0400 Subject: [PATCH 02/41] replace REMOTE_PORT with NEIGHBOR_INTERFACE in CDP/LLDP templates to normalize --- ...sta_eos_show_lldp_neighbors_detail.textfsm | 4 +- ...isco_ios_show_cdp_neighbors_detail.textfsm | 4 +- ...sco_nxos_show_cdp_neighbors_detail.textfsm | 4 +- ..._wlc_ssh_show_cdp_neighbors_detail.textfsm | 4 +- ...cisco_xr_show_cdp_neighbors_detail.textfsm | 4 +- .../arista_eos_show_lldp_neighbors_detail.yml | 40 ++++++++-------- .../cisco_ios_show_cdp_neighbors_detail.yml | 8 ++-- .../cisco_ios_show_cdp_neighbors_detail2.yml | 2 +- .../cisco_nxos_show_cdp_neighbors_detail.yml | 10 ++-- .../cisco_nxos_show_cdp_neighbors_detail1.yml | 8 ++-- .../cisco_nxos_show_cdp_neighbors_detail2.yml | 2 +- ..._show_cdp_neighbors_detail_move_record.yml | 4 +- ...isco_wlc_ssh_show_cdp_neighbors_detail.yml | 6 +-- .../cisco_xr_show_cdp_neighbors_detail.yml | 48 +++++++++---------- 14 files changed, 74 insertions(+), 74 deletions(-) diff --git a/ntc_templates/templates/arista_eos_show_lldp_neighbors_detail.textfsm b/ntc_templates/templates/arista_eos_show_lldp_neighbors_detail.textfsm index 065fa61774..781a85608e 100644 --- a/ntc_templates/templates/arista_eos_show_lldp_neighbors_detail.textfsm +++ b/ntc_templates/templates/arista_eos_show_lldp_neighbors_detail.textfsm @@ -2,7 +2,7 @@ Value Required DEST_HOST (\S+) Value SYSTEM_ID (.+?) Value MGMT_ADDRESS (.+?) Value PLATFORM_VERSION (.+?) -Value REMOTE_PORT (.+?) +Value NEIGHBOR_INTERFACE (.+?) Value Filldown LOCAL_INTERFACE (\S+?) Value Filldown NEIGH_COUNT ([1-9]\d*) Value AGE (.+?) @@ -20,4 +20,4 @@ Interface ^\s*$$ -> Record Start Port_ID - ^\s+Port ID\s+:(\s+\"|\s+)${REMOTE_PORT}(\"|$$) -> Interface + ^\s+Port ID\s+:(\s+\"|\s+)${NEIGHBOR_INTERFACE}(\"|$$) -> Interface diff --git a/ntc_templates/templates/cisco_ios_show_cdp_neighbors_detail.textfsm b/ntc_templates/templates/cisco_ios_show_cdp_neighbors_detail.textfsm index 6bcf5787c9..9491502f48 100644 --- a/ntc_templates/templates/cisco_ios_show_cdp_neighbors_detail.textfsm +++ b/ntc_templates/templates/cisco_ios_show_cdp_neighbors_detail.textfsm @@ -1,7 +1,7 @@ Value Required DESTINATION_HOST (\S+) Value MANAGEMENT_IP (\d+\.\d+\.\d+\.\d+|\w+\.\w+\.\w+) Value PLATFORM (.*) -Value REMOTE_PORT (.*) +Value NEIGHBOR_INTERFACE (.*) Value LOCAL_INTERFACE (.*) Value SOFTWARE_VERSION (.*$) Value CAPABILITIES (.+?) @@ -11,7 +11,7 @@ Start ^Entry address\(es\)\s*:\s* -> ParseIP ^Platform\s*:\s*${PLATFORM}\s*,\s*Capabilities\s*:\s*${CAPABILITIES}\s+$$ ^Platform\s*:\s*${PLATFORM}\s*,\s*Capabilities\s*:\s*${CAPABILITIES}$$ - ^Interface: ${LOCAL_INTERFACE}, Port ID \(outgoing port\): ${REMOTE_PORT} + ^Interface: ${LOCAL_INTERFACE}, Port ID \(outgoing port\): ${NEIGHBOR_INTERFACE} ^Version : -> GetVersion # Capture time-stamp if vty line has command time-stamping turned on ^Load\s+for\s+ diff --git a/ntc_templates/templates/cisco_nxos_show_cdp_neighbors_detail.textfsm b/ntc_templates/templates/cisco_nxos_show_cdp_neighbors_detail.textfsm index de0a3bf8a4..859d263d77 100644 --- a/ntc_templates/templates/cisco_nxos_show_cdp_neighbors_detail.textfsm +++ b/ntc_templates/templates/cisco_nxos_show_cdp_neighbors_detail.textfsm @@ -2,7 +2,7 @@ Value Required DEST_HOST (.*) Value SYSNAME (.*) Value MGMT_IP (.*) Value PLATFORM (.*) -Value REMOTE_PORT (.*) +Value NEIGHBOR_INTERFACE (.*) Value LOCAL_INTERFACE (.*) Value VERSION (.*) Value INTERFACE_IP (.*) @@ -15,7 +15,7 @@ Start ^Interface address\(es\):\s*(^[1-9]\d*|$$) -> GetInterfaceIP ^Mgmt address\(es\): -> GetIP ^Platform: ${PLATFORM}, Capabilities: ${CAPABILITIES}\s*$$ - ^Interface: ${LOCAL_INTERFACE}, Port ID \(outgoing port\): ${REMOTE_PORT} + ^Interface: ${LOCAL_INTERFACE}, Port ID \(outgoing port\): ${NEIGHBOR_INTERFACE} ^Version: -> GetVersion GetIP diff --git a/ntc_templates/templates/cisco_wlc_ssh_show_cdp_neighbors_detail.textfsm b/ntc_templates/templates/cisco_wlc_ssh_show_cdp_neighbors_detail.textfsm index 4209283eca..0fd548f5f0 100644 --- a/ntc_templates/templates/cisco_wlc_ssh_show_cdp_neighbors_detail.textfsm +++ b/ntc_templates/templates/cisco_wlc_ssh_show_cdp_neighbors_detail.textfsm @@ -1,7 +1,7 @@ Value Required DESTINATION_HOST (\S+) Value MANAGEMENT_IP (\d+\.\d+\.\d+\.\d+|\w+\.\w+\.\w+) Value PLATFORM (.*) -Value REMOTE_PORT (.*) +Value NEIGHBOR_INTERFACE (.*) Value LOCAL_INTERFACE (.*) Value SOFTWARE_VERSION (.*$) Value CAPABILITIES (.*) @@ -10,7 +10,7 @@ Start ^Device ID: ${DESTINATION_HOST} ^Entry address\(es\)\s*:\s* -> ParseIP ^Platform\s*:\s*${PLATFORM}\s*,\s*Capabilities\s*:\s*${CAPABILITIES} - ^Interface: ${LOCAL_INTERFACE}, Port ID \(outgoing port\): ${REMOTE_PORT} + ^Interface: ${LOCAL_INTERFACE}, Port ID \(outgoing port\): ${NEIGHBOR_INTERFACE} ^Version : -> GetVersion ParseIP diff --git a/ntc_templates/templates/cisco_xr_show_cdp_neighbors_detail.textfsm b/ntc_templates/templates/cisco_xr_show_cdp_neighbors_detail.textfsm index 04dbf3b121..6d2fdc65a9 100644 --- a/ntc_templates/templates/cisco_xr_show_cdp_neighbors_detail.textfsm +++ b/ntc_templates/templates/cisco_xr_show_cdp_neighbors_detail.textfsm @@ -2,7 +2,7 @@ Value Required DEST_HOST (\S+) Value SYSNAME (.*) Value MGMT_IP (.*) Value PLATFORM (.*) -Value REMOTE_PORT (.*) +Value NEIGHBOR_INTERFACE (.*) Value LOCAL_INTERFACE (.*) Value VERSION (.*) Value CAPABILITIES (.*) @@ -13,7 +13,7 @@ Start ^Entry address\(es\): -> GetIP ^Platform: ${PLATFORM}, Capabilities: ${CAPABILITIES} ^Interface: ${LOCAL_INTERFACE} - ^Port ID \(outgoing port\): ${REMOTE_PORT} + ^Port ID \(outgoing port\): ${NEIGHBOR_INTERFACE} ^Version : -> GetVersion GetIP diff --git a/tests/arista_eos/show_lldp_neighbors_detail/arista_eos_show_lldp_neighbors_detail.yml b/tests/arista_eos/show_lldp_neighbors_detail/arista_eos_show_lldp_neighbors_detail.yml index 78dede1047..086ef1b70b 100644 --- a/tests/arista_eos/show_lldp_neighbors_detail/arista_eos_show_lldp_neighbors_detail.yml +++ b/tests/arista_eos/show_lldp_neighbors_detail/arista_eos_show_lldp_neighbors_detail.yml @@ -5,177 +5,177 @@ parsed_sample: local_interface: "Ethernet1" mgmt_address: "2cc2.6081.eaf9" neigh_count: "1" + neighbor_interface: "Ethernet1" platform_version: "Arista Networks EOS version 4.15.2F running on an Arista Networks\ \ vEOS" - remote_port: "Ethernet1" system_id: "2cc2.6081.eaf9" - age: "12 seconds" dest_host: "spine2.company.com" local_interface: "Ethernet2" mgmt_address: "2cc2.6081.eaf9" neigh_count: "1" + neighbor_interface: "Ethernet2" platform_version: "Arista Networks EOS version 4.15.2F running on an Arista Networks\ \ vEOS" - remote_port: "Ethernet2" system_id: "2cc2.6081.eaf9" - age: "12 seconds" dest_host: "spine2.company.com" local_interface: "Ethernet3" mgmt_address: "2cc2.6081.eaf9" neigh_count: "1" + neighbor_interface: "Ethernet3" platform_version: "Arista Networks EOS version 4.15.2F running on an Arista Networks\ \ vEOS" - remote_port: "Ethernet3" system_id: "2cc2.6081.eaf9" - age: "12 seconds" dest_host: "spine2.company.com" local_interface: "Ethernet4" mgmt_address: "2cc2.6081.eaf9" neigh_count: "1" + neighbor_interface: "Ethernet4" platform_version: "Arista Networks EOS version 4.15.2F running on an Arista Networks\ \ vEOS" - remote_port: "Ethernet4" system_id: "2cc2.6081.eaf9" - age: "27 seconds" dest_host: "vmx1" local_interface: "Management1" mgmt_address: "10.0.0.31" neigh_count: "2" + neighbor_interface: "fxp0" platform_version: "Juniper Networks, Inc. vmx internet router, kernel JUNOS 15.1F4.15,\ \ Build date: 2015-12-23 19:22:55 UTC Copyright (c) 1996-2015 Juniper Networks,\ \ Inc." - remote_port: "fxp0" system_id: "0005.8671.4ec0" - age: "17 seconds" dest_host: "spine2.company.com" local_interface: "Management1" mgmt_address: "2cc2.6081.eaf9" neigh_count: "2" + neighbor_interface: "Management1" platform_version: "Arista Networks EOS version 4.15.2F running on an Arista Networks\ \ vEOS" - remote_port: "Management1" system_id: "2cc2.6081.eaf9" - age: "4 seconds" dest_host: "cvx" local_interface: "Ethernet8" mgmt_address: "172.16.2.141" neigh_count: "3" + neighbor_interface: "Management1" platform_version: "Arista Networks EOS version 4.15.5M running on an Arista Networks\ \ CVX" - remote_port: "Management1" system_id: "0050.56eb.3ef3" - age: "29 seconds" dest_host: "cvx-client-1" local_interface: "Ethernet8" mgmt_address: "172.16.2.142" neigh_count: "3" + neighbor_interface: "Ethernet1" platform_version: "Arista Networks EOS version 4.15.5M running on an Arista Networks\ \ CVX" - remote_port: "Ethernet1" system_id: "0050.568b.67c8" - age: "30 seconds" dest_host: "cvx-client-1" local_interface: "Ethernet8" mgmt_address: "172.16.2.142" neigh_count: "3" + neighbor_interface: "Management1" platform_version: "Arista Networks EOS version 4.15.5M running on an Arista Networks\ \ CVX" - remote_port: "Management1" system_id: "0050.568b.67c8" - age: "29 seconds" dest_host: "Leaf1.cliqr.com" local_interface: "Ethernet9" mgmt_address: "7c0e.cecb.659b" neigh_count: "1" + neighbor_interface: "Eth1/23" platform_version: "topology/pod-1/node-101" - remote_port: "Eth1/23" system_id: "7c0e.cecb.659b" - age: "29 seconds" dest_host: "Leaf1.cliqr.com" local_interface: "Ethernet10" mgmt_address: "7c0e.cecb.659c" neigh_count: "1" + neighbor_interface: "Eth1/24" platform_version: "topology/pod-1/node-101" - remote_port: "Eth1/24" system_id: "7c0e.cecb.659c" - age: "21 seconds" dest_host: "MX" local_interface: "Ethernet23" mgmt_address: "" neigh_count: "1" + neighbor_interface: "527" platform_version: "Juniper Networks, Inc. mx5-t internet router, kernel JUNOS\ \ 14.2R5.8, Build date: 2015-11-25 01:57:41 UTC Copyright (c) 1996-2015 Juniper\ \ Networks, Inc." - remote_port: "527" system_id: "3c8a.b089.9898" - age: "29 seconds" dest_host: "cvx-client-2" local_interface: "Ethernet33" mgmt_address: "172.16.2.143" neigh_count: "4" + neighbor_interface: "Management1" platform_version: "Arista Networks EOS version 4.15.5M running on an Arista Networks\ \ CVX" - remote_port: "Management1" system_id: "0050.560b.66ea" - age: "29 seconds" dest_host: "cvx-client-2" local_interface: "Ethernet33" mgmt_address: "172.16.2.143" neigh_count: "4" + neighbor_interface: "Ethernet1" platform_version: "Arista Networks EOS version 4.15.5M running on an Arista Networks\ \ CVX" - remote_port: "Ethernet1" system_id: "0050.560b.66ea" - age: "29 seconds" dest_host: "aci-compute" local_interface: "Ethernet33" mgmt_address: "fe80::250:56ff:feac:4cd9" neigh_count: "4" + neighbor_interface: "0050.56ac.4cd9" platform_version: "Red Hat Enterprise Linux Linux 3.10.0-327.13.1.el7.x86_64 #1\ \ SMP Mon Feb 29 13:22:02 EST 2016 x86_64" - remote_port: "0050.56ac.4cd9" system_id: "0050.56ac.4cd9" - age: "29 seconds" dest_host: "aci-control" local_interface: "Ethernet33" mgmt_address: "fe80::250:56ff:feac:4e29" neigh_count: "4" + neighbor_interface: "0050.56ac.4e29" platform_version: "Red Hat Enterprise Linux Linux 3.10.0-327.13.1.el7.x86_64 #1\ \ SMP Mon Feb 29 13:22:02 EST 2016 x86_64" - remote_port: "0050.56ac.4e29" system_id: "0050.56ac.4e29" - age: "19 seconds" dest_host: "R4-Arista-L3-SDNLAB-SW1" local_interface: "Ethernet49/1" mgmt_address: "2.2.2.2" neigh_count: "1" + neighbor_interface: "Ethernet49/1" platform_version: "Arista Networks EOS version 4.15.0FXA running on an Arista\ \ Networks DCS-7050SX-64" - remote_port: "Ethernet49/1" system_id: "001c.737d.77fb" - age: "28 seconds" dest_host: "R4-Arista-L3-SDNLAB-SW2" local_interface: "Ethernet51/1" mgmt_address: "172.16.1.3" neigh_count: "1" + neighbor_interface: "Ethernet49/1" platform_version: "Arista Networks EOS version 4.15.0FXA running on an Arista\ \ Networks DCS-7050SX-64" - remote_port: "Ethernet49/1" system_id: "001c.737d.745f" - age: "28 seconds" dest_host: "R4-Arista-L3-SDNLAB-SW2" local_interface: "Ethernet52/1" mgmt_address: "172.16.1.3" neigh_count: "1" + neighbor_interface: "Ethernet50/1" platform_version: "Arista Networks EOS version 4.15.0FXA running on an Arista\ \ Networks DCS-7050SX-64" - remote_port: "Ethernet50/1" system_id: "001c.737d.745f" - age: "2 seconds" dest_host: "test-host.domain.com" local_interface: "Management1" mgmt_address: "172.16.208.5" neigh_count: "1" + neighbor_interface: "Management1" platform_version: "" - remote_port: "Management1" system_id: "0cca.01c0.e8e1" diff --git a/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail.yml b/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail.yml index 5abe7df841..3ff8094b1c 100644 --- a/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail.yml +++ b/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail.yml @@ -4,32 +4,32 @@ parsed_sample: destination_host: "desktop-switch" local_interface: "GigabitEthernet1/0/16" management_ip: "10.1.1.2" + neighbor_interface: "GigabitEthernet0/1" platform: "cisco WS-C2960-8TC-L" - remote_port: "GigabitEthernet0/1" software_version: "Cisco IOS Software, C2960 Software (C2960-LANBASEK9-M), Version\ \ 12.2(55)SE9, RELEASE SOFTWARE (fc1)" - capabilities: "Router Switch IGMP" destination_host: "ce-router" local_interface: "GigabitEthernet1/0/22" management_ip: "10.1.1.1" + neighbor_interface: "GigabitEthernet0/0" platform: "Cisco 3825" - remote_port: "GigabitEthernet0/0" software_version: "Cisco IOS Software, 3800 Software (C3825-ADVENTERPRISEK9-M),\ \ Version 12.4(24)T1, RELEASE SOFTWARE (fc3)" - capabilities: "Host" destination_host: "server" local_interface: "GigabitEthernet1/0/19" management_ip: "10.1.1.232" + neighbor_interface: "eth0" platform: "VMware" - remote_port: "eth0" software_version: "Linux 2.6.32-431.20.3.el6.x86_64 #1 SMP Fri Jun 6 18:30:54\ \ EDT 2014 CCM:10.5.2.10000-5.i386" - capabilities: "Router Switch IGMP" destination_host: "vIOS-L2-1" local_interface: "GigabitEthernet0/3" management_ip: "" + neighbor_interface: "GigabitEthernet0/3" platform: "Cisco " - remote_port: "GigabitEthernet0/3" software_version: "Cisco IOS Software, vios_l2 Software (vios_l2-ADVENTERPRISEK9-M),\ \ Version 15.2(CML_NIGHTLY_20150414)FLO_DSGS7, EARLY DEPLOYMENT DEVELOPMENT\ \ BUILD, synced to DSGS_PI5_POSTCOLLAPSE_TEAM_TRACK_CLONE" diff --git a/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail2.yml b/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail2.yml index 23b256af0b..0d01474718 100644 --- a/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail2.yml +++ b/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail2.yml @@ -4,7 +4,7 @@ parsed_sample: destination_host: "switchxxxxx" local_interface: "GigabitEthernet0/3" management_ip: "1.1.1.1" + neighbor_interface: "GigabitEthernet0/8" platform: "cisco WS-C3560X-24P" - remote_port: "GigabitEthernet0/8" software_version: "Cisco IOS Software, C3560E Software (C3560E-UNIVERSALK9-M),\ \ Version 12.2(55)SE10, RELEASE SOFTWARE (fc2)" diff --git a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail.yml b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail.yml index ba11571abe..20a129f736 100644 --- a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail.yml +++ b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail.yml @@ -5,8 +5,8 @@ parsed_sample: interface_ip: "10.1.100.1" local_interface: "mgmt0" mgmt_ip: "10.1.100.1" + neighbor_interface: "FastEthernet1/0/32" platform: "cisco WS-C3750-48TS" - remote_port: "FastEthernet1/0/32" sysname: "" version: "Cisco IOS Software, C3750 Software (C3750-IPBASEK9-M), Version 12.2(44)SE2,\ \ RELEASE SOFTWARE (fc2)" @@ -15,8 +15,8 @@ parsed_sample: interface_ip: "10.1.100.226" local_interface: "Ethernet1/1" mgmt_ip: "10.1.100.226" + neighbor_interface: "Ethernet1/1" platform: "N9K-C9372TX" - remote_port: "Ethernet1/1" sysname: "dc-lf03" version: "Cisco Nexus Operating System (NX-OS) Software, Version 7.0(3)I5(1)" - capabilities: "Router Switch IGMP Filtering Supports-STP-Dispute" @@ -24,8 +24,8 @@ parsed_sample: interface_ip: "10.1.100.226" local_interface: "Ethernet1/3" mgmt_ip: "10.1.100.226" + neighbor_interface: "Ethernet1/3" platform: "N9K-C9372TX" - remote_port: "Ethernet1/3" sysname: "dc-lf03" version: "Cisco Nexus Operating System (NX-OS) Software, Version 7.0(3)I5(1)" - capabilities: "Router Switch IGMP Filtering Supports-STP-Dispute" @@ -33,8 +33,8 @@ parsed_sample: interface_ip: "10.1.1.1" local_interface: "Ethernet1/49" mgmt_ip: "10.1.100.222" + neighbor_interface: "Ethernet1/52" platform: "N9K-C9372TX" - remote_port: "Ethernet1/52" sysname: "dc-sp01" version: "Cisco Nexus Operating System (NX-OS) Software, Version 7.0(3)I2(2d)" - capabilities: "Router Switch IGMP Filtering Supports-STP-Dispute" @@ -42,7 +42,7 @@ parsed_sample: interface_ip: "10.1.1.9" local_interface: "Ethernet1/50" mgmt_ip: "10.1.100.223" + neighbor_interface: "Ethernet1/52" platform: "N9K-C9372TX" - remote_port: "Ethernet1/52" sysname: "dc-sp02" version: "Cisco Nexus Operating System (NX-OS) Software, Version 7.0(3)I2(2d)" diff --git a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail1.yml b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail1.yml index caa489b400..6d2f1b8a6e 100644 --- a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail1.yml +++ b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail1.yml @@ -5,8 +5,8 @@ parsed_sample: interface_ip: "10.115.143.251" local_interface: "mgmt0" mgmt_ip: "10.115.143.251" + neighbor_interface: "GigabitEthernet0/20" platform: "WS-C3560X-24" - remote_port: "GigabitEthernet0/20" sysname: "" version: "Cisco IOS Software, C3560E Software (C3560E-UNIVERSALK9-M), Version\ \ 12.2(55)SE5, RELEASE SOFTWARE (fc1)" @@ -15,8 +15,8 @@ parsed_sample: interface_ip: "10.115.17.253" local_interface: "Ethernet1/1" mgmt_ip: "10.115.143.120" + neighbor_interface: "Ethernet1/31" platform: "N5K-C5548UP" - remote_port: "Ethernet1/31" sysname: "DC3TESTW01-55" version: "Cisco Nexus Operating System (NX-OS) Software, Version 5.2(1)N1(4)" - capabilities: "Switch IGMP Filtering Supports-STP-Dispute" @@ -24,8 +24,8 @@ parsed_sample: interface_ip: "10.115.143.21" local_interface: "Ethernet1/21" mgmt_ip: "10.115.143.21" + neighbor_interface: "Ethernet1/21" platform: "N5K-C5020P-BF" - remote_port: "Ethernet1/21" sysname: "DC3TESTW02" version: "Cisco Nexus Operating System (NX-OS) Software, Version 5.2(1)N1(4)" - capabilities: "Switch IGMP Filtering Supports-STP-Dispute" @@ -33,7 +33,7 @@ parsed_sample: interface_ip: "10.115.143.21" local_interface: "Ethernet1/22" mgmt_ip: "10.115.143.21" + neighbor_interface: "Ethernet1/22" platform: "N5K-C5020P-BF" - remote_port: "Ethernet1/22" sysname: "DC3TESTW02" version: "Cisco Nexus Operating System (NX-OS) Software, Version 5.2(1)N1(4)" diff --git a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail2.yml b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail2.yml index 931082f4f9..b25eb0c9b9 100644 --- a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail2.yml +++ b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail2.yml @@ -5,7 +5,7 @@ parsed_sample: interface_ip: "" local_interface: "Ethernet1/1" mgmt_ip: "" + neighbor_interface: "ether1" platform: "MikroTik" - remote_port: "ether1" sysname: "" version: "6.47.10 (long-term)" diff --git a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail_move_record.yml b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail_move_record.yml index 4b235414b0..d097e9acc8 100644 --- a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail_move_record.yml +++ b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail_move_record.yml @@ -5,8 +5,8 @@ parsed_sample: interface_ip: "10.0.0.1" local_interface: "Ethernet7/14" mgmt_ip: "10.0.0.1" + neighbor_interface: "TenGigabitEthernet1/1/7" platform: "C9300-48UXM" - remote_port: "TenGigabitEthernet1/1/7" sysname: "" version: "Cisco IOS Software [Everest], Catalyst L3 Switch Software (CAT9K_IOSXE),\ \ Version 16.6.6, RELEASE SOFTWARE (fc1)" @@ -15,8 +15,8 @@ parsed_sample: interface_ip: "10.0.0.3" local_interface: "Ethernet7/15" mgmt_ip: "10.0.0.4" + neighbor_interface: "TenGigabitEthernet1/1/8" platform: "C9300-48UXM" - remote_port: "TenGigabitEthernet1/1/8" sysname: "" version: "Cisco IOS Software [Everest], Catalyst L3 Switch Software (CAT9K_IOSXE),\ \ Version 16.6.6, RELEASE SOFTWARE (fc1)" diff --git a/tests/cisco_wlc_ssh/show_cdp_neighbors_detail/cisco_wlc_ssh_show_cdp_neighbors_detail.yml b/tests/cisco_wlc_ssh/show_cdp_neighbors_detail/cisco_wlc_ssh_show_cdp_neighbors_detail.yml index d352c17802..5ba14dd4c6 100644 --- a/tests/cisco_wlc_ssh/show_cdp_neighbors_detail/cisco_wlc_ssh_show_cdp_neighbors_detail.yml +++ b/tests/cisco_wlc_ssh/show_cdp_neighbors_detail/cisco_wlc_ssh_show_cdp_neighbors_detail.yml @@ -4,15 +4,15 @@ parsed_sample: destination_host: "AAA.pizza.com(FXS1828Q2JH)" local_interface: "GigabitEthernet0/0/2" management_ip: "1.2.3.4" + neighbor_interface: "Ethernet1/15" platform: "N77-C7706" - remote_port: "Ethernet1/15" software_version: "Cisco Nexus Operating System (NX-OS) Software, Version 6.2(10)" - capabilities: "Router Switch IGMP" destination_host: "BBB.beer.com" local_interface: "GigabitEthernet0/0/7" management_ip: "172.5.6.7" + neighbor_interface: "GigabitEthernet1/0/11" platform: "cisco WS-C3750G-12S" - remote_port: "GigabitEthernet1/0/11" software_version: "Cisco IOS Software, C3750 Software (C3750-IPSERVICESK9-M),\ \ Version 12.2(55)SE11, RELEASE SOFTWARE (fc3) Technical Support: http://www.cisco.com/techsupport\ \ Copyright (c) 1986-2016 by Cisco Systems, Inc. Compiled Wed 17-Aug-16 13:28\ @@ -21,8 +21,8 @@ parsed_sample: destination_host: "CCC.cake.com" local_interface: "GigabitEthernet0/0/8" management_ip: "172.9.10.11" + neighbor_interface: "GigabitEthernet1/0/1" platform: "cisco WS-C3750G-12S" - remote_port: "GigabitEthernet1/0/1" software_version: "Cisco IOS Software, C3750 Software (C3750-IPSERVICESK9-M),\ \ Version 12.2(55)SE11, RELEASE SOFTWARE (fc3) Technical Support: http://www.cisco.com/techsupport\ \ Copyright (c) 1986-2016 by Cisco Systems, Inc. Compiled Wed 17-Aug-16 13:28\ diff --git a/tests/cisco_xr/show_cdp_neighbors_detail/cisco_xr_show_cdp_neighbors_detail.yml b/tests/cisco_xr/show_cdp_neighbors_detail/cisco_xr_show_cdp_neighbors_detail.yml index 234040a990..8082697c4c 100644 --- a/tests/cisco_xr/show_cdp_neighbors_detail/cisco_xr_show_cdp_neighbors_detail.yml +++ b/tests/cisco_xr/show_cdp_neighbors_detail/cisco_xr_show_cdp_neighbors_detail.yml @@ -4,8 +4,8 @@ parsed_sample: dest_host: "nyc-dc-dcm005.ntc.com" local_interface: "MgmtEth0/RSP0/CPU0/0" mgmt_ip: "10.100.1.54" + neighbor_interface: "GigabitEthernet1/9" platform: "cisco WS-C4948E" - remote_port: "GigabitEthernet1/9" sysname: "" version: "Cisco IOS Software, Catalyst 4500 L3 Switch Software (cat4500e-ENTSERVICESK9-M),\ \ Version 15.0(2)SG10, RELEASE SOFTWARE (fc1)" @@ -13,8 +13,8 @@ parsed_sample: dest_host: "nyc-dc-dcm006.ntc.com" local_interface: "MgmtEth0/RSP1/CPU0/0" mgmt_ip: "10.100.1.55" + neighbor_interface: "GigabitEthernet1/9" platform: "cisco WS-C4948E" - remote_port: "GigabitEthernet1/9" sysname: "" version: "Cisco IOS Software, Catalyst 4500 L3 Switch Software (cat4500e-ENTSERVICESK9-M),\ \ Version 15.0(2)SG10, RELEASE SOFTWARE (fc1)" @@ -22,104 +22,104 @@ parsed_sample: dest_host: "nyc-dc-c90.ntc.com" local_interface: "FortyGigE0/0/1/0" mgmt_ip: "10.100.100.141" + neighbor_interface: "FortyGigE0/0/0/2" platform: "cisco CRS" - remote_port: "FortyGigE0/0/0/2" sysname: "nyc-dc-c90.ntc.com" version: "Cisco IOS XR Software, Version 5.1.2[Default]" - capabilities: "Router Switch" dest_host: "nyc-dc-d02.ntc.com(FXS182XXXXX)" local_interface: "FortyGigE0/0/1/1" mgmt_ip: "10.100.100.162" + neighbor_interface: "Ethernet6/1" platform: "N77-C7706" - remote_port: "Ethernet6/1" sysname: "nyc-dc-d02" version: "Cisco Nexus Operating System (NX-OS) Software, Version 6.2(12)" - capabilities: "Router" dest_host: "nyc-dc-c97" local_interface: "FortyGigE0/0/0/0" mgmt_ip: "10.100.100.19" + neighbor_interface: "FortyGigE0/0/0/0" platform: "cisco ASR9K Series" - remote_port: "FortyGigE0/0/0/0" sysname: "nyc-dc-c97" version: "Cisco IOS XR Software, Version 5.3.4[Default]" - capabilities: "Router" dest_host: "nyc-dc-c91.ntc.com" local_interface: "FortyGigE0/0/0/1" mgmt_ip: "10.100.100.125" + neighbor_interface: "FortyGigE0/0/0/2" platform: "cisco CRS" - remote_port: "FortyGigE0/0/0/2" sysname: "nyc-dc-c91.ntc.com" version: "Cisco IOS XR Software, Version 5.1.2[Default]" - capabilities: "Router" dest_host: "nyc-dc-c97" local_interface: "FortyGigE0/1/0/0" mgmt_ip: "10.100.100.113" + neighbor_interface: "FortyGigE0/1/0/0" platform: "cisco ASR9K Series" - remote_port: "FortyGigE0/1/0/0" sysname: "nyc-dc-c97" version: "Cisco IOS XR Software, Version 5.3.4[Default]" - capabilities: "Router Switch" dest_host: "nyc-dc-d03.ntc.com(FXS182XXXXX)" local_interface: "FortyGigE0/1/0/1" mgmt_ip: "10.100.100.190" + neighbor_interface: "Ethernet6/1" platform: "N77-C7706" - remote_port: "Ethernet6/1" sysname: "nyc-dc-d03" version: "Cisco Nexus Operating System (NX-OS) Software, Version 6.2(12)" - capabilities: "Router" dest_host: "nyc-dc-c90.ntc.com" local_interface: "FortyGigE0/1/1/0" mgmt_ip: "10.100.100.145" + neighbor_interface: "FortyGigE0/4/0/2" platform: "cisco CRS" - remote_port: "FortyGigE0/4/0/2" sysname: "nyc-dc-c90.ntc.com" version: "Cisco IOS XR Software, Version 5.1.2[Default]" - capabilities: "Router Switch" dest_host: "nyc-dc-z50a.ntc.com(JAF18XXXXX)" local_interface: "FortyGigE0/1/1/1" mgmt_ip: "10.100.100.116" + neighbor_interface: "Ethernet4/3" platform: "N77-C7710" - remote_port: "Ethernet4/3" sysname: "nyc-dc-z50a" version: "Cisco Nexus Operating System (NX-OS) Software, Version 6.2(12)" - capabilities: "Router Switch" dest_host: "nyc-dc-d04.ntc.com(FXS18XXXXXX)" local_interface: "FortyGigE0/2/1/0" mgmt_ip: "10.100.100.194" + neighbor_interface: "Ethernet6/1" platform: "N77-C7706" - remote_port: "Ethernet6/1" sysname: "nyc-dc-d04" version: "Cisco Nexus Operating System (NX-OS) Software, Version 6.2(12)" - capabilities: "Router" dest_host: "nyc-dc-c91.ntc.com" local_interface: "FortyGigE0/2/1/1" mgmt_ip: "10.100.100.129" + neighbor_interface: "FortyGigE0/4/0/2" platform: "cisco CRS" - remote_port: "FortyGigE0/4/0/2" sysname: "nyc-dc-c91.ntc.com" version: "Cisco IOS XR Software, Version 5.1.2[Default]" - capabilities: "Router Switch" dest_host: "nyc-dc-d01.ntc.com(FXS182XXXXX)" local_interface: "FortyGigE0/2/0/0" mgmt_ip: "10.100.100.158" + neighbor_interface: "Ethernet6/1" platform: "N77-C7706" - remote_port: "Ethernet6/1" sysname: "nyc-dc-d01" version: "Cisco Nexus Operating System (NX-OS) Software, Version 6.2(12)" - capabilities: "Router Switch" dest_host: "nyc-dc-z50b.ntc.com(JAF181XXXXX)" local_interface: "FortyGigE0/2/0/1" mgmt_ip: "10.100.100.111" + neighbor_interface: "Ethernet4/3" platform: "N77-C7710" - remote_port: "Ethernet4/3" sysname: "nyc-dc-z50b" version: "Cisco Nexus Operating System (NX-OS) Software, Version 6.2(12)" - capabilities: "Router Switch IGMP" dest_host: "nyc-dc-dcc001.ntc.com" local_interface: "TenGigE0/3/0/0" mgmt_ip: "10.100.100.174" + neighbor_interface: "TenGigabitEthernet6/1" platform: "cisco WS-C4510R+E" - remote_port: "TenGigabitEthernet6/1" sysname: "" version: "Cisco IOS Software, Catalyst 4500 L3 Switch Software (cat4500e-UNIVERSALK9-M),\ \ Version 15.2(2)E3, RELEASE SOFTWARE (fc3)" @@ -127,32 +127,32 @@ parsed_sample: dest_host: "nyc-dc-d57" local_interface: "TenGigE0/3/0/1" mgmt_ip: "10.100.100.115" + neighbor_interface: "TenGigE0/2/0/0" platform: "cisco ASR9K Series" - remote_port: "TenGigE0/2/0/0" sysname: "nyc-dc-d57" version: "Cisco IOS XR Software, Version 4.3.2[Default]" - capabilities: "Router Switch" dest_host: "nyc-dc-d40b.ntc.com(JAF182XXXXX)" local_interface: "TenGigE0/3/0/2" mgmt_ip: "10.100.100.114" + neighbor_interface: "Ethernet4/1" platform: "N77-C7710" - remote_port: "Ethernet4/1" sysname: "nyc-dc-d40b" version: "Cisco Nexus Operating System (NX-OS) Software, Version 6.2(12)" - capabilities: "Router Switch IGMP" dest_host: "nyc-dc-d80.ntc.com(FOC184XXXXX)" local_interface: "TenGigE0/3/0/3" mgmt_ip: "10.100.100.117" + neighbor_interface: "Ethernet2/1" platform: "N5K-C56128P" - remote_port: "Ethernet2/1" sysname: "nyc-dc-d80" version: "Cisco Nexus Operating System (NX-OS) Software, Version 7.0(7)N1(1)" - capabilities: "Router Switch IGMP" dest_host: "nyc-dc-dcc002.ntc.com" local_interface: "TenGigE0/4/0/0" mgmt_ip: "10.100.100.178" + neighbor_interface: "TenGigabitEthernet6/1" platform: "cisco WS-C4510R+E" - remote_port: "TenGigabitEthernet6/1" sysname: "" version: "Cisco IOS Software, Catalyst 4500 L3 Switch Software (cat4500e-UNIVERSALK9-M),\ \ Version 15.2(2)E3, RELEASE SOFTWARE (fc3)" @@ -160,39 +160,39 @@ parsed_sample: dest_host: "nyc-dc-d57" local_interface: "TenGigE0/4/0/1" mgmt_ip: "10.100.100.115" + neighbor_interface: "TenGigE1/2/0/0" platform: "cisco ASR9K Series" - remote_port: "TenGigE1/2/0/0" sysname: "nyc-dc-d57" version: "Cisco IOS XR Software, Version 4.3.2[Default]" - capabilities: "Router Switch" dest_host: "nyc-dc-d40a.ntc.com(JAF182XXXXX)" local_interface: "TenGigE0/4/0/2" mgmt_ip: "10.100.100.113" + neighbor_interface: "Ethernet4/1" platform: "N77-C7710" - remote_port: "Ethernet4/1" sysname: "nyc-dc-d40a" version: "Cisco Nexus Operating System (NX-OS) Software, Version 6.2(12)" - capabilities: "Router Switch IGMP" dest_host: "nyc-dc-d81.ntc.com(FOC182XXXXX)" local_interface: "TenGigE0/4/0/3" mgmt_ip: "10.100.100.118" + neighbor_interface: "Ethernet1/1" platform: "N5K-C56128P" - remote_port: "Ethernet1/1" sysname: "nyc-dc-d81" version: "Cisco Nexus Operating System (NX-OS) Software, Version 7.0(7)N1(1)" - capabilities: "Router" dest_host: "nyc-dc-c97" local_interface: "FortyGigE0/6/0/0" mgmt_ip: "192.168.169.21" + neighbor_interface: "FortyGigE0/6/0/0" platform: "cisco ASR9K Series" - remote_port: "FortyGigE0/6/0/0" sysname: "nyc-dc-c97" version: "Cisco IOS XR Software, Version 5.3.4[Default]" - capabilities: "Router" dest_host: "nyc-dc-c97" local_interface: "FortyGigE0/6/0/0" mgmt_ip: "192.168.169.21" + neighbor_interface: "FortyGigE0/7/0/0" platform: "cisco ASR9K Series" - remote_port: "FortyGigE0/7/0/0" sysname: "nyc-dc-c97" version: "Cisco IOS XR Software, Version 5.3.4[Default]" From 140f96f2de89084f26d8022a8d74f46272ce32df Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sat, 2 Sep 2023 16:37:55 -0400 Subject: [PATCH 03/41] add LOCAL_INTERFACE to data_model.md --- docs/dev/data_model.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/dev/data_model.md b/docs/dev/data_model.md index b760a73d5d..9dbe5aba3b 100644 --- a/docs/dev/data_model.md +++ b/docs/dev/data_model.md @@ -35,7 +35,8 @@ Example: Imagine the extra programming logic needed to consume structured data w | `IPV6_ADDRESS` | for a single IPv6 address | | `IPV6_ADDRESSES` | for lists of IPv6 addresses | | `IPV6_GATEWAY` | for IPv6 gateway address | -| `LOCAL_IP_ADDRESS` | local IP address in the case of First Hop Redundancy Protocols (FHRP) +| `LOCAL_INTERFACE` | often represents local interface or port for CDP or LLDP | +| `LOCAL_IP_ADDRESS` | local IP address in the case of First Hop Redundancy Protocols (FHRP) | | `MAC_ADDRESS` | instead of MAC or MACADDR | | `MEMBER_INTERFACE` | list of physical member interface names that are bundled to make an etherchannel, LACP, LAG, or port-channel interface | | `MEMBER_INTERFACE_STATUS` | list of member interface statuses for an etherchannel, LACP, LAG, or port-channel interface | From d341a2f488b1814de63ced656abf53b973191481 Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sat, 2 Sep 2023 16:43:50 -0400 Subject: [PATCH 04/41] add NEIGHBOR_INTERFACE to data_model.md and reformat --- docs/dev/data_model.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/dev/data_model.md b/docs/dev/data_model.md index 9dbe5aba3b..5b38119c97 100644 --- a/docs/dev/data_model.md +++ b/docs/dev/data_model.md @@ -42,6 +42,7 @@ Example: Imagine the extra programming logic needed to consume structured data w | `MEMBER_INTERFACE_STATUS` | list of member interface statuses for an etherchannel, LACP, LAG, or port-channel interface | | `MGMT_IP_ADDRESS` | instead of MGMT_IP or MGMT_ADDRESS or MANAGEMENT_IP or REMOTE_MANAGEMENT_ADDRESS | | `NEIGHBOR_ID` | for router IDs remote to the system being parsed | +| `NEIGHBOR_INTERFACE` | often represents neighbor or remote interface or port for CDP or LLDP | | `NETMASK` | for IPv4 dotted quad masks | | `NETWORK` | for network numbers or subnet address (without the mask or prefix/slash notation); in place of ROUTE | | `PREFIX_LENGTH` | instead of PREFIX or CIDR for the numbers of a slash notation or CIDR mask | From d03578d1fa820a175365c0711184e0cae8e77b81 Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sat, 2 Sep 2023 16:59:15 -0400 Subject: [PATCH 05/41] replace NEIGHBOR_PORT with NEIGHBOR_INTERFACE in hp_procurve_show_cdp_neighbors_detail to normalize --- .../hp_procurve_show_cdp_neighbors_detail.textfsm | 4 ++-- .../hp_procurve_show_cdp_neighbors_detail.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ntc_templates/templates/hp_procurve_show_cdp_neighbors_detail.textfsm b/ntc_templates/templates/hp_procurve_show_cdp_neighbors_detail.textfsm index 720e2e3a4a..181581cfc8 100644 --- a/ntc_templates/templates/hp_procurve_show_cdp_neighbors_detail.textfsm +++ b/ntc_templates/templates/hp_procurve_show_cdp_neighbors_detail.textfsm @@ -3,7 +3,7 @@ Value NEIGHBOR_ID (.+?) Value NEIGHBOR_ADDRESS (.+?) Value NEIGHBOR_PLATFORM (.+?) Value NEIGHBOR_CAPABILITY (.+?) -Value NEIGHBOR_PORT (.+?) +Value NEIGHBOR_INTERFACE (.+?) Value NEIGHBOR_VERSION (.+?) Start @@ -14,7 +14,7 @@ Start ^\s*Address\s*:\s*${NEIGHBOR_ADDRESS}\s*$$ ^\s*Platform\s*:\s*${NEIGHBOR_PLATFORM}\s*$$ ^\s*Capability\s*:\s*${NEIGHBOR_CAPABILITY}\s*$$ - ^\s*Device\s+Port\s*:\s*${NEIGHBOR_PORT}\s*$$ + ^\s*Device\s+Port\s*:\s*${NEIGHBOR_INTERFACE}\s*$$ ^\s*Version\s*:\s*${NEIGHBOR_VERSION}\s*$$ -> Record ^\s*$$ ^\s*---- diff --git a/tests/hp_procurve/show_cdp_neighbors_detail/hp_procurve_show_cdp_neighbors_detail.yml b/tests/hp_procurve/show_cdp_neighbors_detail/hp_procurve_show_cdp_neighbors_detail.yml index b35cc763c3..4b6ff64306 100644 --- a/tests/hp_procurve/show_cdp_neighbors_detail/hp_procurve_show_cdp_neighbors_detail.yml +++ b/tests/hp_procurve/show_cdp_neighbors_detail/hp_procurve_show_cdp_neighbors_detail.yml @@ -4,27 +4,27 @@ parsed_sample: neighbor_address: "10.11.11.16" neighbor_capability: "Router" neighbor_id: "AP01-Site" + neighbor_interface: "ge1" neighbor_platform: "5.9.1.5-001RAP-6521-60020-WR" - neighbor_port: "ge1" neighbor_version: "5.9.1.5-001RAP-6521-60020-WR" - local_interface: "1" neighbor_address: "10.11.11.16" neighbor_capability: "Router" neighbor_id: "5c 0e 8b 11 11 11" + neighbor_interface: "ge1" neighbor_platform: "AP-6521-60020-WR, Version 5.9.1.5-001R" - neighbor_port: "ge1" neighbor_version: "AP-6521-60020-WR, Version 5.9.1.5-001R" - local_interface: "2" neighbor_address: "Unsupported format" neighbor_capability: "Router" neighbor_id: "5c 0e 8b 12 22 22" + neighbor_interface: "ge1" neighbor_platform: "AP-6521-60020-WR, Version 5.9.1.5-001R" - neighbor_port: "ge1" neighbor_version: "AP-6521-60020-WR, Version 5.9.1.5-001R" - local_interface: "2" neighbor_address: "10.11.11.17" neighbor_capability: "Router" neighbor_id: "AP02-Site" + neighbor_interface: "ge1" neighbor_platform: "5.9.1.5-001RAP-6521-60020-WR" - neighbor_port: "ge1" neighbor_version: "5.9.1.5-001RAP-6521-60020-WR" From 0478a2cee2854693fe12efd10bca645ad81c4f9d Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sat, 2 Sep 2023 17:13:23 -0400 Subject: [PATCH 06/41] replace PORT_INFO with NEIGHBOR_INTERFACE for juniper_junos_show_lldp_neighbors to normalize --- .../juniper_junos_show_lldp_neighbors.textfsm | 4 ++-- .../juniper_junos_show_lldp_neighbors.yml | 12 +++++----- .../juniper_junos_show_lldp_neighbors_ae7.raw | 5 +++++ .../juniper_junos_show_lldp_neighbors_ae7.yml | 22 +++++++++++++++++++ 4 files changed, 35 insertions(+), 8 deletions(-) create mode 100644 tests/juniper_junos/show_lldp_neighbors/juniper_junos_show_lldp_neighbors_ae7.raw create mode 100644 tests/juniper_junos/show_lldp_neighbors/juniper_junos_show_lldp_neighbors_ae7.yml diff --git a/ntc_templates/templates/juniper_junos_show_lldp_neighbors.textfsm b/ntc_templates/templates/juniper_junos_show_lldp_neighbors.textfsm index 4a1e32d48b..783ffa3c80 100644 --- a/ntc_templates/templates/juniper_junos_show_lldp_neighbors.textfsm +++ b/ntc_templates/templates/juniper_junos_show_lldp_neighbors.textfsm @@ -1,11 +1,11 @@ Value Required LOCAL_INTERFACE (\S+) Value Required PARENT_INTERFACE (\S+) Value Required CHASSIS_ID (\S+) -Value Required PORT_INFO (\S+) +Value Required NEIGHBOR_INTERFACE (\S+) Value Required SYSTEM_NAME (\S+) Start ^Local\s+Interface\s+Parent\s+Interface\s+Chassis\s+Id\s+Port\s+info\s+System\s+Name - ^${LOCAL_INTERFACE}\s*${PARENT_INTERFACE}\s+${CHASSIS_ID}\s+${PORT_INFO}\s+${SYSTEM_NAME} -> Record + ^${LOCAL_INTERFACE}\s*${PARENT_INTERFACE}\s+${CHASSIS_ID}\s+${NEIGHBOR_INTERFACE}\s+${SYSTEM_NAME} -> Record ^\s*$$ ^. -> Error \ No newline at end of file diff --git a/tests/juniper_junos/show_lldp_neighbors/juniper_junos_show_lldp_neighbors.yml b/tests/juniper_junos/show_lldp_neighbors/juniper_junos_show_lldp_neighbors.yml index e5a1ce9b16..13e7369b75 100644 --- a/tests/juniper_junos/show_lldp_neighbors/juniper_junos_show_lldp_neighbors.yml +++ b/tests/juniper_junos/show_lldp_neighbors/juniper_junos_show_lldp_neighbors.yml @@ -1,12 +1,12 @@ --- parsed_sample: - - local_interface: "ge-0/0/1" + - chassis_id: "2c:6b:f5:a1:c2:c0" + local_interface: "ge-0/0/1" + neighbor_interface: "ge-0/0/1" parent_interface: "-" - chassis_id: "2c:6b:f5:a1:c2:c0" - port_info: "ge-0/0/1" system_name: "vmx2" - - local_interface: "ge-0/0/0" + - chassis_id: "2c:6b:f5:a2:08:c0" + local_interface: "ge-0/0/0" + neighbor_interface: "ge-0/0/0" parent_interface: "-" - chassis_id: "2c:6b:f5:a2:08:c0" - port_info: "ge-0/0/0" system_name: "vmx3" diff --git a/tests/juniper_junos/show_lldp_neighbors/juniper_junos_show_lldp_neighbors_ae7.raw b/tests/juniper_junos/show_lldp_neighbors/juniper_junos_show_lldp_neighbors_ae7.raw new file mode 100644 index 0000000000..da8b0bdb4f --- /dev/null +++ b/tests/juniper_junos/show_lldp_neighbors/juniper_junos_show_lldp_neighbors_ae7.raw @@ -0,0 +1,5 @@ +Local Interface Parent Interface Chassis Id Port info System Name +xe-0/1/1 ae7 00:1c:73:ee:c0:46 Ethernet3/29/1 core01.sjc01 +xe-0/3/3 ae7 00:1c:73:ee:c0:46 Ethernet3/29/2 core01.sjc01 +xe-2/0/5 ae7 00:1c:73:ee:c0:46 Ethernet3/29/3 core01.sjc01 +xe-2/1/5 ae7 00:1c:73:ee:c0:46 Ethernet3/29/4 core01.sjc01 diff --git a/tests/juniper_junos/show_lldp_neighbors/juniper_junos_show_lldp_neighbors_ae7.yml b/tests/juniper_junos/show_lldp_neighbors/juniper_junos_show_lldp_neighbors_ae7.yml new file mode 100644 index 0000000000..1f8cae6a21 --- /dev/null +++ b/tests/juniper_junos/show_lldp_neighbors/juniper_junos_show_lldp_neighbors_ae7.yml @@ -0,0 +1,22 @@ +--- +parsed_sample: + - chassis_id: "00:1c:73:ee:c0:46" + local_interface: "xe-0/1/1" + neighbor_interface: "Ethernet3/29/1" + parent_interface: "ae7" + system_name: "core01.sjc01" + - chassis_id: "00:1c:73:ee:c0:46" + local_interface: "xe-0/3/3" + neighbor_interface: "Ethernet3/29/2" + parent_interface: "ae7" + system_name: "core01.sjc01" + - chassis_id: "00:1c:73:ee:c0:46" + local_interface: "xe-2/0/5" + neighbor_interface: "Ethernet3/29/3" + parent_interface: "ae7" + system_name: "core01.sjc01" + - chassis_id: "00:1c:73:ee:c0:46" + local_interface: "xe-2/1/5" + neighbor_interface: "Ethernet3/29/4" + parent_interface: "ae7" + system_name: "core01.sjc01" From 5eba71f6468d686b4f831a938c089f4de961a61b Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sat, 2 Sep 2023 18:19:16 -0400 Subject: [PATCH 07/41] replace SYSTEM_CAPABILITIES_SUPPORTED with CAPABILITIES_SUPPORTED in hp_procurve_show_lldp_info_remote-device_detail to normalize --- docs/dev/data_model.md | 1 + ...how_lldp_info_remote-device_detail.textfsm | 4 +-- ...ve_show_lldp_info_remote-device_detail.yml | 32 +++++++++---------- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/docs/dev/data_model.md b/docs/dev/data_model.md index 5b38119c97..158e45e1d6 100644 --- a/docs/dev/data_model.md +++ b/docs/dev/data_model.md @@ -25,6 +25,7 @@ Example: Imagine the extra programming logic needed to consume structured data w | `BUNDLE_PROTOCOL` | virtual interface protocol type (LACP, PAgP) for etherchannel or port-channel interfaces | | `BUNDLE_PROTOCOL_STATE` | virtual interface protocol state for etherchannel or port-channel interfaces | | `BUNDLE_STATUS` | virtual interface status for etherchannel, LACP, LAG, or port-channel interfaces | +| `CAPABILITIES_SUPPORTED` | often represents neighbor capabilities from CDP or LLDP | | `DESCRIPTION` | often used for port or interface descriptions | | `GATEWAY` | gateway address for a subnet | | `INTERFACE` | full word instead of IFACE, INTF, INTFC, etc | diff --git a/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device_detail.textfsm b/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device_detail.textfsm index 13aa7e657c..8a80da22a9 100644 --- a/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device_detail.textfsm +++ b/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device_detail.textfsm @@ -7,7 +7,7 @@ Value NEIGHBOR_SYSNAME (.*?) Value SYSTEM_DESCR (.*?) Value PORT_DESCR (\S+|.*?) Value PVID (\d+|.*?) -Value SYSTEM_CAPABILITIES_SUPPORTED (.*?) +Value CAPABILITIES_SUPPORTED (.*?) Value SYSTEM_CAPABILITIES_ENABLED (.*?) Value REMOTE_MANAGEMENT_ADDRESS (\S+|.*?) @@ -26,7 +26,7 @@ LLDP ^\s+System\sDescr\s:\s${SYSTEM_DESCR}\s*$$ ^\s+PortDescr\s+:\s${PORT_DESCR}\s*$$ ^\s+Pvid\s+:\s${PVID}\s*$$ - ^\s+System\s+Capabilities\s+Supported\s+:\s${SYSTEM_CAPABILITIES_SUPPORTED}\s*$$ + ^\s+System\s+Capabilities\s+Supported\s+:\s${CAPABILITIES_SUPPORTED}\s*$$ ^\s+System\s+Capabilities\s+Enabled\s+:\s${SYSTEM_CAPABILITIES_ENABLED}\s*$$ ^\s+Remote\s+Management\s+Address\s*$$ ^\s+Type.*$$ diff --git a/tests/hp_procurve/show_lldp_info_remote-device_detail/hp_procurve_show_lldp_info_remote-device_detail.yml b/tests/hp_procurve/show_lldp_info_remote-device_detail/hp_procurve_show_lldp_info_remote-device_detail.yml index aede064d46..3749b6edb3 100644 --- a/tests/hp_procurve/show_lldp_info_remote-device_detail/hp_procurve_show_lldp_info_remote-device_detail.yml +++ b/tests/hp_procurve/show_lldp_info_remote-device_detail/hp_procurve_show_lldp_info_remote-device_detail.yml @@ -1,6 +1,7 @@ --- parsed_sample: - - local_interface: "1" + - capabilities_supported: "bridge, router" + local_interface: "1" neighbor_chassis_id: "3821c7-c1cd00" neighbor_chassis_type: "mac-address" neighbor_portid: "1" @@ -10,9 +11,9 @@ parsed_sample: pvid: "0" remote_management_address: "192.168.130.100" system_capabilities_enabled: "bridge" - system_capabilities_supported: "bridge, router" system_descr: "Aruba JL357A 2540-48G-PoE+-4SFP+ Switch, revision YC.16.0..." - - local_interface: "3" + - capabilities_supported: "" + local_interface: "3" neighbor_chassis_id: "3ce1a1-2218f0" neighbor_chassis_type: "mac-address" neighbor_portid: "3c e1 a1 22 18 f0" @@ -22,9 +23,9 @@ parsed_sample: pvid: "" remote_management_address: "" system_capabilities_enabled: "" - system_capabilities_supported: "" system_descr: "" - - local_interface: "7" + - capabilities_supported: "bridge, wlan-access-point" + local_interface: "7" neighbor_chassis_id: "bcf310-1f8b40" neighbor_chassis_type: "mac-address" neighbor_portid: "mgt0" @@ -34,9 +35,9 @@ parsed_sample: pvid: "" remote_management_address: "192.168.100.55" system_capabilities_enabled: "bridge, wlan-access-point" - system_capabilities_supported: "bridge, wlan-access-point" system_descr: "" - - local_interface: "25" + - capabilities_supported: "" + local_interface: "25" neighbor_chassis_id: "d8cb8a-6d303c" neighbor_chassis_type: "mac-address" neighbor_portid: "d8 cb 8a 6d 30 3c" @@ -46,9 +47,9 @@ parsed_sample: pvid: "" remote_management_address: "" system_capabilities_enabled: "" - system_capabilities_supported: "" system_descr: "" - - local_interface: "29" + - capabilities_supported: "" + local_interface: "29" neighbor_chassis_id: "484d7e-e66c42" neighbor_chassis_type: "mac-address" neighbor_portid: "48 4d 7e e6 6c 42" @@ -58,9 +59,9 @@ parsed_sample: pvid: "" remote_management_address: "" system_capabilities_enabled: "" - system_capabilities_supported: "" system_descr: "" - - local_interface: "36" + - capabilities_supported: "bridge, wlan-access-point, router" + local_interface: "36" neighbor_chassis_id: "603197-7aa548" neighbor_chassis_type: "mac-address" neighbor_portid: "1" @@ -70,9 +71,9 @@ parsed_sample: pvid: "" remote_management_address: "192.168.100.50" system_capabilities_enabled: "bridge, wlan-access-point, router" - system_capabilities_supported: "bridge, wlan-access-point, router" system_descr: "ZLD 6.00(###.8)B1 (cannon)" - - local_interface: "37" + - capabilities_supported: "" + local_interface: "37" neighbor_chassis_id: "b00cd1-359a98" neighbor_chassis_type: "mac-address" neighbor_portid: "b0 0c d1 35 9a 98" @@ -82,9 +83,9 @@ parsed_sample: pvid: "" remote_management_address: "" system_capabilities_enabled: "" - system_capabilities_supported: "" system_descr: "" - - local_interface: "42" + - capabilities_supported: "" + local_interface: "42" neighbor_chassis_id: "d8cb8a-894644" neighbor_chassis_type: "mac-address" neighbor_portid: "d8 cb 8a 89 46 44" @@ -94,5 +95,4 @@ parsed_sample: pvid: "" remote_management_address: "" system_capabilities_enabled: "" - system_capabilities_supported: "" system_descr: "" From 60f3e40c6b68c9adbaaa416833d8c5b726f4efda Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sat, 2 Sep 2023 18:47:54 -0400 Subject: [PATCH 08/41] replace several capture groups for broadcom_icos_show_isdp_neighbors to normalize with CDP/LLDP --- .../broadcom_icos_show_isdp_neighbors.textfsm | 12 +-- .../broadcom_icos_show_isdp_neighbors.yml | 88 +++++++++---------- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/ntc_templates/templates/broadcom_icos_show_isdp_neighbors.textfsm b/ntc_templates/templates/broadcom_icos_show_isdp_neighbors.textfsm index 8c468de32d..9729d9dc33 100644 --- a/ntc_templates/templates/broadcom_icos_show_isdp_neighbors.textfsm +++ b/ntc_templates/templates/broadcom_icos_show_isdp_neighbors.textfsm @@ -1,9 +1,9 @@ -Value ID (\S+) -Value INTERFACE (\S+) +Value NEIGHBOR_NAME (\S+) +Value LOCAL_INTERFACE (\S+) Value HOLDTIME (\S+) -Value CAPABILITY ([\w]{1}(?:\s[\w]){0,2}) +Value CAPABILITIES ([\w]{1}(?:\s[\w]){0,2}) Value PLATFORM ((\S+\s\S+)|(\S+)) -Value PORT (.+) +Value NEIGHBOR_INTERFACE (.+) Start # Captures show isdp neighbors for: @@ -13,6 +13,6 @@ Start ^\s+\S+\s+- ^\s*Device\s+ID\s+Intf\s+Holdtime\s+Capability\s+Platform\s+Port\s+ID$$ ^-+ - ^\s*${ID}\s+${INTERFACE}\s+${HOLDTIME}\s+${CAPABILITY}\s+${PLATFORM}\s+${PORT} -> Record + ^\s*${NEIGHBOR_NAME}\s+${LOCAL_INTERFACE}\s+${HOLDTIME}\s+${CAPABILITIES}\s+${PLATFORM}\s+${NEIGHBOR_INTERFACE} -> Record ^\s*$$ - ^. -> Error \ No newline at end of file + ^. -> Error diff --git a/tests/broadcom_icos/show_isdp_neighbors/broadcom_icos_show_isdp_neighbors.yml b/tests/broadcom_icos/show_isdp_neighbors/broadcom_icos_show_isdp_neighbors.yml index 041d1d11dc..990f871d13 100644 --- a/tests/broadcom_icos/show_isdp_neighbors/broadcom_icos_show_isdp_neighbors.yml +++ b/tests/broadcom_icos/show_isdp_neighbors/broadcom_icos_show_isdp_neighbors.yml @@ -1,68 +1,68 @@ --- parsed_sample: - - id: "AP00-1-00001" - interface: "0/1" + - capabilities: "T B I" holdtime: "173" - capability: "T B I" + local_interface: "0/1" + neighbor_interface: "GigabitEt" + neighbor_name: "AP00-1-00001" platform: "cisco AIR-CAP270" - port: "GigabitEt" - - id: "AP00-2-00002" - interface: "0/2" + - capabilities: "T B I" holdtime: "139" - capability: "T B I" + local_interface: "0/2" + neighbor_interface: "GigabitEt" + neighbor_name: "AP00-2-00002" platform: "cisco AIR-CAP270" - port: "GigabitEt" - - id: "AP00-15-00050D" - interface: "0/3" + - capabilities: "R T" holdtime: "127" - capability: "R T" + local_interface: "0/3" + neighbor_interface: "GigabitEt" + neighbor_name: "AP00-15-00050D" platform: "cisco AIR-AP3802" - port: "GigabitEt" - - id: "AP00-1-00115F" - interface: "0/4" + - capabilities: "R T" holdtime: "170" - capability: "R T" + local_interface: "0/4" + neighbor_interface: "GigabitEt" + neighbor_name: "AP00-1-00115F" platform: "cisco AIR-AP3802" - port: "GigabitEt" - - id: "AP00-22-01665A" - interface: "0/5" + - capabilities: "R T" holdtime: "143" - capability: "R T" + local_interface: "0/5" + neighbor_interface: "GigabitEt" + neighbor_name: "AP00-22-01665A" platform: "cisco AIR-AP3802" - port: "GigabitEt" - - id: "dev1-df-loc-sw000001" - interface: "0/35" + - capabilities: "R" holdtime: "161" - capability: "R" + local_interface: "0/35" + neighbor_interface: "0/1" + neighbor_name: "dev1-df-loc-sw000001" platform: "BCM-56340" - port: "0/1" - - id: "dev2-dd-loc-sw000001" - interface: "0/37" + - capabilities: "R" holdtime: "178" - capability: "R" + local_interface: "0/37" + neighbor_interface: "0/1" + neighbor_name: "dev2-dd-loc-sw000001" platform: "BCM-56340" - port: "0/1" - - id: "dev3-ds-loc-sw000001" - interface: "0/39" + - capabilities: "R" holdtime: "157" - capability: "R" + local_interface: "0/39" + neighbor_interface: "0/1" + neighbor_name: "dev3-ds-loc-sw000001" platform: "BCM-56340" - port: "0/1" - - id: "dev4-da-loc-sw000001" - interface: "0/43" + - capabilities: "R" holdtime: "179" - capability: "R" + local_interface: "0/43" + neighbor_interface: "0/1" + neighbor_name: "dev4-da-loc-sw000001" platform: "BCM-56340" - port: "0/1" - - id: "dev5-ab-loc-sw0001" - interface: "0/49" + - capabilities: "R" holdtime: "154" - capability: "R" + local_interface: "0/49" + neighbor_interface: "0/1" + neighbor_name: "dev5-ab-loc-sw0001" platform: "AS5610-52X" - port: "0/1" - - id: "dev6-aa-loc-sw0002" - interface: "0/50" + - capabilities: "R" holdtime: "158" - capability: "R" + local_interface: "0/50" + neighbor_interface: "0/1" + neighbor_name: "dev6-aa-loc-sw0002" platform: "AS5610-52X" - port: "0/1" From 3bd17230c792465f94c7b4a2f7d903a1db5c9425 Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sat, 2 Sep 2023 18:52:01 -0400 Subject: [PATCH 09/41] replace CAPABILITY with CAPABILITIES to normalize across CDP/LLDP --- docs/dev/data_model.md | 1 + .../cisco_ios_show_cdp_neighbors.textfsm | 6 +- .../cisco_nxos_show_cdp_neighbors.textfsm | 6 +- .../ipinfusion_ocnos_show_lldp_table.textfsm | 4 +- .../cisco_ios_show_cdp_neighbors.yml | 36 +++++----- .../cisco_ios_show_cdp_neighbors_2.yml | 22 +++--- .../cisco_ios_show_cdp_neighbors_3.yml | 44 ++++++------ .../cisco_ios_show_cdp_neighbors_4.yml | 6 +- .../cisco_nxos_show_cdp_neighbors.yml | 56 +++++++-------- .../cisco_nxos_show_cdp_neighbors2.yml | 48 ++++++------- .../ipinfusion_ocnos_show_lldp_table.yml | 70 +++++++++---------- 11 files changed, 150 insertions(+), 149 deletions(-) diff --git a/docs/dev/data_model.md b/docs/dev/data_model.md index 158e45e1d6..0759f39a16 100644 --- a/docs/dev/data_model.md +++ b/docs/dev/data_model.md @@ -25,6 +25,7 @@ Example: Imagine the extra programming logic needed to consume structured data w | `BUNDLE_PROTOCOL` | virtual interface protocol type (LACP, PAgP) for etherchannel or port-channel interfaces | | `BUNDLE_PROTOCOL_STATE` | virtual interface protocol state for etherchannel or port-channel interfaces | | `BUNDLE_STATUS` | virtual interface status for etherchannel, LACP, LAG, or port-channel interfaces | +| `CAPABILITIES` | often represents active/operational neighbor capabilities shared via CDP or LLDP | | `CAPABILITIES_SUPPORTED` | often represents neighbor capabilities from CDP or LLDP | | `DESCRIPTION` | often used for port or interface descriptions | | `GATEWAY` | gateway address for a subnet | diff --git a/ntc_templates/templates/cisco_ios_show_cdp_neighbors.textfsm b/ntc_templates/templates/cisco_ios_show_cdp_neighbors.textfsm index 98b3cff9f1..78616b6aa5 100644 --- a/ntc_templates/templates/cisco_ios_show_cdp_neighbors.textfsm +++ b/ntc_templates/templates/cisco_ios_show_cdp_neighbors.textfsm @@ -1,6 +1,6 @@ Value Required NEIGHBOR (\S+) Value LOCAL_INTERFACE (\S+(?:\s\S+)?) -Value CAPABILITY ((?:\w\s)*\w) +Value CAPABILITIES ((?:\w\s)*\w) Value PLATFORM ((?:[IiPp]{2}\s)?\S+) Value NEIGHBOR_INTERFACE (.+?) @@ -12,5 +12,5 @@ Start CDP ^${NEIGHBOR}$$ - ^\s*${LOCAL_INTERFACE}\s+\d+\s+${CAPABILITY}\s+${PLATFORM}\s+${NEIGHBOR_INTERFACE}\s*$$ -> Record - ^${NEIGHBOR}\s+${LOCAL_INTERFACE}\s+\d+\s+${CAPABILITY}\s+${PLATFORM}\s+${NEIGHBOR_INTERFACE}\s*$$ -> Record + ^\s*${LOCAL_INTERFACE}\s+\d+\s+${CAPABILITIES}\s+${PLATFORM}\s+${NEIGHBOR_INTERFACE}\s*$$ -> Record + ^${NEIGHBOR}\s+${LOCAL_INTERFACE}\s+\d+\s+${CAPABILITIES}\s+${PLATFORM}\s+${NEIGHBOR_INTERFACE}\s*$$ -> Record diff --git a/ntc_templates/templates/cisco_nxos_show_cdp_neighbors.textfsm b/ntc_templates/templates/cisco_nxos_show_cdp_neighbors.textfsm index 4b4eb21e4d..d1943e8ddb 100644 --- a/ntc_templates/templates/cisco_nxos_show_cdp_neighbors.textfsm +++ b/ntc_templates/templates/cisco_nxos_show_cdp_neighbors.textfsm @@ -1,7 +1,7 @@ Value Required,Filldown NEIGHBOR (\S+) Value Required LOCAL_INTERFACE (\S+) Value HOLDTIME (\d+) -Value CAPABILITY ([\S+\s+]+?) +Value CAPABILITIES ([\S+\s+]+?) Value PLATFORM (\S+) Value NEIGHBOR_INTERFACE (\S+) @@ -9,8 +9,8 @@ Start ^Device.*ID -> CDP CDP - ^${NEIGHBOR}\s+${LOCAL_INTERFACE}\s+${HOLDTIME}\s+${CAPABILITY}\s+${PLATFORM}\s+${NEIGHBOR_INTERFACE}\s*$$ -> Record + ^${NEIGHBOR}\s+${LOCAL_INTERFACE}\s+${HOLDTIME}\s+${CAPABILITIES}\s+${PLATFORM}\s+${NEIGHBOR_INTERFACE}\s*$$ -> Record ^${NEIGHBOR}\s*$$ - ^\s+${LOCAL_INTERFACE}\s+${HOLDTIME}\s+${CAPABILITY}\s+${PLATFORM}\s+${NEIGHBOR_INTERFACE}\s*$$ -> Record + ^\s+${LOCAL_INTERFACE}\s+${HOLDTIME}\s+${CAPABILITIES}\s+${PLATFORM}\s+${NEIGHBOR_INTERFACE}\s*$$ -> Record diff --git a/ntc_templates/templates/ipinfusion_ocnos_show_lldp_table.textfsm b/ntc_templates/templates/ipinfusion_ocnos_show_lldp_table.textfsm index fdab3aab9f..7faedf3ba3 100644 --- a/ntc_templates/templates/ipinfusion_ocnos_show_lldp_table.textfsm +++ b/ntc_templates/templates/ipinfusion_ocnos_show_lldp_table.textfsm @@ -1,7 +1,7 @@ Value LOCAL_INTERFACE (\S+) Value NEIGHBOR (\S+) Value NEIGHBOR_INTERFACE (\S+) -Value CAPABILITY (R|B|O|RO|RB|BR|BO|OR|OB|RBO|ROB|BRO|BOR|ORB|OBR) +Value CAPABILITIES (R|B|O|RO|RB|BR|BO|OR|OB|RBO|ROB|BRO|BOR|ORB|OBR) Value NEIGHBOR_INTERFACE_DESCR (\S+) Start @@ -11,7 +11,7 @@ Start ^. -> Error Row - ^${LOCAL_INTERFACE}\s+${NEIGHBOR}\s+${NEIGHBOR_INTERFACE}\s+${CAPABILITY}\s+${NEIGHBOR_INTERFACE_DESCR} -> Record + ^${LOCAL_INTERFACE}\s+${NEIGHBOR}\s+${NEIGHBOR_INTERFACE}\s+${CAPABILITIES}\s+${NEIGHBOR_INTERFACE_DESCR} -> Record ^-+ ^[\w+\s+]*:\s+\d+ ^. -> Error diff --git a/tests/cisco_ios/show_cdp_neighbors/cisco_ios_show_cdp_neighbors.yml b/tests/cisco_ios/show_cdp_neighbors/cisco_ios_show_cdp_neighbors.yml index 5b9b268e87..930cecc984 100644 --- a/tests/cisco_ios/show_cdp_neighbors/cisco_ios_show_cdp_neighbors.yml +++ b/tests/cisco_ios/show_cdp_neighbors/cisco_ios_show_cdp_neighbors.yml @@ -1,32 +1,32 @@ --- parsed_sample: - - neighbor: "R1-PBX" + - capabilities: "R S I" local_interface: "Gig 1/0/10" - capability: "R S I" - platform: "2811" + neighbor: "R1-PBX" neighbor_interface: "Fas 0/0" - - neighbor: "TS-1" + platform: "2811" + - capabilities: "R" local_interface: "Gig 1/0/39" - capability: "R" - platform: "2611" + neighbor: "TS-1" neighbor_interface: "Eth 0/1" - - neighbor: "Cisco-WAP-N" + platform: "2611" + - capabilities: "T I" local_interface: "Gig 1/0/1" - capability: "T I" - platform: "AIR-AP125" + neighbor: "Cisco-WAP-N" neighbor_interface: "Gig 0" - - neighbor: "SEP04FE7F689D33" + platform: "AIR-AP125" + - capabilities: "H P" local_interface: "Gig 1/0/2" - capability: "H P" - platform: "IP Phone" + neighbor: "SEP04FE7F689D33" neighbor_interface: "Port 1" - - neighbor: "SEP000DBC50FCD1" - local_interface: "Gig 1/0/4" - capability: "H P" platform: "IP Phone" + - capabilities: "H P" + local_interface: "Gig 1/0/4" + neighbor: "SEP000DBC50FCD1" neighbor_interface: "Port 1" - - neighbor: "SEP00124362C4D2" - local_interface: "Gig 1/0/42" - capability: "H P" platform: "IP Phone" + - capabilities: "H P" + local_interface: "Gig 1/0/42" + neighbor: "SEP00124362C4D2" neighbor_interface: "Port 1" + platform: "IP Phone" diff --git a/tests/cisco_ios/show_cdp_neighbors/cisco_ios_show_cdp_neighbors_2.yml b/tests/cisco_ios/show_cdp_neighbors/cisco_ios_show_cdp_neighbors_2.yml index 7b14c82688..af7baee33f 100644 --- a/tests/cisco_ios/show_cdp_neighbors/cisco_ios_show_cdp_neighbors_2.yml +++ b/tests/cisco_ios/show_cdp_neighbors/cisco_ios_show_cdp_neighbors_2.yml @@ -1,56 +1,56 @@ --- parsed_sample: - - capability: "R I" + - capabilities: "R I" local_interface: "Ten 1/1/3" neighbor: "asr1002-2.some.example.com" neighbor_interface: "Ten 0/1/0" platform: "ASR1002-H" - - capability: "H" + - capabilities: "H" local_interface: "Ten 1/0/6" neighbor: "vWAAS3b" neighbor_interface: "Virtual 2/0" platform: "OE-VWAAS" - - capability: "H" + - capabilities: "H" local_interface: "Ten 1/0/6" neighbor: "vWAAS3b" neighbor_interface: "Virtual 1/0" platform: "OE-VWAAS" - - capability: "H" + - capabilities: "H" local_interface: "Ten 1/0/7" neighbor: "vWAAS4b" neighbor_interface: "Virtual 2/0" platform: "OE-VWAAS" - - capability: "H" + - capabilities: "H" local_interface: "Ten 1/0/7" neighbor: "vWAAS4b" neighbor_interface: "Virtual 1/0" platform: "OE-VWAAS" - - capability: "S I" + - capabilities: "S I" local_interface: "Gig 0/0" neighbor: "NEXTGENLABSWT01.some.example.com" neighbor_interface: "Gig 0/23" platform: "WS-C3560X" - - capability: "R B S I" + - capabilities: "R B S I" local_interface: "Ten 1/0/4" neighbor: "router01.some.example.com" neighbor_interface: "Gig 0/0" platform: "CISCO2911" - - capability: "R S I" + - capabilities: "R S I" local_interface: "Ten 1/1/6" neighbor: "9300mgig-1.some.example.com" neighbor_interface: "Ten 1/1/7" platform: "C9300-24U" - - capability: "R S I" + - capabilities: "R S I" local_interface: "Ten 1/1/7" neighbor: "9300mgig-1.some.example.com" neighbor_interface: "Ten 1/1/6" platform: "C9300-24U" - - capability: "R S I" + - capabilities: "R S I" local_interface: "Ten 1/1/8" neighbor: "9500-1.some.example.com" neighbor_interface: "Ten 2/0/36" platform: "C9500-40X" - - capability: "R S I" + - capabilities: "R S I" local_interface: "Ten 1/1/1" neighbor: "9300mgig-2.some.example.com" neighbor_interface: "Ten 1/1/2" diff --git a/tests/cisco_ios/show_cdp_neighbors/cisco_ios_show_cdp_neighbors_3.yml b/tests/cisco_ios/show_cdp_neighbors/cisco_ios_show_cdp_neighbors_3.yml index f52706491f..c6fd760efe 100644 --- a/tests/cisco_ios/show_cdp_neighbors/cisco_ios_show_cdp_neighbors_3.yml +++ b/tests/cisco_ios/show_cdp_neighbors/cisco_ios_show_cdp_neighbors_3.yml @@ -1,111 +1,111 @@ --- parsed_sample: - - capability: "H P" + - capabilities: "H P" local_interface: "Gig 1/0/16" neighbor: "SEP000000000000" neighbor_interface: "port 1" platform: "IP Phone" - - capability: "T B I" + - capabilities: "T B I" local_interface: "Gig 1/0/45" neighbor: "AP000000000" neighbor_interface: "Gig 0" platform: "AIR-CAP35" - - capability: "T B I" + - capabilities: "T B I" local_interface: "Gig 1/0/46" neighbor: "AP000000001" neighbor_interface: "Gig 0" platform: "AIR-CAP35" - - capability: "T" + - capabilities: "T" local_interface: "Gig 1/0/1" neighbor: "WAAS0000000" neighbor_interface: "InlinePort 1/1/lan" platform: "OE474" - - capability: "H" + - capabilities: "H" local_interface: "Gig 1/0/40" neighbor: "WAAS0000000" neighbor_interface: "Gig 1/0" platform: "OE474" - - capability: "R B S" + - capabilities: "R B S" local_interface: "Gig 1/0/1" neighbor: "router.domain.local" neighbor_interface: "Gig 0/0" platform: "CISCO2911" - - capability: "H P M" + - capabilities: "H P M" local_interface: "Gig 1/0/33" neighbor: "SEP000000000001" neighbor_interface: "Port 1" platform: "IP Phone" - - capability: "H P M" + - capabilities: "H P M" local_interface: "Gig 1/0/29" neighbor: "SEP000000000002" neighbor_interface: "Port 1" platform: "IP Phone" - - capability: "H P M" + - capabilities: "H P M" local_interface: "Gig 1/0/30" neighbor: "SEP000000000003" neighbor_interface: "Port 1" platform: "IP Phone" - - capability: "H P M" + - capabilities: "H P M" local_interface: "Gig 1/0/14" neighbor: "SEP000000000004" neighbor_interface: "Port 1" platform: "IP Phone" - - capability: "H P M" + - capabilities: "H P M" local_interface: "Gig 1/0/8" neighbor: "SEP000000000005" neighbor_interface: "Port 1" platform: "IP Phone" - - capability: "H P M" + - capabilities: "H P M" local_interface: "Gig 1/0/13" neighbor: "SEP000000000006" neighbor_interface: "Port 1" platform: "IP Phone" - - capability: "H P" + - capabilities: "H P" local_interface: "Gig 1/0/15" neighbor: "SEP000000000007" neighbor_interface: "eth0" platform: "CTS-CODEC" - - capability: "H P M" + - capabilities: "H P M" local_interface: "Gig 1/0/37" neighbor: "SEP000000000008" neighbor_interface: "Port 1" platform: "IP Phone" - - capability: "H P M" + - capabilities: "H P M" local_interface: "Gig 1/0/34" neighbor: "SEP000000000009" neighbor_interface: "Port 1" platform: "IP Phone" - - capability: "H P" + - capabilities: "H P" local_interface: "Gig 1/0/21" neighbor: "SEP00000000000A" neighbor_interface: "eth0" platform: "CTS-CODEC" - - capability: "H P M" + - capabilities: "H P M" local_interface: "Gig 1/0/35" neighbor: "SEP00000000000B" neighbor_interface: "Port 1" platform: "IP Phone" - - capability: "H P M" + - capabilities: "H P M" local_interface: "Gig 1/0/24" neighbor: "SEP00000000000C" neighbor_interface: "Port 1" platform: "IP Phone" - - capability: "H P M" + - capabilities: "H P M" local_interface: "Gig 1/0/9" neighbor: "SEP00000000000D" neighbor_interface: "Port 1" platform: "IP Phone" - - capability: "H P M" + - capabilities: "H P M" local_interface: "Gig 1/0/17" neighbor: "SEP00000000000E" neighbor_interface: "Port 1" platform: "IP Phone" - - capability: "H P M" + - capabilities: "H P M" local_interface: "Gig 1/0/20" neighbor: "SEP00000000000F" neighbor_interface: "Port 1" platform: "IP Phone" - - capability: "H P M" + - capabilities: "H P M" local_interface: "Gig 1/0/36" neighbor: "SEP000000000010" neighbor_interface: "Port 1" diff --git a/tests/cisco_ios/show_cdp_neighbors/cisco_ios_show_cdp_neighbors_4.yml b/tests/cisco_ios/show_cdp_neighbors/cisco_ios_show_cdp_neighbors_4.yml index b40ca9cb00..c038b8571f 100644 --- a/tests/cisco_ios/show_cdp_neighbors/cisco_ios_show_cdp_neighbors_4.yml +++ b/tests/cisco_ios/show_cdp_neighbors/cisco_ios_show_cdp_neighbors_4.yml @@ -1,7 +1,7 @@ --- parsed_sample: - - neighbor: "acc-sw101" + - capabilities: "R" local_interface: "Ten 3/7" - capability: "R" - platform: "AS5610-52" + neighbor: "acc-sw101" neighbor_interface: "0/47" + platform: "AS5610-52" diff --git a/tests/cisco_nxos/show_cdp_neighbors/cisco_nxos_show_cdp_neighbors.yml b/tests/cisco_nxos/show_cdp_neighbors/cisco_nxos_show_cdp_neighbors.yml index 9007399b20..ce63f661b5 100644 --- a/tests/cisco_nxos/show_cdp_neighbors/cisco_nxos_show_cdp_neighbors.yml +++ b/tests/cisco_nxos/show_cdp_neighbors/cisco_nxos_show_cdp_neighbors.yml @@ -1,44 +1,44 @@ --- parsed_sample: - - neighbor: "PERIMETER" - local_interface: "mgmt0" + - capabilities: "R S I" holdtime: "179" - capability: "R S I" - platform: "WS-C3750-48TS" + local_interface: "mgmt0" + neighbor: "PERIMETER" neighbor_interface: "Fas1/0/9" - - neighbor: "N9K2_TEST.lab.com(SAL1819S6BE)" - local_interface: "Eth1/1" + platform: "WS-C3750-48TS" + - capabilities: "R S s" holdtime: "133" - capability: "R S s" - platform: "N9K-C9396PX" + local_interface: "Eth1/1" + neighbor: "N9K2_TEST.lab.com(SAL1819S6BE)" neighbor_interface: "Eth1/1" - - neighbor: "N9K2_TEST.lab.com(SAL1819S6BE)" - local_interface: "Eth1/2" - holdtime: "154" - capability: "R S s" platform: "N9K-C9396PX" + - capabilities: "R S s" + holdtime: "154" + local_interface: "Eth1/2" + neighbor: "N9K2_TEST.lab.com(SAL1819S6BE)" neighbor_interface: "Eth1/2" - - neighbor: "savbu-qa-dist-120" - local_interface: "mgmt1" + platform: "N9K-C9396PX" + - capabilities: "S I" holdtime: "177" - capability: "S I" - platform: "WS-C3750E-24T" + local_interface: "mgmt1" + neighbor: "savbu-qa-dist-120" neighbor_interface: "Gig1/0/13" - - neighbor: "swor96(SSI13110AAQ)" - local_interface: "Eth1/17" + platform: "WS-C3750E-24T" + - capabilities: "S I s" holdtime: "165" - capability: "S I s" - platform: "N5K-C5010P-BF" + local_interface: "Eth1/17" + neighbor: "swor96(SSI13110AAQ)" neighbor_interface: "Eth1/19" - - neighbor: "test" - local_interface: "mgmt0" + platform: "N5K-C5010P-BF" + - capabilities: "S I S I d" holdtime: "1" - capability: "S I S I d" - platform: "WS-C3750E-24T" + local_interface: "mgmt0" + neighbor: "test" neighbor_interface: "Gig1/0/13" - - neighbor: "new_test" - local_interface: "Eth1/10" + platform: "WS-C3750E-24T" + - capabilities: "S" holdtime: "20" - capability: "S" - platform: "N5k" + local_interface: "Eth1/10" + neighbor: "new_test" neighbor_interface: "Eth2/1" + platform: "N5k" diff --git a/tests/cisco_nxos/show_cdp_neighbors/cisco_nxos_show_cdp_neighbors2.yml b/tests/cisco_nxos/show_cdp_neighbors/cisco_nxos_show_cdp_neighbors2.yml index d4fe3198b5..1e66882784 100644 --- a/tests/cisco_nxos/show_cdp_neighbors/cisco_nxos_show_cdp_neighbors2.yml +++ b/tests/cisco_nxos/show_cdp_neighbors/cisco_nxos_show_cdp_neighbors2.yml @@ -1,38 +1,38 @@ --- parsed_sample: - - neighbor: "my-dc1-mgt-sw1(FOC213230KP)" - local_interface: "mgmt0" + - capabilities: "R S I s" holdtime: "138" - capability: "R S I s" - platform: "N3K-C3172PQ-XL" + local_interface: "mgmt0" + neighbor: "my-dc1-mgt-sw1(FOC213230KP)" neighbor_interface: "Eth1/48" - - neighbor: "lx-dc1-server01.mynetwork.com" - local_interface: "Eth1/1/1" + platform: "N3K-C3172PQ-XL" + - capabilities: "H" holdtime: "109" - capability: "H" - platform: "Linux" + local_interface: "Eth1/1/1" + neighbor: "lx-dc1-server01.mynetwork.com" neighbor_interface: "eth9" - - neighbor: "lx-dc1-server02.mynetwork.com" - local_interface: "Eth1/1/2" - holdtime: "106" - capability: "H" platform: "Linux" + - capabilities: "H" + holdtime: "106" + local_interface: "Eth1/1/2" + neighbor: "lx-dc1-server02.mynetwork.com" neighbor_interface: "eth9" - - neighbor: "lx-dc1-server03.mynetwork.com" - local_interface: "Eth1/1/3" - holdtime: "91" - capability: "H" platform: "Linux" + - capabilities: "H" + holdtime: "91" + local_interface: "Eth1/1/3" + neighbor: "lx-dc1-server03.mynetwork.com" neighbor_interface: "eth9" - - neighbor: "lx-dc1-server04.mynetwork.com" - local_interface: "Eth1/1/4" - holdtime: "112" - capability: "H" platform: "Linux" + - capabilities: "H" + holdtime: "112" + local_interface: "Eth1/1/4" + neighbor: "lx-dc1-server04.mynetwork.com" neighbor_interface: "eth9" - - neighbor: "lx-dc1-server05.mynetwork.com" - local_interface: "Eth1/2/1" - holdtime: "100" - capability: "H" platform: "Linux" + - capabilities: "H" + holdtime: "100" + local_interface: "Eth1/2/1" + neighbor: "lx-dc1-server05.mynetwork.com" neighbor_interface: "eth9" + platform: "Linux" diff --git a/tests/ipinfusion_ocnos/show_lldp_table/ipinfusion_ocnos_show_lldp_table.yml b/tests/ipinfusion_ocnos/show_lldp_table/ipinfusion_ocnos_show_lldp_table.yml index a859914c90..dc5355c5e6 100644 --- a/tests/ipinfusion_ocnos/show_lldp_table/ipinfusion_ocnos_show_lldp_table.yml +++ b/tests/ipinfusion_ocnos/show_lldp_table/ipinfusion_ocnos_show_lldp_table.yml @@ -1,37 +1,37 @@ --- parsed_sample: - - local_interface: "Ethernet0" - neighbor: "spine01" - neighbor_interface: "fortyGigE0/20" - capability: "BR" - neighbor_interface_descr: "Ethernet20" - - local_interface: "Ethernet4" - neighbor: "spine02" - neighbor_interface: "fortyGigE0/20" - capability: "BR" - neighbor_interface_descr: "Ethernet20" - - local_interface: "Ethernet8" - neighbor: "leaf01" - neighbor_interface: "fortyGigE0/20" - capability: "BR" - neighbor_interface_descr: "Ethernet20" - - local_interface: "Ethernet12" - neighbor: "leaf02" - neighbor_interface: "fortyGigE0/20" - capability: "BR" - neighbor_interface_descr: "Ethernet20" - - local_interface: "Ethernet16" - neighbor: "leaf03" - neighbor_interface: "fortyGigE0/24" - capability: "BR" - neighbor_interface_descr: "Ethernet24" - - local_interface: "Ethernet20" - neighbor: "leaf04" - neighbor_interface: "fortyGigE0/24" - capability: "BR" - neighbor_interface_descr: "Ethernet24" - - local_interface: "eth0" - neighbor: "mgmt-switch" - neighbor_interface: "swp14" - capability: "BR" - neighbor_interface_descr: "swp14" + - capabilities: "BR" + local_interface: "Ethernet0" + neighbor: "spine01" + neighbor_interface: "fortyGigE0/20" + neighbor_interface_descr: "Ethernet20" + - capabilities: "BR" + local_interface: "Ethernet4" + neighbor: "spine02" + neighbor_interface: "fortyGigE0/20" + neighbor_interface_descr: "Ethernet20" + - capabilities: "BR" + local_interface: "Ethernet8" + neighbor: "leaf01" + neighbor_interface: "fortyGigE0/20" + neighbor_interface_descr: "Ethernet20" + - capabilities: "BR" + local_interface: "Ethernet12" + neighbor: "leaf02" + neighbor_interface: "fortyGigE0/20" + neighbor_interface_descr: "Ethernet20" + - capabilities: "BR" + local_interface: "Ethernet16" + neighbor: "leaf03" + neighbor_interface: "fortyGigE0/24" + neighbor_interface_descr: "Ethernet24" + - capabilities: "BR" + local_interface: "Ethernet20" + neighbor: "leaf04" + neighbor_interface: "fortyGigE0/24" + neighbor_interface_descr: "Ethernet24" + - capabilities: "BR" + local_interface: "eth0" + neighbor: "mgmt-switch" + neighbor_interface: "swp14" + neighbor_interface_descr: "swp14" From ca2928b0d6f9baecd7e9dd35680b371ac2f39041 Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sat, 2 Sep 2023 19:03:19 -0400 Subject: [PATCH 10/41] replace SYSTEM_CAPABILITIES_ENABLED with CAPABILITIES for hp_procurve_show_lldp_info_remote-device_detail to normalize --- ...how_lldp_info_remote-device_detail.textfsm | 4 +-- ...ve_show_lldp_info_remote-device_detail.yml | 32 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device_detail.textfsm b/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device_detail.textfsm index 8a80da22a9..6065a5f8f7 100644 --- a/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device_detail.textfsm +++ b/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device_detail.textfsm @@ -8,7 +8,7 @@ Value SYSTEM_DESCR (.*?) Value PORT_DESCR (\S+|.*?) Value PVID (\d+|.*?) Value CAPABILITIES_SUPPORTED (.*?) -Value SYSTEM_CAPABILITIES_ENABLED (.*?) +Value CAPABILITIES (.*?) Value REMOTE_MANAGEMENT_ADDRESS (\S+|.*?) Start @@ -27,7 +27,7 @@ LLDP ^\s+PortDescr\s+:\s${PORT_DESCR}\s*$$ ^\s+Pvid\s+:\s${PVID}\s*$$ ^\s+System\s+Capabilities\s+Supported\s+:\s${CAPABILITIES_SUPPORTED}\s*$$ - ^\s+System\s+Capabilities\s+Enabled\s+:\s${SYSTEM_CAPABILITIES_ENABLED}\s*$$ + ^\s+System\s+Capabilities\s+Enabled\s+:\s${CAPABILITIES}\s*$$ ^\s+Remote\s+Management\s+Address\s*$$ ^\s+Type.*$$ ^\s+Address\s:\s${REMOTE_MANAGEMENT_ADDRESS} diff --git a/tests/hp_procurve/show_lldp_info_remote-device_detail/hp_procurve_show_lldp_info_remote-device_detail.yml b/tests/hp_procurve/show_lldp_info_remote-device_detail/hp_procurve_show_lldp_info_remote-device_detail.yml index 3749b6edb3..78de39b5b6 100644 --- a/tests/hp_procurve/show_lldp_info_remote-device_detail/hp_procurve_show_lldp_info_remote-device_detail.yml +++ b/tests/hp_procurve/show_lldp_info_remote-device_detail/hp_procurve_show_lldp_info_remote-device_detail.yml @@ -1,6 +1,7 @@ --- parsed_sample: - - capabilities_supported: "bridge, router" + - capabilities: "bridge" + capabilities_supported: "bridge, router" local_interface: "1" neighbor_chassis_id: "3821c7-c1cd00" neighbor_chassis_type: "mac-address" @@ -10,9 +11,9 @@ parsed_sample: port_type: "local" pvid: "0" remote_management_address: "192.168.130.100" - system_capabilities_enabled: "bridge" system_descr: "Aruba JL357A 2540-48G-PoE+-4SFP+ Switch, revision YC.16.0..." - - capabilities_supported: "" + - capabilities: "" + capabilities_supported: "" local_interface: "3" neighbor_chassis_id: "3ce1a1-2218f0" neighbor_chassis_type: "mac-address" @@ -22,9 +23,9 @@ parsed_sample: port_type: "mac-address" pvid: "" remote_management_address: "" - system_capabilities_enabled: "" system_descr: "" - - capabilities_supported: "bridge, wlan-access-point" + - capabilities: "bridge, wlan-access-point" + capabilities_supported: "bridge, wlan-access-point" local_interface: "7" neighbor_chassis_id: "bcf310-1f8b40" neighbor_chassis_type: "mac-address" @@ -34,9 +35,9 @@ parsed_sample: port_type: "interface-name" pvid: "" remote_management_address: "192.168.100.55" - system_capabilities_enabled: "bridge, wlan-access-point" system_descr: "" - - capabilities_supported: "" + - capabilities: "" + capabilities_supported: "" local_interface: "25" neighbor_chassis_id: "d8cb8a-6d303c" neighbor_chassis_type: "mac-address" @@ -46,9 +47,9 @@ parsed_sample: port_type: "mac-address" pvid: "" remote_management_address: "" - system_capabilities_enabled: "" system_descr: "" - - capabilities_supported: "" + - capabilities: "" + capabilities_supported: "" local_interface: "29" neighbor_chassis_id: "484d7e-e66c42" neighbor_chassis_type: "mac-address" @@ -58,9 +59,9 @@ parsed_sample: port_type: "mac-address" pvid: "" remote_management_address: "" - system_capabilities_enabled: "" system_descr: "" - - capabilities_supported: "bridge, wlan-access-point, router" + - capabilities: "bridge, wlan-access-point, router" + capabilities_supported: "bridge, wlan-access-point, router" local_interface: "36" neighbor_chassis_id: "603197-7aa548" neighbor_chassis_type: "mac-address" @@ -70,9 +71,9 @@ parsed_sample: port_type: "local" pvid: "" remote_management_address: "192.168.100.50" - system_capabilities_enabled: "bridge, wlan-access-point, router" system_descr: "ZLD 6.00(###.8)B1 (cannon)" - - capabilities_supported: "" + - capabilities: "" + capabilities_supported: "" local_interface: "37" neighbor_chassis_id: "b00cd1-359a98" neighbor_chassis_type: "mac-address" @@ -82,9 +83,9 @@ parsed_sample: port_type: "mac-address" pvid: "" remote_management_address: "" - system_capabilities_enabled: "" system_descr: "" - - capabilities_supported: "" + - capabilities: "" + capabilities_supported: "" local_interface: "42" neighbor_chassis_id: "d8cb8a-894644" neighbor_chassis_type: "mac-address" @@ -94,5 +95,4 @@ parsed_sample: port_type: "mac-address" pvid: "" remote_management_address: "" - system_capabilities_enabled: "" system_descr: "" From 10c45a816711904868573db976b86528d6ceeae9 Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sat, 2 Sep 2023 19:07:05 -0400 Subject: [PATCH 11/41] replace NEIGHBOR_CAPABILITY with CAPABILITIES for hp_procurve_show_cdp_neighbors_detail to normalize --- ...hp_procurve_show_cdp_neighbors_detail.textfsm | 4 ++-- .../hp_procurve_show_cdp_neighbors_detail.yml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ntc_templates/templates/hp_procurve_show_cdp_neighbors_detail.textfsm b/ntc_templates/templates/hp_procurve_show_cdp_neighbors_detail.textfsm index 181581cfc8..7da14e83a3 100644 --- a/ntc_templates/templates/hp_procurve_show_cdp_neighbors_detail.textfsm +++ b/ntc_templates/templates/hp_procurve_show_cdp_neighbors_detail.textfsm @@ -2,7 +2,7 @@ Value Required LOCAL_INTERFACE (.+?) Value NEIGHBOR_ID (.+?) Value NEIGHBOR_ADDRESS (.+?) Value NEIGHBOR_PLATFORM (.+?) -Value NEIGHBOR_CAPABILITY (.+?) +Value CAPABILITIES (.+?) Value NEIGHBOR_INTERFACE (.+?) Value NEIGHBOR_VERSION (.+?) @@ -13,7 +13,7 @@ Start ^\s*Address\s+Type ^\s*Address\s*:\s*${NEIGHBOR_ADDRESS}\s*$$ ^\s*Platform\s*:\s*${NEIGHBOR_PLATFORM}\s*$$ - ^\s*Capability\s*:\s*${NEIGHBOR_CAPABILITY}\s*$$ + ^\s*Capability\s*:\s*${CAPABILITIES}\s*$$ ^\s*Device\s+Port\s*:\s*${NEIGHBOR_INTERFACE}\s*$$ ^\s*Version\s*:\s*${NEIGHBOR_VERSION}\s*$$ -> Record ^\s*$$ diff --git a/tests/hp_procurve/show_cdp_neighbors_detail/hp_procurve_show_cdp_neighbors_detail.yml b/tests/hp_procurve/show_cdp_neighbors_detail/hp_procurve_show_cdp_neighbors_detail.yml index 4b6ff64306..73e6fc9e8f 100644 --- a/tests/hp_procurve/show_cdp_neighbors_detail/hp_procurve_show_cdp_neighbors_detail.yml +++ b/tests/hp_procurve/show_cdp_neighbors_detail/hp_procurve_show_cdp_neighbors_detail.yml @@ -1,29 +1,29 @@ --- parsed_sample: - - local_interface: "1" + - capabilities: "Router" + local_interface: "1" neighbor_address: "10.11.11.16" - neighbor_capability: "Router" neighbor_id: "AP01-Site" neighbor_interface: "ge1" neighbor_platform: "5.9.1.5-001RAP-6521-60020-WR" neighbor_version: "5.9.1.5-001RAP-6521-60020-WR" - - local_interface: "1" + - capabilities: "Router" + local_interface: "1" neighbor_address: "10.11.11.16" - neighbor_capability: "Router" neighbor_id: "5c 0e 8b 11 11 11" neighbor_interface: "ge1" neighbor_platform: "AP-6521-60020-WR, Version 5.9.1.5-001R" neighbor_version: "AP-6521-60020-WR, Version 5.9.1.5-001R" - - local_interface: "2" + - capabilities: "Router" + local_interface: "2" neighbor_address: "Unsupported format" - neighbor_capability: "Router" neighbor_id: "5c 0e 8b 12 22 22" neighbor_interface: "ge1" neighbor_platform: "AP-6521-60020-WR, Version 5.9.1.5-001R" neighbor_version: "AP-6521-60020-WR, Version 5.9.1.5-001R" - - local_interface: "2" + - capabilities: "Router" + local_interface: "2" neighbor_address: "10.11.11.17" - neighbor_capability: "Router" neighbor_id: "AP02-Site" neighbor_interface: "ge1" neighbor_platform: "5.9.1.5-001RAP-6521-60020-WR" From 3c052ac4d078f0b67326ee3ca7ca6714b1d8c3a5 Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sat, 2 Sep 2023 19:13:47 -0400 Subject: [PATCH 12/41] replace capabilities and neighbor interface capture groups for aruba_aoscx_show_lldp_neighbors-info_detail to normalize --- ...cx_show_lldp_neighbors-info_detail.textfsm | 10 +++--- .../show_lldp_neighbors-info_detail.yml | 32 +++++++++---------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ntc_templates/templates/aruba_aoscx_show_lldp_neighbors-info_detail.textfsm b/ntc_templates/templates/aruba_aoscx_show_lldp_neighbors-info_detail.textfsm index edb8d88dac..3a9310a138 100644 --- a/ntc_templates/templates/aruba_aoscx_show_lldp_neighbors-info_detail.textfsm +++ b/ntc_templates/templates/aruba_aoscx_show_lldp_neighbors-info_detail.textfsm @@ -2,11 +2,11 @@ Value Required LOCAL_INTERFACE (\S+) Value Required CHASSIS_ID (\S+) Value CHASSIS_NAME (\S+) Value CHASSIS_DESC (.+) +Value CAPABILITIES_SUPPORTED (.+) Value CAPABILITIES (.+) -Value CAPABILITIES_ENABLED (.+) Value MGMT_ADDR (\S+) Value PORT_ID (\S+) -Value PORT_DESC (\S+) +Value NEIGHBOR_INTERFACE (\S+) Start @@ -17,10 +17,10 @@ Start ^Neighbor\s+System-Description\s*:\s*${CHASSIS_DESC} ^Neighbor\s*Chassis-ID\s*:\s*${CHASSIS_ID} ^Neighbor\s*Management-Address\s*:\s*${MGMT_ADDR} - ^Chassis\s*Capabilities\s*Available\s*:\s*${CAPABILITIES} - ^Chassis\s*Capabilities\s*Enabled\s*:\s*${CAPABILITIES_ENABLED} + ^Chassis\s*Capabilities\s*Available\s*:\s*${CAPABILITIES_SUPPORTED} + ^Chassis\s*Capabilities\s*Enabled\s*:\s*${CAPABILITIES} ^Neighbor\s*Port-ID\s*:\s*${PORT_ID} - ^Neighbor\s*Port-Desc\s*:\s*${PORT_DESC} + ^Neighbor\s*Port-Desc\s*:\s*${NEIGHBOR_INTERFACE} ^-+$$ -> Record ^Neighbor\.* ^TTL\.* diff --git a/tests/aruba_aoscx/show_lldp_neighbors-info_detail/show_lldp_neighbors-info_detail.yml b/tests/aruba_aoscx/show_lldp_neighbors-info_detail/show_lldp_neighbors-info_detail.yml index 7c7fb2e6e9..5e7dfec0f5 100644 --- a/tests/aruba_aoscx/show_lldp_neighbors-info_detail/show_lldp_neighbors-info_detail.yml +++ b/tests/aruba_aoscx/show_lldp_neighbors-info_detail/show_lldp_neighbors-info_detail.yml @@ -1,56 +1,56 @@ --- parsed_sample: - - capabilities: "Bridge, WLAN" - capabilities_enabled: "WLAN" + - capabilities: "WLAN" + capabilities_supported: "Bridge, WLAN" chassis_desc: "ArubaOS (MODEL: 335), Version Aruba AP" chassis_id: "70:3a:0e:cd:41:fe" chassis_name: "ap-9999-335-fe" local_interface: "1/1/1" mgmt_addr: "10.252.99.12" - port_desc: "eth0" + neighbor_interface: "eth0" port_id: "70:3a:0e:cd:41:fe" - - capabilities: "Bridge, WLAN" - capabilities_enabled: "WLAN" + - capabilities: "WLAN" + capabilities_supported: "Bridge, WLAN" chassis_desc: "ArubaOS (MODEL: 535), Version Aruba AP" chassis_id: "00:4e:35:c5:d2:2e" chassis_name: "ap-9999-535-fe" local_interface: "1/1/2" mgmt_addr: "10.252.99.11" - port_desc: "eth0" + neighbor_interface: "eth0" port_id: "00:4e:35:c5:d2:2e" - capabilities: "Bridge, Router" - capabilities_enabled: "Bridge, Router" + capabilities_supported: "Bridge, Router" chassis_desc: "Aruba JL635A GL.10.05.0021" chassis_id: "90:20:c2:bf:ae:00" chassis_name: "rtr-agg-0620-a" local_interface: "1/1/52" mgmt_addr: "10.252.15.17" - port_desc: "1/1/1" + neighbor_interface: "1/1/1" port_id: "1/1/1" - - capabilities: "Bridge, WLAN" - capabilities_enabled: "WLAN" + - capabilities: "WLAN" + capabilities_supported: "Bridge, WLAN" chassis_desc: "ArubaOS (MODEL: 335), Version Aruba AP" chassis_id: "70:3a:0e:cd:41:fe" chassis_name: "ap-9999-335-fe" local_interface: "2/1/1" mgmt_addr: "10.252.99.12" - port_desc: "eth1" + neighbor_interface: "eth1" port_id: "70:3a:0e:cd:41:ff" - - capabilities: "Bridge, WLAN" - capabilities_enabled: "WLAN" + - capabilities: "WLAN" + capabilities_supported: "Bridge, WLAN" chassis_desc: "ArubaOS (MODEL: 535), Version Aruba AP" chassis_id: "00:4e:35:c5:d2:2e" chassis_name: "ap-9999-535-fe" local_interface: "2/1/2" mgmt_addr: "10.252.99.11" - port_desc: "eth1" + neighbor_interface: "eth1" port_id: "00:4e:35:c5:d2:2f" - capabilities: "Bridge, Router" - capabilities_enabled: "Bridge, Router" + capabilities_supported: "Bridge, Router" chassis_desc: "Aruba JL635A GL.10.05.0021" chassis_id: "90:20:c2:bf:ed:00" chassis_name: "rtr-agg-0620-b" local_interface: "2/1/52" mgmt_addr: "10.252.15.18" - port_desc: "1/1/1" + neighbor_interface: "1/1/1" port_id: "1/1/1" From 6049fdbcb4d42f12cd6456e460d0bd152a345381 Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sat, 2 Sep 2023 19:30:50 -0400 Subject: [PATCH 13/41] correct swapped capture groups in hp_comware_display_lldp_neighbor-information_verbose - replace NEIGHBOR_INTERFACE with NEIGHBOR_INTERFACE_DESCRIPTION - replace NEIGHBOR_PORT_ID with NEIGHBOR_INTERFACE --- ...lay_lldp_neighbor-information_verbose.textfsm | 6 +++--- ...display_lldp_neighbor-information_verbose.yml | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ntc_templates/templates/hp_comware_display_lldp_neighbor-information_verbose.textfsm b/ntc_templates/templates/hp_comware_display_lldp_neighbor-information_verbose.textfsm index eab2e609f2..436d8c6320 100644 --- a/ntc_templates/templates/hp_comware_display_lldp_neighbor-information_verbose.textfsm +++ b/ntc_templates/templates/hp_comware_display_lldp_neighbor-information_verbose.textfsm @@ -1,7 +1,7 @@ Value Required LOCAL_INTERFACE (\S+) Value CHASSIS_ID (\S+) -Value NEIGHBOR_PORT_ID (.*) Value NEIGHBOR_INTERFACE (.*) +Value NEIGHBOR_INTERFACE_DESCRIPTION (.*) Value NEIGHBOR (\S+) Value MANAGEMENT_IP (\S+) Value VLAN_ID (\d+) @@ -15,9 +15,9 @@ Start ^\s+Chassis\s+type\s+:.* ^\s+Chassis\s+ID\s+:\s+${CHASSIS_ID} ^\s+Port\s+ID\s+type\s+:.* - ^\s+Port\s+ID\s+:\s+${NEIGHBOR_PORT_ID} + ^\s+Port\s+ID\s+:\s+${NEIGHBOR_INTERFACE} ^\s+Time\s+to\s+live\d+:.* - ^\s+Port\s+description\s+:\s+${NEIGHBOR_INTERFACE} + ^\s+Port\s+description\s+:\s+${NEIGHBOR_INTERFACE_DESCRIPTION} ^\s+System\s+name\s+:\s+${NEIGHBOR} ^\s+Management\s+address\s+:\s+${MANAGEMENT_IP} ^\s+Management\s+address\s+interface\s+type diff --git a/tests/hp_comware/display_lldp_neighbor-information_verbose/hp_comware_display_lldp_neighbor-information_verbose.yml b/tests/hp_comware/display_lldp_neighbor-information_verbose/hp_comware_display_lldp_neighbor-information_verbose.yml index 3d6ca17b6d..a558cc1c2d 100644 --- a/tests/hp_comware/display_lldp_neighbor-information_verbose/hp_comware_display_lldp_neighbor-information_verbose.yml +++ b/tests/hp_comware/display_lldp_neighbor-information_verbose/hp_comware_display_lldp_neighbor-information_verbose.yml @@ -4,27 +4,27 @@ parsed_sample: local_interface: "Ten-GigabitEthernet1/0/0/1" management_ip: "" neighbor: "SW1" - neighbor_interface: "TO_CORE_1" - neighbor_port_id: "GigabitEthernet0/0/1" + neighbor_interface: "GigabitEthernet0/0/1" + neighbor_interface_description: "TO_CORE_1" vlan_id: "" - chassis_id: "70f9-6d17-1235" local_interface: "Ten-GigabitEthernet1/0/0/2" management_ip: "10.6.5.4" neighbor: "SW2" - neighbor_interface: "TO_CORE_2" - neighbor_port_id: "Ten-GigabitEthernet1/0/0/5" + neighbor_interface: "Ten-GigabitEthernet1/0/0/5" + neighbor_interface_description: "TO_CORE_2" vlan_id: "10" - chassis_id: "70f9-6d17-1236" local_interface: "Ten-GigabitEthernet1/0/0/3" management_ip: "10.6.5.3" neighbor: "SW3" - neighbor_interface: "TO_SPINE" - neighbor_port_id: "Ten-GigabitEthernet2/0/0/5" + neighbor_interface: "Ten-GigabitEthernet2/0/0/5" + neighbor_interface_description: "TO_SPINE" vlan_id: "10" - chassis_id: "4c1c-503a-1234" local_interface: "GigabitEthernet0/0" management_ip: "10.1.1.2" neighbor: "Test-Router" - neighbor_interface: "GigabitEthernet0/0 Interface" - neighbor_port_id: "GigabitEthernet0/0" + neighbor_interface: "GigabitEthernet0/0" + neighbor_interface_description: "GigabitEthernet0/0 Interface" vlan_id: "" From 93b0318ff47a6131f96247138bd34d6fde5dd2ab Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sat, 2 Sep 2023 21:17:34 -0400 Subject: [PATCH 14/41] replace NEIGHBOR_INTERFACE_DESCR with NEIGHBOR_INTERFACE_DESCRIPTION in ipinfusion_ocnos_show_lldp_table to normalize --- .../ipinfusion_ocnos_show_lldp_table.textfsm | 4 ++-- .../ipinfusion_ocnos_show_lldp_table.yml | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ntc_templates/templates/ipinfusion_ocnos_show_lldp_table.textfsm b/ntc_templates/templates/ipinfusion_ocnos_show_lldp_table.textfsm index 7faedf3ba3..70bc878c41 100644 --- a/ntc_templates/templates/ipinfusion_ocnos_show_lldp_table.textfsm +++ b/ntc_templates/templates/ipinfusion_ocnos_show_lldp_table.textfsm @@ -2,7 +2,7 @@ Value LOCAL_INTERFACE (\S+) Value NEIGHBOR (\S+) Value NEIGHBOR_INTERFACE (\S+) Value CAPABILITIES (R|B|O|RO|RB|BR|BO|OR|OB|RBO|ROB|BRO|BOR|ORB|OBR) -Value NEIGHBOR_INTERFACE_DESCR (\S+) +Value NEIGHBOR_INTERFACE_DESCRIPTION (\S+) Start ^Capability\s+codes:\s+\(R\)\s+Router,\s+\(B\)\s+Bridge,\s+\(O\)\s+Other @@ -11,7 +11,7 @@ Start ^. -> Error Row - ^${LOCAL_INTERFACE}\s+${NEIGHBOR}\s+${NEIGHBOR_INTERFACE}\s+${CAPABILITIES}\s+${NEIGHBOR_INTERFACE_DESCR} -> Record + ^${LOCAL_INTERFACE}\s+${NEIGHBOR}\s+${NEIGHBOR_INTERFACE}\s+${CAPABILITIES}\s+${NEIGHBOR_INTERFACE_DESCRIPTION} -> Record ^-+ ^[\w+\s+]*:\s+\d+ ^. -> Error diff --git a/tests/ipinfusion_ocnos/show_lldp_table/ipinfusion_ocnos_show_lldp_table.yml b/tests/ipinfusion_ocnos/show_lldp_table/ipinfusion_ocnos_show_lldp_table.yml index dc5355c5e6..4e3df5de50 100644 --- a/tests/ipinfusion_ocnos/show_lldp_table/ipinfusion_ocnos_show_lldp_table.yml +++ b/tests/ipinfusion_ocnos/show_lldp_table/ipinfusion_ocnos_show_lldp_table.yml @@ -4,34 +4,34 @@ parsed_sample: local_interface: "Ethernet0" neighbor: "spine01" neighbor_interface: "fortyGigE0/20" - neighbor_interface_descr: "Ethernet20" + neighbor_interface_description: "Ethernet20" - capabilities: "BR" local_interface: "Ethernet4" neighbor: "spine02" neighbor_interface: "fortyGigE0/20" - neighbor_interface_descr: "Ethernet20" + neighbor_interface_description: "Ethernet20" - capabilities: "BR" local_interface: "Ethernet8" neighbor: "leaf01" neighbor_interface: "fortyGigE0/20" - neighbor_interface_descr: "Ethernet20" + neighbor_interface_description: "Ethernet20" - capabilities: "BR" local_interface: "Ethernet12" neighbor: "leaf02" neighbor_interface: "fortyGigE0/20" - neighbor_interface_descr: "Ethernet20" + neighbor_interface_description: "Ethernet20" - capabilities: "BR" local_interface: "Ethernet16" neighbor: "leaf03" neighbor_interface: "fortyGigE0/24" - neighbor_interface_descr: "Ethernet24" + neighbor_interface_description: "Ethernet24" - capabilities: "BR" local_interface: "Ethernet20" neighbor: "leaf04" neighbor_interface: "fortyGigE0/24" - neighbor_interface_descr: "Ethernet24" + neighbor_interface_description: "Ethernet24" - capabilities: "BR" local_interface: "eth0" neighbor: "mgmt-switch" neighbor_interface: "swp14" - neighbor_interface_descr: "swp14" + neighbor_interface_description: "swp14" From cc709b52faabe8f1f719ca0d6b9491dc949ee14e Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sat, 2 Sep 2023 21:26:35 -0400 Subject: [PATCH 15/41] replace PORT_DESCR with NEIGHBOR_INTERFACE_DESCRIPTION in hp_procurve_show_lldp_info_remote-device_detail to normalize --- ...e_show_lldp_info_remote-device_detail.textfsm | 4 ++-- ...curve_show_lldp_info_remote-device_detail.yml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device_detail.textfsm b/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device_detail.textfsm index 6065a5f8f7..f825c61222 100644 --- a/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device_detail.textfsm +++ b/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device_detail.textfsm @@ -5,7 +5,7 @@ Value PORT_TYPE (\S+) Value NEIGHBOR_PORTID (.*?) Value NEIGHBOR_SYSNAME (.*?) Value SYSTEM_DESCR (.*?) -Value PORT_DESCR (\S+|.*?) +Value NEIGHBOR_INTERFACE_DESCRIPTION (\S+|.*?) Value PVID (\d+|.*?) Value CAPABILITIES_SUPPORTED (.*?) Value CAPABILITIES (.*?) @@ -24,7 +24,7 @@ LLDP ^\s+PortId\s+:\s${NEIGHBOR_PORTID}\s*$$ ^\s+SysName\s+:\s${NEIGHBOR_SYSNAME}\s*$$ ^\s+System\sDescr\s:\s${SYSTEM_DESCR}\s*$$ - ^\s+PortDescr\s+:\s${PORT_DESCR}\s*$$ + ^\s+PortDescr\s+:\s${NEIGHBOR_INTERFACE_DESCRIPTION}\s*$$ ^\s+Pvid\s+:\s${PVID}\s*$$ ^\s+System\s+Capabilities\s+Supported\s+:\s${CAPABILITIES_SUPPORTED}\s*$$ ^\s+System\s+Capabilities\s+Enabled\s+:\s${CAPABILITIES}\s*$$ diff --git a/tests/hp_procurve/show_lldp_info_remote-device_detail/hp_procurve_show_lldp_info_remote-device_detail.yml b/tests/hp_procurve/show_lldp_info_remote-device_detail/hp_procurve_show_lldp_info_remote-device_detail.yml index 78de39b5b6..3e9f090c21 100644 --- a/tests/hp_procurve/show_lldp_info_remote-device_detail/hp_procurve_show_lldp_info_remote-device_detail.yml +++ b/tests/hp_procurve/show_lldp_info_remote-device_detail/hp_procurve_show_lldp_info_remote-device_detail.yml @@ -5,9 +5,9 @@ parsed_sample: local_interface: "1" neighbor_chassis_id: "3821c7-c1cd00" neighbor_chassis_type: "mac-address" + neighbor_interface_description: "1" neighbor_portid: "1" neighbor_sysname: "65432p-swi006-abcd-srvroom-4asd" - port_descr: "1" port_type: "local" pvid: "0" remote_management_address: "192.168.130.100" @@ -17,9 +17,9 @@ parsed_sample: local_interface: "3" neighbor_chassis_id: "3ce1a1-2218f0" neighbor_chassis_type: "mac-address" + neighbor_interface_description: "" neighbor_portid: "3c e1 a1 22 18 f0" neighbor_sysname: "" - port_descr: "" port_type: "mac-address" pvid: "" remote_management_address: "" @@ -29,9 +29,9 @@ parsed_sample: local_interface: "7" neighbor_chassis_id: "bcf310-1f8b40" neighbor_chassis_type: "mac-address" + neighbor_interface_description: "" neighbor_portid: "mgt0" neighbor_sysname: "AH-cust-AP21" - port_descr: "" port_type: "interface-name" pvid: "" remote_management_address: "192.168.100.55" @@ -41,9 +41,9 @@ parsed_sample: local_interface: "25" neighbor_chassis_id: "d8cb8a-6d303c" neighbor_chassis_type: "mac-address" + neighbor_interface_description: "" neighbor_portid: "d8 cb 8a 6d 30 3c" neighbor_sysname: "" - port_descr: "" port_type: "mac-address" pvid: "" remote_management_address: "" @@ -53,9 +53,9 @@ parsed_sample: local_interface: "29" neighbor_chassis_id: "484d7e-e66c42" neighbor_chassis_type: "mac-address" + neighbor_interface_description: "" neighbor_portid: "48 4d 7e e6 6c 42" neighbor_sysname: "" - port_descr: "" port_type: "mac-address" pvid: "" remote_management_address: "" @@ -65,9 +65,9 @@ parsed_sample: local_interface: "36" neighbor_chassis_id: "603197-7aa548" neighbor_chassis_type: "mac-address" + neighbor_interface_description: "UPLINK" neighbor_portid: "1" neighbor_sysname: "NAP203" - port_descr: "UPLINK" port_type: "local" pvid: "" remote_management_address: "192.168.100.50" @@ -77,9 +77,9 @@ parsed_sample: local_interface: "37" neighbor_chassis_id: "b00cd1-359a98" neighbor_chassis_type: "mac-address" + neighbor_interface_description: "" neighbor_portid: "b0 0c d1 35 9a 98" neighbor_sysname: "" - port_descr: "" port_type: "mac-address" pvid: "" remote_management_address: "" @@ -89,9 +89,9 @@ parsed_sample: local_interface: "42" neighbor_chassis_id: "d8cb8a-894644" neighbor_chassis_type: "mac-address" + neighbor_interface_description: "" neighbor_portid: "d8 cb 8a 89 46 44" neighbor_sysname: "" - port_descr: "" port_type: "mac-address" pvid: "" remote_management_address: "" From aed8d725641ee7185fe712f714870943ec73e694 Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sat, 2 Sep 2023 22:13:14 -0400 Subject: [PATCH 16/41] replace several capture groups in arista_eos_show_lldp_neighbors_detail to normalize --- ...sta_eos_show_lldp_neighbors_detail.textfsm | 12 +- .../arista_eos_show_lldp_neighbors_detail.yml | 120 +++++++++--------- 2 files changed, 66 insertions(+), 66 deletions(-) diff --git a/ntc_templates/templates/arista_eos_show_lldp_neighbors_detail.textfsm b/ntc_templates/templates/arista_eos_show_lldp_neighbors_detail.textfsm index 781a85608e..cfe36eaa18 100644 --- a/ntc_templates/templates/arista_eos_show_lldp_neighbors_detail.textfsm +++ b/ntc_templates/templates/arista_eos_show_lldp_neighbors_detail.textfsm @@ -1,20 +1,20 @@ -Value Required DEST_HOST (\S+) -Value SYSTEM_ID (.+?) +Value Required NEIGHBOR_NAME (\S+) +Value CHASSIS_ID (.+?) Value MGMT_ADDRESS (.+?) Value PLATFORM_VERSION (.+?) Value NEIGHBOR_INTERFACE (.+?) Value Filldown LOCAL_INTERFACE (\S+?) -Value Filldown NEIGH_COUNT ([1-9]\d*) +Value Filldown NEIGHBOR_COUNT ([1-9]\d*) Value AGE (.+?) Start - ^\S+\s+${LOCAL_INTERFACE}\s+\S+\s+${NEIGH_COUNT}.* + ^\S+\s+${LOCAL_INTERFACE}\s+\S+\s+${NEIGHBOR_COUNT}.* ^.*age\s+${AGE}$$ -> Interface Interface - ^\s+Chassis ID\s+:\s+${SYSTEM_ID}$$ + ^\s+Chassis ID\s+:\s+${CHASSIS_ID}$$ ^\s+-\s+Port ID type -> Port_ID - ^\s+-\s+\S+\s+Name:\s+\"${DEST_HOST}\" + ^\s+-\s+\S+\s+Name:\s+\"${NEIGHBOR_NAME}\" ^.*System Description:\s+\"${PLATFORM_VERSION}(\"|$$) ^\s+\S+\s+Address\s+:\s+${MGMT_ADDRESS}$$ ^\s*$$ -> Record Start diff --git a/tests/arista_eos/show_lldp_neighbors_detail/arista_eos_show_lldp_neighbors_detail.yml b/tests/arista_eos/show_lldp_neighbors_detail/arista_eos_show_lldp_neighbors_detail.yml index 086ef1b70b..5abbc5a8bd 100644 --- a/tests/arista_eos/show_lldp_neighbors_detail/arista_eos_show_lldp_neighbors_detail.yml +++ b/tests/arista_eos/show_lldp_neighbors_detail/arista_eos_show_lldp_neighbors_detail.yml @@ -1,181 +1,181 @@ --- parsed_sample: - age: "12 seconds" - dest_host: "spine2.company.com" + chassis_id: "2cc2.6081.eaf9" local_interface: "Ethernet1" mgmt_address: "2cc2.6081.eaf9" - neigh_count: "1" + neighbor_count: "1" neighbor_interface: "Ethernet1" + neighbor_name: "spine2.company.com" platform_version: "Arista Networks EOS version 4.15.2F running on an Arista Networks\ \ vEOS" - system_id: "2cc2.6081.eaf9" - age: "12 seconds" - dest_host: "spine2.company.com" + chassis_id: "2cc2.6081.eaf9" local_interface: "Ethernet2" mgmt_address: "2cc2.6081.eaf9" - neigh_count: "1" + neighbor_count: "1" neighbor_interface: "Ethernet2" + neighbor_name: "spine2.company.com" platform_version: "Arista Networks EOS version 4.15.2F running on an Arista Networks\ \ vEOS" - system_id: "2cc2.6081.eaf9" - age: "12 seconds" - dest_host: "spine2.company.com" + chassis_id: "2cc2.6081.eaf9" local_interface: "Ethernet3" mgmt_address: "2cc2.6081.eaf9" - neigh_count: "1" + neighbor_count: "1" neighbor_interface: "Ethernet3" + neighbor_name: "spine2.company.com" platform_version: "Arista Networks EOS version 4.15.2F running on an Arista Networks\ \ vEOS" - system_id: "2cc2.6081.eaf9" - age: "12 seconds" - dest_host: "spine2.company.com" + chassis_id: "2cc2.6081.eaf9" local_interface: "Ethernet4" mgmt_address: "2cc2.6081.eaf9" - neigh_count: "1" + neighbor_count: "1" neighbor_interface: "Ethernet4" + neighbor_name: "spine2.company.com" platform_version: "Arista Networks EOS version 4.15.2F running on an Arista Networks\ \ vEOS" - system_id: "2cc2.6081.eaf9" - age: "27 seconds" - dest_host: "vmx1" + chassis_id: "0005.8671.4ec0" local_interface: "Management1" mgmt_address: "10.0.0.31" - neigh_count: "2" + neighbor_count: "2" neighbor_interface: "fxp0" + neighbor_name: "vmx1" platform_version: "Juniper Networks, Inc. vmx internet router, kernel JUNOS 15.1F4.15,\ \ Build date: 2015-12-23 19:22:55 UTC Copyright (c) 1996-2015 Juniper Networks,\ \ Inc." - system_id: "0005.8671.4ec0" - age: "17 seconds" - dest_host: "spine2.company.com" + chassis_id: "2cc2.6081.eaf9" local_interface: "Management1" mgmt_address: "2cc2.6081.eaf9" - neigh_count: "2" + neighbor_count: "2" neighbor_interface: "Management1" + neighbor_name: "spine2.company.com" platform_version: "Arista Networks EOS version 4.15.2F running on an Arista Networks\ \ vEOS" - system_id: "2cc2.6081.eaf9" - age: "4 seconds" - dest_host: "cvx" + chassis_id: "0050.56eb.3ef3" local_interface: "Ethernet8" mgmt_address: "172.16.2.141" - neigh_count: "3" + neighbor_count: "3" neighbor_interface: "Management1" + neighbor_name: "cvx" platform_version: "Arista Networks EOS version 4.15.5M running on an Arista Networks\ \ CVX" - system_id: "0050.56eb.3ef3" - age: "29 seconds" - dest_host: "cvx-client-1" + chassis_id: "0050.568b.67c8" local_interface: "Ethernet8" mgmt_address: "172.16.2.142" - neigh_count: "3" + neighbor_count: "3" neighbor_interface: "Ethernet1" + neighbor_name: "cvx-client-1" platform_version: "Arista Networks EOS version 4.15.5M running on an Arista Networks\ \ CVX" - system_id: "0050.568b.67c8" - age: "30 seconds" - dest_host: "cvx-client-1" + chassis_id: "0050.568b.67c8" local_interface: "Ethernet8" mgmt_address: "172.16.2.142" - neigh_count: "3" + neighbor_count: "3" neighbor_interface: "Management1" + neighbor_name: "cvx-client-1" platform_version: "Arista Networks EOS version 4.15.5M running on an Arista Networks\ \ CVX" - system_id: "0050.568b.67c8" - age: "29 seconds" - dest_host: "Leaf1.cliqr.com" + chassis_id: "7c0e.cecb.659b" local_interface: "Ethernet9" mgmt_address: "7c0e.cecb.659b" - neigh_count: "1" + neighbor_count: "1" neighbor_interface: "Eth1/23" + neighbor_name: "Leaf1.cliqr.com" platform_version: "topology/pod-1/node-101" - system_id: "7c0e.cecb.659b" - age: "29 seconds" - dest_host: "Leaf1.cliqr.com" + chassis_id: "7c0e.cecb.659c" local_interface: "Ethernet10" mgmt_address: "7c0e.cecb.659c" - neigh_count: "1" + neighbor_count: "1" neighbor_interface: "Eth1/24" + neighbor_name: "Leaf1.cliqr.com" platform_version: "topology/pod-1/node-101" - system_id: "7c0e.cecb.659c" - age: "21 seconds" - dest_host: "MX" + chassis_id: "3c8a.b089.9898" local_interface: "Ethernet23" mgmt_address: "" - neigh_count: "1" + neighbor_count: "1" neighbor_interface: "527" + neighbor_name: "MX" platform_version: "Juniper Networks, Inc. mx5-t internet router, kernel JUNOS\ \ 14.2R5.8, Build date: 2015-11-25 01:57:41 UTC Copyright (c) 1996-2015 Juniper\ \ Networks, Inc." - system_id: "3c8a.b089.9898" - age: "29 seconds" - dest_host: "cvx-client-2" + chassis_id: "0050.560b.66ea" local_interface: "Ethernet33" mgmt_address: "172.16.2.143" - neigh_count: "4" + neighbor_count: "4" neighbor_interface: "Management1" + neighbor_name: "cvx-client-2" platform_version: "Arista Networks EOS version 4.15.5M running on an Arista Networks\ \ CVX" - system_id: "0050.560b.66ea" - age: "29 seconds" - dest_host: "cvx-client-2" + chassis_id: "0050.560b.66ea" local_interface: "Ethernet33" mgmt_address: "172.16.2.143" - neigh_count: "4" + neighbor_count: "4" neighbor_interface: "Ethernet1" + neighbor_name: "cvx-client-2" platform_version: "Arista Networks EOS version 4.15.5M running on an Arista Networks\ \ CVX" - system_id: "0050.560b.66ea" - age: "29 seconds" - dest_host: "aci-compute" + chassis_id: "0050.56ac.4cd9" local_interface: "Ethernet33" mgmt_address: "fe80::250:56ff:feac:4cd9" - neigh_count: "4" + neighbor_count: "4" neighbor_interface: "0050.56ac.4cd9" + neighbor_name: "aci-compute" platform_version: "Red Hat Enterprise Linux Linux 3.10.0-327.13.1.el7.x86_64 #1\ \ SMP Mon Feb 29 13:22:02 EST 2016 x86_64" - system_id: "0050.56ac.4cd9" - age: "29 seconds" - dest_host: "aci-control" + chassis_id: "0050.56ac.4e29" local_interface: "Ethernet33" mgmt_address: "fe80::250:56ff:feac:4e29" - neigh_count: "4" + neighbor_count: "4" neighbor_interface: "0050.56ac.4e29" + neighbor_name: "aci-control" platform_version: "Red Hat Enterprise Linux Linux 3.10.0-327.13.1.el7.x86_64 #1\ \ SMP Mon Feb 29 13:22:02 EST 2016 x86_64" - system_id: "0050.56ac.4e29" - age: "19 seconds" - dest_host: "R4-Arista-L3-SDNLAB-SW1" + chassis_id: "001c.737d.77fb" local_interface: "Ethernet49/1" mgmt_address: "2.2.2.2" - neigh_count: "1" + neighbor_count: "1" neighbor_interface: "Ethernet49/1" + neighbor_name: "R4-Arista-L3-SDNLAB-SW1" platform_version: "Arista Networks EOS version 4.15.0FXA running on an Arista\ \ Networks DCS-7050SX-64" - system_id: "001c.737d.77fb" - age: "28 seconds" - dest_host: "R4-Arista-L3-SDNLAB-SW2" + chassis_id: "001c.737d.745f" local_interface: "Ethernet51/1" mgmt_address: "172.16.1.3" - neigh_count: "1" + neighbor_count: "1" neighbor_interface: "Ethernet49/1" + neighbor_name: "R4-Arista-L3-SDNLAB-SW2" platform_version: "Arista Networks EOS version 4.15.0FXA running on an Arista\ \ Networks DCS-7050SX-64" - system_id: "001c.737d.745f" - age: "28 seconds" - dest_host: "R4-Arista-L3-SDNLAB-SW2" + chassis_id: "001c.737d.745f" local_interface: "Ethernet52/1" mgmt_address: "172.16.1.3" - neigh_count: "1" + neighbor_count: "1" neighbor_interface: "Ethernet50/1" + neighbor_name: "R4-Arista-L3-SDNLAB-SW2" platform_version: "Arista Networks EOS version 4.15.0FXA running on an Arista\ \ Networks DCS-7050SX-64" - system_id: "001c.737d.745f" - age: "2 seconds" - dest_host: "test-host.domain.com" + chassis_id: "0cca.01c0.e8e1" local_interface: "Management1" mgmt_address: "172.16.208.5" - neigh_count: "1" + neighbor_count: "1" neighbor_interface: "Management1" + neighbor_name: "test-host.domain.com" platform_version: "" - system_id: "0cca.01c0.e8e1" From cc8958ab62b3a2fcb5e12bee96adebdb9952b57e Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sat, 2 Sep 2023 22:38:47 -0400 Subject: [PATCH 17/41] replace DEST_HOST and DESTINATION_HOST with CHASSIS_ID (and some instances of system name with NEIGHBOR_NAME to normalize --- ...isco_ios_show_cdp_neighbors_detail.textfsm | 4 +- ...sco_nxos_show_cdp_neighbors_detail.textfsm | 8 +- ..._wlc_ssh_show_cdp_neighbors_detail.textfsm | 4 +- ...cisco_xr_show_cdp_neighbors_detail.textfsm | 8 +- .../cisco_ios_show_cdp_neighbors_detail.yml | 8 +- .../cisco_ios_show_cdp_neighbors_detail2.yml | 2 +- .../cisco_nxos_show_cdp_neighbors_detail.yml | 20 ++-- .../cisco_nxos_show_cdp_neighbors_detail1.yml | 16 ++-- .../cisco_nxos_show_cdp_neighbors_detail2.yml | 4 +- ..._show_cdp_neighbors_detail_move_record.yml | 8 +- ...isco_wlc_ssh_show_cdp_neighbors_detail.yml | 6 +- .../cisco_xr_show_cdp_neighbors_detail.yml | 96 +++++++++---------- 12 files changed, 92 insertions(+), 92 deletions(-) diff --git a/ntc_templates/templates/cisco_ios_show_cdp_neighbors_detail.textfsm b/ntc_templates/templates/cisco_ios_show_cdp_neighbors_detail.textfsm index 9491502f48..0c7fca400c 100644 --- a/ntc_templates/templates/cisco_ios_show_cdp_neighbors_detail.textfsm +++ b/ntc_templates/templates/cisco_ios_show_cdp_neighbors_detail.textfsm @@ -1,4 +1,4 @@ -Value Required DESTINATION_HOST (\S+) +Value Required NEIGHBOR_NAME (\S+) Value MANAGEMENT_IP (\d+\.\d+\.\d+\.\d+|\w+\.\w+\.\w+) Value PLATFORM (.*) Value NEIGHBOR_INTERFACE (.*) @@ -7,7 +7,7 @@ Value SOFTWARE_VERSION (.*$) Value CAPABILITIES (.+?) Start - ^Device ID: ${DESTINATION_HOST} + ^Device ID: ${NEIGHBOR_NAME} ^Entry address\(es\)\s*:\s* -> ParseIP ^Platform\s*:\s*${PLATFORM}\s*,\s*Capabilities\s*:\s*${CAPABILITIES}\s+$$ ^Platform\s*:\s*${PLATFORM}\s*,\s*Capabilities\s*:\s*${CAPABILITIES}$$ diff --git a/ntc_templates/templates/cisco_nxos_show_cdp_neighbors_detail.textfsm b/ntc_templates/templates/cisco_nxos_show_cdp_neighbors_detail.textfsm index 859d263d77..8fa14b2033 100644 --- a/ntc_templates/templates/cisco_nxos_show_cdp_neighbors_detail.textfsm +++ b/ntc_templates/templates/cisco_nxos_show_cdp_neighbors_detail.textfsm @@ -1,5 +1,5 @@ -Value Required DEST_HOST (.*) -Value SYSNAME (.*) +Value Required CHASSIS_ID (.*) +Value NEIGHBOR_NAME (.*) Value MGMT_IP (.*) Value PLATFORM (.*) Value NEIGHBOR_INTERFACE (.*) @@ -10,8 +10,8 @@ Value CAPABILITIES (.*[^\s]) Start ^Device ID -> Continue.Record - ^Device ID:${DEST_HOST} - ^System Name: ${SYSNAME} + ^Device ID:${CHASSIS_ID} + ^System Name: ${NEIGHBOR_NAME} ^Interface address\(es\):\s*(^[1-9]\d*|$$) -> GetInterfaceIP ^Mgmt address\(es\): -> GetIP ^Platform: ${PLATFORM}, Capabilities: ${CAPABILITIES}\s*$$ diff --git a/ntc_templates/templates/cisco_wlc_ssh_show_cdp_neighbors_detail.textfsm b/ntc_templates/templates/cisco_wlc_ssh_show_cdp_neighbors_detail.textfsm index 0fd548f5f0..9a6b5793c0 100644 --- a/ntc_templates/templates/cisco_wlc_ssh_show_cdp_neighbors_detail.textfsm +++ b/ntc_templates/templates/cisco_wlc_ssh_show_cdp_neighbors_detail.textfsm @@ -1,4 +1,4 @@ -Value Required DESTINATION_HOST (\S+) +Value Required CHASSIS_ID (\S+) Value MANAGEMENT_IP (\d+\.\d+\.\d+\.\d+|\w+\.\w+\.\w+) Value PLATFORM (.*) Value NEIGHBOR_INTERFACE (.*) @@ -7,7 +7,7 @@ Value SOFTWARE_VERSION (.*$) Value CAPABILITIES (.*) Start - ^Device ID: ${DESTINATION_HOST} + ^Device ID: ${CHASSIS_ID} ^Entry address\(es\)\s*:\s* -> ParseIP ^Platform\s*:\s*${PLATFORM}\s*,\s*Capabilities\s*:\s*${CAPABILITIES} ^Interface: ${LOCAL_INTERFACE}, Port ID \(outgoing port\): ${NEIGHBOR_INTERFACE} diff --git a/ntc_templates/templates/cisco_xr_show_cdp_neighbors_detail.textfsm b/ntc_templates/templates/cisco_xr_show_cdp_neighbors_detail.textfsm index 6d2fdc65a9..aba393de53 100644 --- a/ntc_templates/templates/cisco_xr_show_cdp_neighbors_detail.textfsm +++ b/ntc_templates/templates/cisco_xr_show_cdp_neighbors_detail.textfsm @@ -1,5 +1,5 @@ -Value Required DEST_HOST (\S+) -Value SYSNAME (.*) +Value Required CHASSIS_ID (\S+) +Value NEIGHBOR_NAME (.*) Value MGMT_IP (.*) Value PLATFORM (.*) Value NEIGHBOR_INTERFACE (.*) @@ -8,8 +8,8 @@ Value VERSION (.*) Value CAPABILITIES (.*) Start - ^Device ID: ${DEST_HOST} - ^SysName : ${SYSNAME} + ^Device ID: ${CHASSIS_ID} + ^SysName : ${NEIGHBOR_NAME} ^Entry address\(es\): -> GetIP ^Platform: ${PLATFORM}, Capabilities: ${CAPABILITIES} ^Interface: ${LOCAL_INTERFACE} diff --git a/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail.yml b/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail.yml index 3ff8094b1c..a1acdd8d1e 100644 --- a/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail.yml +++ b/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail.yml @@ -1,34 +1,34 @@ --- parsed_sample: - capabilities: "Switch IGMP" - destination_host: "desktop-switch" local_interface: "GigabitEthernet1/0/16" management_ip: "10.1.1.2" neighbor_interface: "GigabitEthernet0/1" + neighbor_name: "desktop-switch" platform: "cisco WS-C2960-8TC-L" software_version: "Cisco IOS Software, C2960 Software (C2960-LANBASEK9-M), Version\ \ 12.2(55)SE9, RELEASE SOFTWARE (fc1)" - capabilities: "Router Switch IGMP" - destination_host: "ce-router" local_interface: "GigabitEthernet1/0/22" management_ip: "10.1.1.1" neighbor_interface: "GigabitEthernet0/0" + neighbor_name: "ce-router" platform: "Cisco 3825" software_version: "Cisco IOS Software, 3800 Software (C3825-ADVENTERPRISEK9-M),\ \ Version 12.4(24)T1, RELEASE SOFTWARE (fc3)" - capabilities: "Host" - destination_host: "server" local_interface: "GigabitEthernet1/0/19" management_ip: "10.1.1.232" neighbor_interface: "eth0" + neighbor_name: "server" platform: "VMware" software_version: "Linux 2.6.32-431.20.3.el6.x86_64 #1 SMP Fri Jun 6 18:30:54\ \ EDT 2014 CCM:10.5.2.10000-5.i386" - capabilities: "Router Switch IGMP" - destination_host: "vIOS-L2-1" local_interface: "GigabitEthernet0/3" management_ip: "" neighbor_interface: "GigabitEthernet0/3" + neighbor_name: "vIOS-L2-1" platform: "Cisco " software_version: "Cisco IOS Software, vios_l2 Software (vios_l2-ADVENTERPRISEK9-M),\ \ Version 15.2(CML_NIGHTLY_20150414)FLO_DSGS7, EARLY DEPLOYMENT DEVELOPMENT\ diff --git a/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail2.yml b/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail2.yml index 0d01474718..377bd63a89 100644 --- a/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail2.yml +++ b/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail2.yml @@ -1,10 +1,10 @@ --- parsed_sample: - capabilities: "Switch IGMP" - destination_host: "switchxxxxx" local_interface: "GigabitEthernet0/3" management_ip: "1.1.1.1" neighbor_interface: "GigabitEthernet0/8" + neighbor_name: "switchxxxxx" platform: "cisco WS-C3560X-24P" software_version: "Cisco IOS Software, C3560E Software (C3560E-UNIVERSALK9-M),\ \ Version 12.2(55)SE10, RELEASE SOFTWARE (fc2)" diff --git a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail.yml b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail.yml index 20a129f736..fde9a10413 100644 --- a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail.yml +++ b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail.yml @@ -1,48 +1,48 @@ --- parsed_sample: - capabilities: "Router Switch IGMP Filtering" - dest_host: "PERIMETER" + chassis_id: "PERIMETER" interface_ip: "10.1.100.1" local_interface: "mgmt0" mgmt_ip: "10.1.100.1" neighbor_interface: "FastEthernet1/0/32" + neighbor_name: "" platform: "cisco WS-C3750-48TS" - sysname: "" version: "Cisco IOS Software, C3750 Software (C3750-IPBASEK9-M), Version 12.2(44)SE2,\ \ RELEASE SOFTWARE (fc2)" - capabilities: "Router Switch IGMP Filtering Supports-STP-Dispute" - dest_host: "dc-lf03(SAL19069XXX)" + chassis_id: "dc-lf03(SAL19069XXX)" interface_ip: "10.1.100.226" local_interface: "Ethernet1/1" mgmt_ip: "10.1.100.226" neighbor_interface: "Ethernet1/1" + neighbor_name: "dc-lf03" platform: "N9K-C9372TX" - sysname: "dc-lf03" version: "Cisco Nexus Operating System (NX-OS) Software, Version 7.0(3)I5(1)" - capabilities: "Router Switch IGMP Filtering Supports-STP-Dispute" - dest_host: "dc-lf03(SAL1906XXXX)" + chassis_id: "dc-lf03(SAL1906XXXX)" interface_ip: "10.1.100.226" local_interface: "Ethernet1/3" mgmt_ip: "10.1.100.226" neighbor_interface: "Ethernet1/3" + neighbor_name: "dc-lf03" platform: "N9K-C9372TX" - sysname: "dc-lf03" version: "Cisco Nexus Operating System (NX-OS) Software, Version 7.0(3)I5(1)" - capabilities: "Router Switch IGMP Filtering Supports-STP-Dispute" - dest_host: "dc-sp01(SAL19069XXX)" + chassis_id: "dc-sp01(SAL19069XXX)" interface_ip: "10.1.1.1" local_interface: "Ethernet1/49" mgmt_ip: "10.1.100.222" neighbor_interface: "Ethernet1/52" + neighbor_name: "dc-sp01" platform: "N9K-C9372TX" - sysname: "dc-sp01" version: "Cisco Nexus Operating System (NX-OS) Software, Version 7.0(3)I2(2d)" - capabilities: "Router Switch IGMP Filtering Supports-STP-Dispute" - dest_host: "dc-sp02(SAL19069XXX)" + chassis_id: "dc-sp02(SAL19069XXX)" interface_ip: "10.1.1.9" local_interface: "Ethernet1/50" mgmt_ip: "10.1.100.223" neighbor_interface: "Ethernet1/52" + neighbor_name: "dc-sp02" platform: "N9K-C9372TX" - sysname: "dc-sp02" version: "Cisco Nexus Operating System (NX-OS) Software, Version 7.0(3)I2(2d)" diff --git a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail1.yml b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail1.yml index 6d2f1b8a6e..d51bb6f163 100644 --- a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail1.yml +++ b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail1.yml @@ -1,39 +1,39 @@ --- parsed_sample: - capabilities: "Switch IGMP Filtering" - dest_host: "DC3P01SW01.test.co.nz" + chassis_id: "DC3P01SW01.test.co.nz" interface_ip: "10.115.143.251" local_interface: "mgmt0" mgmt_ip: "10.115.143.251" neighbor_interface: "GigabitEthernet0/20" + neighbor_name: "" platform: "WS-C3560X-24" - sysname: "" version: "Cisco IOS Software, C3560E Software (C3560E-UNIVERSALK9-M), Version\ \ 12.2(55)SE5, RELEASE SOFTWARE (fc1)" - capabilities: "Router Switch IGMP Filtering Supports-STP-Dispute" - dest_host: "DC3TESTW01-55.test.co.nz(SSI3707070J)" + chassis_id: "DC3TESTW01-55.test.co.nz(SSI3707070J)" interface_ip: "10.115.17.253" local_interface: "Ethernet1/1" mgmt_ip: "10.115.143.120" neighbor_interface: "Ethernet1/31" + neighbor_name: "DC3TESTW01-55" platform: "N5K-C5548UP" - sysname: "DC3TESTW01-55" version: "Cisco Nexus Operating System (NX-OS) Software, Version 5.2(1)N1(4)" - capabilities: "Switch IGMP Filtering Supports-STP-Dispute" - dest_host: "DC3TESTW02.test.co.nz(SSI11111D2M)" + chassis_id: "DC3TESTW02.test.co.nz(SSI11111D2M)" interface_ip: "10.115.143.21" local_interface: "Ethernet1/21" mgmt_ip: "10.115.143.21" neighbor_interface: "Ethernet1/21" + neighbor_name: "DC3TESTW02" platform: "N5K-C5020P-BF" - sysname: "DC3TESTW02" version: "Cisco Nexus Operating System (NX-OS) Software, Version 5.2(1)N1(4)" - capabilities: "Switch IGMP Filtering Supports-STP-Dispute" - dest_host: "DC3TESTW02.test.co.nz(SSI44444D2M)" + chassis_id: "DC3TESTW02.test.co.nz(SSI44444D2M)" interface_ip: "10.115.143.21" local_interface: "Ethernet1/22" mgmt_ip: "10.115.143.21" neighbor_interface: "Ethernet1/22" + neighbor_name: "DC3TESTW02" platform: "N5K-C5020P-BF" - sysname: "DC3TESTW02" version: "Cisco Nexus Operating System (NX-OS) Software, Version 5.2(1)N1(4)" diff --git a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail2.yml b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail2.yml index b25eb0c9b9..b6752e2376 100644 --- a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail2.yml +++ b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail2.yml @@ -1,11 +1,11 @@ --- parsed_sample: - capabilities: "Router" - dest_host: "MKT1" + chassis_id: "MKT1" interface_ip: "" local_interface: "Ethernet1/1" mgmt_ip: "" neighbor_interface: "ether1" + neighbor_name: "" platform: "MikroTik" - sysname: "" version: "6.47.10 (long-term)" diff --git a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail_move_record.yml b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail_move_record.yml index d097e9acc8..0897fd5df7 100644 --- a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail_move_record.yml +++ b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail_move_record.yml @@ -1,22 +1,22 @@ --- parsed_sample: - capabilities: "Switch IGMP Filtering" - dest_host: "redacted.test.com" + chassis_id: "redacted.test.com" interface_ip: "10.0.0.1" local_interface: "Ethernet7/14" mgmt_ip: "10.0.0.1" neighbor_interface: "TenGigabitEthernet1/1/7" + neighbor_name: "" platform: "C9300-48UXM" - sysname: "" version: "Cisco IOS Software [Everest], Catalyst L3 Switch Software (CAT9K_IOSXE),\ \ Version 16.6.6, RELEASE SOFTWARE (fc1)" - capabilities: "Switch IGMP Filtering" - dest_host: "redacted.test.com" + chassis_id: "redacted.test.com" interface_ip: "10.0.0.3" local_interface: "Ethernet7/15" mgmt_ip: "10.0.0.4" neighbor_interface: "TenGigabitEthernet1/1/8" + neighbor_name: "" platform: "C9300-48UXM" - sysname: "" version: "Cisco IOS Software [Everest], Catalyst L3 Switch Software (CAT9K_IOSXE),\ \ Version 16.6.6, RELEASE SOFTWARE (fc1)" diff --git a/tests/cisco_wlc_ssh/show_cdp_neighbors_detail/cisco_wlc_ssh_show_cdp_neighbors_detail.yml b/tests/cisco_wlc_ssh/show_cdp_neighbors_detail/cisco_wlc_ssh_show_cdp_neighbors_detail.yml index 5ba14dd4c6..2b530f6c2c 100644 --- a/tests/cisco_wlc_ssh/show_cdp_neighbors_detail/cisco_wlc_ssh_show_cdp_neighbors_detail.yml +++ b/tests/cisco_wlc_ssh/show_cdp_neighbors_detail/cisco_wlc_ssh_show_cdp_neighbors_detail.yml @@ -1,14 +1,14 @@ --- parsed_sample: - capabilities: "Router Switch IGMP" - destination_host: "AAA.pizza.com(FXS1828Q2JH)" + chassis_id: "AAA.pizza.com(FXS1828Q2JH)" local_interface: "GigabitEthernet0/0/2" management_ip: "1.2.3.4" neighbor_interface: "Ethernet1/15" platform: "N77-C7706" software_version: "Cisco Nexus Operating System (NX-OS) Software, Version 6.2(10)" - capabilities: "Router Switch IGMP" - destination_host: "BBB.beer.com" + chassis_id: "BBB.beer.com" local_interface: "GigabitEthernet0/0/7" management_ip: "172.5.6.7" neighbor_interface: "GigabitEthernet1/0/11" @@ -18,7 +18,7 @@ parsed_sample: \ Copyright (c) 1986-2016 by Cisco Systems, Inc. Compiled Wed 17-Aug-16 13:28\ \ by prod_rel_team" - capabilities: "Router Switch IGMP" - destination_host: "CCC.cake.com" + chassis_id: "CCC.cake.com" local_interface: "GigabitEthernet0/0/8" management_ip: "172.9.10.11" neighbor_interface: "GigabitEthernet1/0/1" diff --git a/tests/cisco_xr/show_cdp_neighbors_detail/cisco_xr_show_cdp_neighbors_detail.yml b/tests/cisco_xr/show_cdp_neighbors_detail/cisco_xr_show_cdp_neighbors_detail.yml index 8082697c4c..3f1005b36a 100644 --- a/tests/cisco_xr/show_cdp_neighbors_detail/cisco_xr_show_cdp_neighbors_detail.yml +++ b/tests/cisco_xr/show_cdp_neighbors_detail/cisco_xr_show_cdp_neighbors_detail.yml @@ -1,198 +1,198 @@ --- parsed_sample: - capabilities: "Router Switch IGMP" - dest_host: "nyc-dc-dcm005.ntc.com" + chassis_id: "nyc-dc-dcm005.ntc.com" local_interface: "MgmtEth0/RSP0/CPU0/0" mgmt_ip: "10.100.1.54" neighbor_interface: "GigabitEthernet1/9" + neighbor_name: "" platform: "cisco WS-C4948E" - sysname: "" version: "Cisco IOS Software, Catalyst 4500 L3 Switch Software (cat4500e-ENTSERVICESK9-M),\ \ Version 15.0(2)SG10, RELEASE SOFTWARE (fc1)" - capabilities: "Router Switch IGMP" - dest_host: "nyc-dc-dcm006.ntc.com" + chassis_id: "nyc-dc-dcm006.ntc.com" local_interface: "MgmtEth0/RSP1/CPU0/0" mgmt_ip: "10.100.1.55" neighbor_interface: "GigabitEthernet1/9" + neighbor_name: "" platform: "cisco WS-C4948E" - sysname: "" version: "Cisco IOS Software, Catalyst 4500 L3 Switch Software (cat4500e-ENTSERVICESK9-M),\ \ Version 15.0(2)SG10, RELEASE SOFTWARE (fc1)" - capabilities: "Router Switch IGMP" - dest_host: "nyc-dc-c90.ntc.com" + chassis_id: "nyc-dc-c90.ntc.com" local_interface: "FortyGigE0/0/1/0" mgmt_ip: "10.100.100.141" neighbor_interface: "FortyGigE0/0/0/2" + neighbor_name: "nyc-dc-c90.ntc.com" platform: "cisco CRS" - sysname: "nyc-dc-c90.ntc.com" version: "Cisco IOS XR Software, Version 5.1.2[Default]" - capabilities: "Router Switch" - dest_host: "nyc-dc-d02.ntc.com(FXS182XXXXX)" + chassis_id: "nyc-dc-d02.ntc.com(FXS182XXXXX)" local_interface: "FortyGigE0/0/1/1" mgmt_ip: "10.100.100.162" neighbor_interface: "Ethernet6/1" + neighbor_name: "nyc-dc-d02" platform: "N77-C7706" - sysname: "nyc-dc-d02" version: "Cisco Nexus Operating System (NX-OS) Software, Version 6.2(12)" - capabilities: "Router" - dest_host: "nyc-dc-c97" + chassis_id: "nyc-dc-c97" local_interface: "FortyGigE0/0/0/0" mgmt_ip: "10.100.100.19" neighbor_interface: "FortyGigE0/0/0/0" + neighbor_name: "nyc-dc-c97" platform: "cisco ASR9K Series" - sysname: "nyc-dc-c97" version: "Cisco IOS XR Software, Version 5.3.4[Default]" - capabilities: "Router" - dest_host: "nyc-dc-c91.ntc.com" + chassis_id: "nyc-dc-c91.ntc.com" local_interface: "FortyGigE0/0/0/1" mgmt_ip: "10.100.100.125" neighbor_interface: "FortyGigE0/0/0/2" + neighbor_name: "nyc-dc-c91.ntc.com" platform: "cisco CRS" - sysname: "nyc-dc-c91.ntc.com" version: "Cisco IOS XR Software, Version 5.1.2[Default]" - capabilities: "Router" - dest_host: "nyc-dc-c97" + chassis_id: "nyc-dc-c97" local_interface: "FortyGigE0/1/0/0" mgmt_ip: "10.100.100.113" neighbor_interface: "FortyGigE0/1/0/0" + neighbor_name: "nyc-dc-c97" platform: "cisco ASR9K Series" - sysname: "nyc-dc-c97" version: "Cisco IOS XR Software, Version 5.3.4[Default]" - capabilities: "Router Switch" - dest_host: "nyc-dc-d03.ntc.com(FXS182XXXXX)" + chassis_id: "nyc-dc-d03.ntc.com(FXS182XXXXX)" local_interface: "FortyGigE0/1/0/1" mgmt_ip: "10.100.100.190" neighbor_interface: "Ethernet6/1" + neighbor_name: "nyc-dc-d03" platform: "N77-C7706" - sysname: "nyc-dc-d03" version: "Cisco Nexus Operating System (NX-OS) Software, Version 6.2(12)" - capabilities: "Router" - dest_host: "nyc-dc-c90.ntc.com" + chassis_id: "nyc-dc-c90.ntc.com" local_interface: "FortyGigE0/1/1/0" mgmt_ip: "10.100.100.145" neighbor_interface: "FortyGigE0/4/0/2" + neighbor_name: "nyc-dc-c90.ntc.com" platform: "cisco CRS" - sysname: "nyc-dc-c90.ntc.com" version: "Cisco IOS XR Software, Version 5.1.2[Default]" - capabilities: "Router Switch" - dest_host: "nyc-dc-z50a.ntc.com(JAF18XXXXX)" + chassis_id: "nyc-dc-z50a.ntc.com(JAF18XXXXX)" local_interface: "FortyGigE0/1/1/1" mgmt_ip: "10.100.100.116" neighbor_interface: "Ethernet4/3" + neighbor_name: "nyc-dc-z50a" platform: "N77-C7710" - sysname: "nyc-dc-z50a" version: "Cisco Nexus Operating System (NX-OS) Software, Version 6.2(12)" - capabilities: "Router Switch" - dest_host: "nyc-dc-d04.ntc.com(FXS18XXXXXX)" + chassis_id: "nyc-dc-d04.ntc.com(FXS18XXXXXX)" local_interface: "FortyGigE0/2/1/0" mgmt_ip: "10.100.100.194" neighbor_interface: "Ethernet6/1" + neighbor_name: "nyc-dc-d04" platform: "N77-C7706" - sysname: "nyc-dc-d04" version: "Cisco Nexus Operating System (NX-OS) Software, Version 6.2(12)" - capabilities: "Router" - dest_host: "nyc-dc-c91.ntc.com" + chassis_id: "nyc-dc-c91.ntc.com" local_interface: "FortyGigE0/2/1/1" mgmt_ip: "10.100.100.129" neighbor_interface: "FortyGigE0/4/0/2" + neighbor_name: "nyc-dc-c91.ntc.com" platform: "cisco CRS" - sysname: "nyc-dc-c91.ntc.com" version: "Cisco IOS XR Software, Version 5.1.2[Default]" - capabilities: "Router Switch" - dest_host: "nyc-dc-d01.ntc.com(FXS182XXXXX)" + chassis_id: "nyc-dc-d01.ntc.com(FXS182XXXXX)" local_interface: "FortyGigE0/2/0/0" mgmt_ip: "10.100.100.158" neighbor_interface: "Ethernet6/1" + neighbor_name: "nyc-dc-d01" platform: "N77-C7706" - sysname: "nyc-dc-d01" version: "Cisco Nexus Operating System (NX-OS) Software, Version 6.2(12)" - capabilities: "Router Switch" - dest_host: "nyc-dc-z50b.ntc.com(JAF181XXXXX)" + chassis_id: "nyc-dc-z50b.ntc.com(JAF181XXXXX)" local_interface: "FortyGigE0/2/0/1" mgmt_ip: "10.100.100.111" neighbor_interface: "Ethernet4/3" + neighbor_name: "nyc-dc-z50b" platform: "N77-C7710" - sysname: "nyc-dc-z50b" version: "Cisco Nexus Operating System (NX-OS) Software, Version 6.2(12)" - capabilities: "Router Switch IGMP" - dest_host: "nyc-dc-dcc001.ntc.com" + chassis_id: "nyc-dc-dcc001.ntc.com" local_interface: "TenGigE0/3/0/0" mgmt_ip: "10.100.100.174" neighbor_interface: "TenGigabitEthernet6/1" + neighbor_name: "" platform: "cisco WS-C4510R+E" - sysname: "" version: "Cisco IOS Software, Catalyst 4500 L3 Switch Software (cat4500e-UNIVERSALK9-M),\ \ Version 15.2(2)E3, RELEASE SOFTWARE (fc3)" - capabilities: "Router" - dest_host: "nyc-dc-d57" + chassis_id: "nyc-dc-d57" local_interface: "TenGigE0/3/0/1" mgmt_ip: "10.100.100.115" neighbor_interface: "TenGigE0/2/0/0" + neighbor_name: "nyc-dc-d57" platform: "cisco ASR9K Series" - sysname: "nyc-dc-d57" version: "Cisco IOS XR Software, Version 4.3.2[Default]" - capabilities: "Router Switch" - dest_host: "nyc-dc-d40b.ntc.com(JAF182XXXXX)" + chassis_id: "nyc-dc-d40b.ntc.com(JAF182XXXXX)" local_interface: "TenGigE0/3/0/2" mgmt_ip: "10.100.100.114" neighbor_interface: "Ethernet4/1" + neighbor_name: "nyc-dc-d40b" platform: "N77-C7710" - sysname: "nyc-dc-d40b" version: "Cisco Nexus Operating System (NX-OS) Software, Version 6.2(12)" - capabilities: "Router Switch IGMP" - dest_host: "nyc-dc-d80.ntc.com(FOC184XXXXX)" + chassis_id: "nyc-dc-d80.ntc.com(FOC184XXXXX)" local_interface: "TenGigE0/3/0/3" mgmt_ip: "10.100.100.117" neighbor_interface: "Ethernet2/1" + neighbor_name: "nyc-dc-d80" platform: "N5K-C56128P" - sysname: "nyc-dc-d80" version: "Cisco Nexus Operating System (NX-OS) Software, Version 7.0(7)N1(1)" - capabilities: "Router Switch IGMP" - dest_host: "nyc-dc-dcc002.ntc.com" + chassis_id: "nyc-dc-dcc002.ntc.com" local_interface: "TenGigE0/4/0/0" mgmt_ip: "10.100.100.178" neighbor_interface: "TenGigabitEthernet6/1" + neighbor_name: "" platform: "cisco WS-C4510R+E" - sysname: "" version: "Cisco IOS Software, Catalyst 4500 L3 Switch Software (cat4500e-UNIVERSALK9-M),\ \ Version 15.2(2)E3, RELEASE SOFTWARE (fc3)" - capabilities: "Router" - dest_host: "nyc-dc-d57" + chassis_id: "nyc-dc-d57" local_interface: "TenGigE0/4/0/1" mgmt_ip: "10.100.100.115" neighbor_interface: "TenGigE1/2/0/0" + neighbor_name: "nyc-dc-d57" platform: "cisco ASR9K Series" - sysname: "nyc-dc-d57" version: "Cisco IOS XR Software, Version 4.3.2[Default]" - capabilities: "Router Switch" - dest_host: "nyc-dc-d40a.ntc.com(JAF182XXXXX)" + chassis_id: "nyc-dc-d40a.ntc.com(JAF182XXXXX)" local_interface: "TenGigE0/4/0/2" mgmt_ip: "10.100.100.113" neighbor_interface: "Ethernet4/1" + neighbor_name: "nyc-dc-d40a" platform: "N77-C7710" - sysname: "nyc-dc-d40a" version: "Cisco Nexus Operating System (NX-OS) Software, Version 6.2(12)" - capabilities: "Router Switch IGMP" - dest_host: "nyc-dc-d81.ntc.com(FOC182XXXXX)" + chassis_id: "nyc-dc-d81.ntc.com(FOC182XXXXX)" local_interface: "TenGigE0/4/0/3" mgmt_ip: "10.100.100.118" neighbor_interface: "Ethernet1/1" + neighbor_name: "nyc-dc-d81" platform: "N5K-C56128P" - sysname: "nyc-dc-d81" version: "Cisco Nexus Operating System (NX-OS) Software, Version 7.0(7)N1(1)" - capabilities: "Router" - dest_host: "nyc-dc-c97" + chassis_id: "nyc-dc-c97" local_interface: "FortyGigE0/6/0/0" mgmt_ip: "192.168.169.21" neighbor_interface: "FortyGigE0/6/0/0" + neighbor_name: "nyc-dc-c97" platform: "cisco ASR9K Series" - sysname: "nyc-dc-c97" version: "Cisco IOS XR Software, Version 5.3.4[Default]" - capabilities: "Router" - dest_host: "nyc-dc-c97" + chassis_id: "nyc-dc-c97" local_interface: "FortyGigE0/6/0/0" mgmt_ip: "192.168.169.21" neighbor_interface: "FortyGigE0/7/0/0" + neighbor_name: "nyc-dc-c97" platform: "cisco ASR9K Series" - sysname: "nyc-dc-c97" version: "Cisco IOS XR Software, Version 5.3.4[Default]" From 4428287507c6e0f595160e873e8305a2782e4eb5 Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sat, 2 Sep 2023 22:45:01 -0400 Subject: [PATCH 18/41] replace DEVICE_ID with CHASSIS_ID in cisco_s300_show_lldp_neighbors to normalize --- .../templates/cisco_s300_show_lldp_neighbors.textfsm | 4 ++-- .../cisco_s300_show_lldp_neighbors.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ntc_templates/templates/cisco_s300_show_lldp_neighbors.textfsm b/ntc_templates/templates/cisco_s300_show_lldp_neighbors.textfsm index d163045cfc..7f6eafc92d 100644 --- a/ntc_templates/templates/cisco_s300_show_lldp_neighbors.textfsm +++ b/ntc_templates/templates/cisco_s300_show_lldp_neighbors.textfsm @@ -1,7 +1,7 @@ Value NEIGHBOR (\S+) Value LOCAL_INTERFACE (\S+) Value NEIGHBOR_INTERFACE (\S+) -Value DEVICE_ID (([0-9a-f]{2}[:-]){5}([0-9a-f]{2})) +Value CHASSIS_ID (([0-9a-f]{2}[:-]){5}([0-9a-f]{2})) Start ^System\s+capability\s+legend @@ -12,6 +12,6 @@ Start Begin ^-+ - ^${LOCAL_INTERFACE}\s+${DEVICE_ID}\s+${NEIGHBOR_INTERFACE}\s+${NEIGHBOR}.+ -> Record + ^${LOCAL_INTERFACE}\s+${CHASSIS_ID}\s+${NEIGHBOR_INTERFACE}\s+${NEIGHBOR}.+ -> Record ^\s*$$ ^. -> Error diff --git a/tests/cisco_s300/show_lldp_neighbors/cisco_s300_show_lldp_neighbors.yml b/tests/cisco_s300/show_lldp_neighbors/cisco_s300_show_lldp_neighbors.yml index c7f4bc600f..f955cf5326 100644 --- a/tests/cisco_s300/show_lldp_neighbors/cisco_s300_show_lldp_neighbors.yml +++ b/tests/cisco_s300/show_lldp_neighbors/cisco_s300_show_lldp_neighbors.yml @@ -1,10 +1,10 @@ --- parsed_sample: - - neighbor: "prsw03freeporil" + - chassis_id: "00:08:32:0f:1e:bd" local_interface: "gi27" + neighbor: "prsw03freeporil" neighbor_interface: "gi27" - device_id: "00:08:32:0f:1e:bd" - - neighbor: "prsw01freeportin" + - chassis_id: "00:08:32:0f:04:cc" local_interface: "gi28" + neighbor: "prsw01freeportin" neighbor_interface: "gi28" - device_id: "00:08:32:0f:04:cc" From ca224b5c2f8990ee8fc773e04f6f5167c64cfc0c Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sat, 2 Sep 2023 22:49:30 -0400 Subject: [PATCH 19/41] replace NEIGHBOR_ID with CHASSIS_ID in hp_procurve_show_cdp_neighbors_detail to normalize --- .../hp_procurve_show_cdp_neighbors_detail.textfsm | 6 +++--- .../hp_procurve_show_cdp_neighbors_detail.yml | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ntc_templates/templates/hp_procurve_show_cdp_neighbors_detail.textfsm b/ntc_templates/templates/hp_procurve_show_cdp_neighbors_detail.textfsm index 7da14e83a3..3db1c15490 100644 --- a/ntc_templates/templates/hp_procurve_show_cdp_neighbors_detail.textfsm +++ b/ntc_templates/templates/hp_procurve_show_cdp_neighbors_detail.textfsm @@ -1,5 +1,5 @@ Value Required LOCAL_INTERFACE (.+?) -Value NEIGHBOR_ID (.+?) +Value CHASSIS_ID (.+?) Value NEIGHBOR_ADDRESS (.+?) Value NEIGHBOR_PLATFORM (.+?) Value CAPABILITIES (.+?) @@ -9,7 +9,7 @@ Value NEIGHBOR_VERSION (.+?) Start ^\s*CDP\s+neighbors\s+information ^\s*Port\s*:\s*${LOCAL_INTERFACE}\s*$$ - ^\s*Device\s+ID\s*:\s*${NEIGHBOR_ID}\s*$$ + ^\s*Device\s+ID\s*:\s*${CHASSIS_ID}\s*$$ ^\s*Address\s+Type ^\s*Address\s*:\s*${NEIGHBOR_ADDRESS}\s*$$ ^\s*Platform\s*:\s*${NEIGHBOR_PLATFORM}\s*$$ @@ -18,4 +18,4 @@ Start ^\s*Version\s*:\s*${NEIGHBOR_VERSION}\s*$$ -> Record ^\s*$$ ^\s*---- - ^. -> Error \ No newline at end of file + ^. -> Error diff --git a/tests/hp_procurve/show_cdp_neighbors_detail/hp_procurve_show_cdp_neighbors_detail.yml b/tests/hp_procurve/show_cdp_neighbors_detail/hp_procurve_show_cdp_neighbors_detail.yml index 73e6fc9e8f..0e1aa34036 100644 --- a/tests/hp_procurve/show_cdp_neighbors_detail/hp_procurve_show_cdp_neighbors_detail.yml +++ b/tests/hp_procurve/show_cdp_neighbors_detail/hp_procurve_show_cdp_neighbors_detail.yml @@ -1,30 +1,30 @@ --- parsed_sample: - capabilities: "Router" + chassis_id: "AP01-Site" local_interface: "1" neighbor_address: "10.11.11.16" - neighbor_id: "AP01-Site" neighbor_interface: "ge1" neighbor_platform: "5.9.1.5-001RAP-6521-60020-WR" neighbor_version: "5.9.1.5-001RAP-6521-60020-WR" - capabilities: "Router" + chassis_id: "5c 0e 8b 11 11 11" local_interface: "1" neighbor_address: "10.11.11.16" - neighbor_id: "5c 0e 8b 11 11 11" neighbor_interface: "ge1" neighbor_platform: "AP-6521-60020-WR, Version 5.9.1.5-001R" neighbor_version: "AP-6521-60020-WR, Version 5.9.1.5-001R" - capabilities: "Router" + chassis_id: "5c 0e 8b 12 22 22" local_interface: "2" neighbor_address: "Unsupported format" - neighbor_id: "5c 0e 8b 12 22 22" neighbor_interface: "ge1" neighbor_platform: "AP-6521-60020-WR, Version 5.9.1.5-001R" neighbor_version: "AP-6521-60020-WR, Version 5.9.1.5-001R" - capabilities: "Router" + chassis_id: "AP02-Site" local_interface: "2" neighbor_address: "10.11.11.17" - neighbor_id: "AP02-Site" neighbor_interface: "ge1" neighbor_platform: "5.9.1.5-001RAP-6521-60020-WR" neighbor_version: "5.9.1.5-001RAP-6521-60020-WR" From 941b6fdd1c6c6e8f7d7c4ee3926056909d52b90e Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sat, 2 Sep 2023 23:12:08 -0400 Subject: [PATCH 20/41] replace NEIGHBOR_CHASSIS_ID with CHASSIS_ID and PVID with VLAN_ID in hp_procurve_show_lldp_info_remote-device_detail to normalize --- ...how_lldp_info_remote-device_detail.textfsm | 9 +++--- ...ve_show_lldp_info_remote-device_detail.yml | 32 +++++++++---------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device_detail.textfsm b/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device_detail.textfsm index f825c61222..e8c280b5c2 100644 --- a/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device_detail.textfsm +++ b/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device_detail.textfsm @@ -1,12 +1,12 @@ Value Required LOCAL_INTERFACE (\S+) Value NEIGHBOR_CHASSIS_TYPE (\S+) -Value NEIGHBOR_CHASSIS_ID ([a-f0-9]{6}-[a-f0-9]{6}|(?:[a-z0-9]{2}\s){5}[a-z0-9]{2}|\S+) +Value CHASSIS_ID ([a-f0-9]{6}-[a-f0-9]{6}|(?:[a-z0-9]{2}\s){5}[a-z0-9]{2}|\S+) Value PORT_TYPE (\S+) Value NEIGHBOR_PORTID (.*?) Value NEIGHBOR_SYSNAME (.*?) Value SYSTEM_DESCR (.*?) Value NEIGHBOR_INTERFACE_DESCRIPTION (\S+|.*?) -Value PVID (\d+|.*?) +Value VLAN_ID (\d+|.*?) Value CAPABILITIES_SUPPORTED (.*?) Value CAPABILITIES (.*?) Value REMOTE_MANAGEMENT_ADDRESS (\S+|.*?) @@ -19,13 +19,14 @@ Start LLDP ^\s+Local\sPort\s+:\s${LOCAL_INTERFACE}\s*$$ ^\s+ChassisType\s+:\s${NEIGHBOR_CHASSIS_TYPE}\s*$$ - ^\s+ChassisId\s+:\s${NEIGHBOR_CHASSIS_ID}\s*$$ + ^\s+ChassisId\s+:\s${CHASSIS_ID}\s*$$ ^\s+PortType\s+:\s${PORT_TYPE}\s*$$ ^\s+PortId\s+:\s${NEIGHBOR_PORTID}\s*$$ ^\s+SysName\s+:\s${NEIGHBOR_SYSNAME}\s*$$ ^\s+System\sDescr\s:\s${SYSTEM_DESCR}\s*$$ ^\s+PortDescr\s+:\s${NEIGHBOR_INTERFACE_DESCRIPTION}\s*$$ - ^\s+Pvid\s+:\s${PVID}\s*$$ +# Port VLAN ID + ^\s+Pvid\s+:\s${VLAN_ID}\s*$$ ^\s+System\s+Capabilities\s+Supported\s+:\s${CAPABILITIES_SUPPORTED}\s*$$ ^\s+System\s+Capabilities\s+Enabled\s+:\s${CAPABILITIES}\s*$$ ^\s+Remote\s+Management\s+Address\s*$$ diff --git a/tests/hp_procurve/show_lldp_info_remote-device_detail/hp_procurve_show_lldp_info_remote-device_detail.yml b/tests/hp_procurve/show_lldp_info_remote-device_detail/hp_procurve_show_lldp_info_remote-device_detail.yml index 3e9f090c21..4e45f40084 100644 --- a/tests/hp_procurve/show_lldp_info_remote-device_detail/hp_procurve_show_lldp_info_remote-device_detail.yml +++ b/tests/hp_procurve/show_lldp_info_remote-device_detail/hp_procurve_show_lldp_info_remote-device_detail.yml @@ -2,97 +2,97 @@ parsed_sample: - capabilities: "bridge" capabilities_supported: "bridge, router" + chassis_id: "3821c7-c1cd00" local_interface: "1" - neighbor_chassis_id: "3821c7-c1cd00" neighbor_chassis_type: "mac-address" neighbor_interface_description: "1" neighbor_portid: "1" neighbor_sysname: "65432p-swi006-abcd-srvroom-4asd" port_type: "local" - pvid: "0" remote_management_address: "192.168.130.100" system_descr: "Aruba JL357A 2540-48G-PoE+-4SFP+ Switch, revision YC.16.0..." + vlan_id: "0" - capabilities: "" capabilities_supported: "" + chassis_id: "3ce1a1-2218f0" local_interface: "3" - neighbor_chassis_id: "3ce1a1-2218f0" neighbor_chassis_type: "mac-address" neighbor_interface_description: "" neighbor_portid: "3c e1 a1 22 18 f0" neighbor_sysname: "" port_type: "mac-address" - pvid: "" remote_management_address: "" system_descr: "" + vlan_id: "" - capabilities: "bridge, wlan-access-point" capabilities_supported: "bridge, wlan-access-point" + chassis_id: "bcf310-1f8b40" local_interface: "7" - neighbor_chassis_id: "bcf310-1f8b40" neighbor_chassis_type: "mac-address" neighbor_interface_description: "" neighbor_portid: "mgt0" neighbor_sysname: "AH-cust-AP21" port_type: "interface-name" - pvid: "" remote_management_address: "192.168.100.55" system_descr: "" + vlan_id: "" - capabilities: "" capabilities_supported: "" + chassis_id: "d8cb8a-6d303c" local_interface: "25" - neighbor_chassis_id: "d8cb8a-6d303c" neighbor_chassis_type: "mac-address" neighbor_interface_description: "" neighbor_portid: "d8 cb 8a 6d 30 3c" neighbor_sysname: "" port_type: "mac-address" - pvid: "" remote_management_address: "" system_descr: "" + vlan_id: "" - capabilities: "" capabilities_supported: "" + chassis_id: "484d7e-e66c42" local_interface: "29" - neighbor_chassis_id: "484d7e-e66c42" neighbor_chassis_type: "mac-address" neighbor_interface_description: "" neighbor_portid: "48 4d 7e e6 6c 42" neighbor_sysname: "" port_type: "mac-address" - pvid: "" remote_management_address: "" system_descr: "" + vlan_id: "" - capabilities: "bridge, wlan-access-point, router" capabilities_supported: "bridge, wlan-access-point, router" + chassis_id: "603197-7aa548" local_interface: "36" - neighbor_chassis_id: "603197-7aa548" neighbor_chassis_type: "mac-address" neighbor_interface_description: "UPLINK" neighbor_portid: "1" neighbor_sysname: "NAP203" port_type: "local" - pvid: "" remote_management_address: "192.168.100.50" system_descr: "ZLD 6.00(###.8)B1 (cannon)" + vlan_id: "" - capabilities: "" capabilities_supported: "" + chassis_id: "b00cd1-359a98" local_interface: "37" - neighbor_chassis_id: "b00cd1-359a98" neighbor_chassis_type: "mac-address" neighbor_interface_description: "" neighbor_portid: "b0 0c d1 35 9a 98" neighbor_sysname: "" port_type: "mac-address" - pvid: "" remote_management_address: "" system_descr: "" + vlan_id: "" - capabilities: "" capabilities_supported: "" + chassis_id: "d8cb8a-894644" local_interface: "42" - neighbor_chassis_id: "d8cb8a-894644" neighbor_chassis_type: "mac-address" neighbor_interface_description: "" neighbor_portid: "d8 cb 8a 89 46 44" neighbor_sysname: "" port_type: "mac-address" - pvid: "" remote_management_address: "" system_descr: "" + vlan_id: "" From a6b592a5867375242e5b3950f25f8f03de62264b Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sun, 3 Sep 2023 08:52:29 -0400 Subject: [PATCH 21/41] replace NEIGHBOR with NEIGHBOR_NAME in several CDP and LLDP templates to normalize --- docs/dev/data_model.md | 1 + .../arista_eos_show_lldp_neighbors.textfsm | 4 +- ...ocade_fastiron_show_lldp_neighbors.textfsm | 4 +- .../cisco_ios_show_cdp_neighbors.textfsm | 6 +-- .../cisco_ios_show_lldp_neighbors.textfsm | 6 +-- ...sco_ios_show_lldp_neighbors_detail.textfsm | 4 +- .../cisco_nxos_show_cdp_neighbors.textfsm | 6 +-- .../cisco_nxos_show_lldp_neighbors.textfsm | 8 ++-- ...co_nxos_show_lldp_neighbors_detail.textfsm | 4 +- .../cisco_s300_show_lldp_neighbors.textfsm | 4 +- .../cisco_xr_show_lldp_neighbors.textfsm | 6 +-- ...lay_lldp_neighbor-information_list.textfsm | 6 +-- ..._lldp_neighbor-information_verbose.textfsm | 4 +- .../huawei_vrp_display_lldp_neighbor.textfsm | 4 +- .../ipinfusion_ocnos_show_lldp_table.textfsm | 4 +- .../arista_eos_show_lldp_neighbors.yml | 16 +++---- .../brocade_fastiron_show_lldp_neighbors.yml | 6 +-- .../cisco_ios_show_cdp_neighbors.yml | 12 ++--- .../cisco_ios_show_cdp_neighbors_2.yml | 22 +++++----- .../cisco_ios_show_cdp_neighbors_3.yml | 44 +++++++++---------- .../cisco_ios_show_cdp_neighbors_4.yml | 2 +- .../cisco_ios_show_lldp_neighbors.yml | 10 ++--- .../cisco_ios_show_lldp_neighbors2.yml | 4 +- .../cisco_ios_show_lldp_neighbors_detail1.yml | 6 +-- .../cisco_ios_show_lldp_neighbors_detail2.yml | 8 ++-- .../cisco_ios_show_lldp_neighbors_detail3.yml | 2 +- .../cisco_ios_show_lldp_neighbors_detail4.yml | 4 +- .../cisco_ios_show_lldp_neighbors_detail5.yml | 8 ++-- .../cisco_nxos_show_cdp_neighbors.yml | 14 +++--- .../cisco_nxos_show_cdp_neighbors2.yml | 12 ++--- .../cisco_nxos_show_lldp_neighbors.yml | 6 +-- ...sco_nxos_show_lldp_neighbors_multiline.yml | 30 ++++++------- .../cisco_nxos_show_lldp_neighbors_detail.yml | 8 ++-- ...cisco_nxos_show_lldp_neighbors_detail2.yml | 4 +- .../cisco_s300_show_lldp_neighbors.yml | 4 +- .../cisco_xr_show_lldp_neighbors.yml | 4 +- ...display_lldp_neighbor-information_list.yml | 24 +++++----- ...isplay_lldp_neighbor-information_list1.yml | 12 ++--- ...isplay_lldp_neighbor-information_list2.yml | 18 ++++---- ...play_lldp_neighbor-information_verbose.yml | 8 ++-- .../huawei_vrp_display_lldp_neighbor.yml | 4 +- .../ipinfusion_ocnos_show_lldp_table.yml | 14 +++--- 42 files changed, 189 insertions(+), 188 deletions(-) diff --git a/docs/dev/data_model.md b/docs/dev/data_model.md index 0759f39a16..8527998f70 100644 --- a/docs/dev/data_model.md +++ b/docs/dev/data_model.md @@ -45,6 +45,7 @@ Example: Imagine the extra programming logic needed to consume structured data w | `MGMT_IP_ADDRESS` | instead of MGMT_IP or MGMT_ADDRESS or MANAGEMENT_IP or REMOTE_MANAGEMENT_ADDRESS | | `NEIGHBOR_ID` | for router IDs remote to the system being parsed | | `NEIGHBOR_INTERFACE` | often represents neighbor or remote interface or port for CDP or LLDP | +| `NEIGHBOR_NAME` | often represents neighbor name for CDP or LLDP | | `NETMASK` | for IPv4 dotted quad masks | | `NETWORK` | for network numbers or subnet address (without the mask or prefix/slash notation); in place of ROUTE | | `PREFIX_LENGTH` | instead of PREFIX or CIDR for the numbers of a slash notation or CIDR mask | diff --git a/ntc_templates/templates/arista_eos_show_lldp_neighbors.textfsm b/ntc_templates/templates/arista_eos_show_lldp_neighbors.textfsm index f8d2e00a1e..729d4e2382 100644 --- a/ntc_templates/templates/arista_eos_show_lldp_neighbors.textfsm +++ b/ntc_templates/templates/arista_eos_show_lldp_neighbors.textfsm @@ -1,4 +1,4 @@ -Value NEIGHBOR (\S+) +Value NEIGHBOR_NAME (\S+) Value LOCAL_INTERFACE (\S+) Value NEIGHBOR_INTERFACE (\S+) @@ -6,5 +6,5 @@ Start ^Port.*TTL -> LLDP LLDP - ^${LOCAL_INTERFACE}\s+${NEIGHBOR}\s+${NEIGHBOR_INTERFACE}\s+.* -> Record + ^${LOCAL_INTERFACE}\s+${NEIGHBOR_NAME}\s+${NEIGHBOR_INTERFACE}\s+.* -> Record diff --git a/ntc_templates/templates/brocade_fastiron_show_lldp_neighbors.textfsm b/ntc_templates/templates/brocade_fastiron_show_lldp_neighbors.textfsm index efd604cf2e..3d802b6a65 100644 --- a/ntc_templates/templates/brocade_fastiron_show_lldp_neighbors.textfsm +++ b/ntc_templates/templates/brocade_fastiron_show_lldp_neighbors.textfsm @@ -1,4 +1,4 @@ -Value Required NEIGHBOR (\S+) +Value Required NEIGHBOR_NAME (\S+) Value Required LOCAL_INTERFACE (\S+) Value Required HOLD_TIME (\d+) Value Required CAPABILITIES (\S+) @@ -8,7 +8,7 @@ Start ^Capability.* ^\s+\(.* ^Device\s+ID\s+Local\s+Intf\s+Hold-time\s+Capability\s+Port\s+ID\s*$$ - ^${NEIGHBOR}\s+${LOCAL_INTERFACE}\s+${HOLD_TIME}\s+${CAPABILITIES}\s+${NEIGHBOR_INTERFACE} -> Record + ^${NEIGHBOR_NAME}\s+${LOCAL_INTERFACE}\s+${HOLD_TIME}\s+${CAPABILITIES}\s+${NEIGHBOR_INTERFACE} -> Record ^Total.* ^\s*$$ ^. -> Error diff --git a/ntc_templates/templates/cisco_ios_show_cdp_neighbors.textfsm b/ntc_templates/templates/cisco_ios_show_cdp_neighbors.textfsm index 78616b6aa5..aca097d787 100644 --- a/ntc_templates/templates/cisco_ios_show_cdp_neighbors.textfsm +++ b/ntc_templates/templates/cisco_ios_show_cdp_neighbors.textfsm @@ -1,4 +1,4 @@ -Value Required NEIGHBOR (\S+) +Value Required NEIGHBOR_NAME (\S+) Value LOCAL_INTERFACE (\S+(?:\s\S+)?) Value CAPABILITIES ((?:\w\s)*\w) Value PLATFORM ((?:[IiPp]{2}\s)?\S+) @@ -11,6 +11,6 @@ Start ^Time\s+source\s+is CDP - ^${NEIGHBOR}$$ + ^${NEIGHBOR_NAME}$$ ^\s*${LOCAL_INTERFACE}\s+\d+\s+${CAPABILITIES}\s+${PLATFORM}\s+${NEIGHBOR_INTERFACE}\s*$$ -> Record - ^${NEIGHBOR}\s+${LOCAL_INTERFACE}\s+\d+\s+${CAPABILITIES}\s+${PLATFORM}\s+${NEIGHBOR_INTERFACE}\s*$$ -> Record + ^${NEIGHBOR_NAME}\s+${LOCAL_INTERFACE}\s+\d+\s+${CAPABILITIES}\s+${PLATFORM}\s+${NEIGHBOR_INTERFACE}\s*$$ -> Record diff --git a/ntc_templates/templates/cisco_ios_show_lldp_neighbors.textfsm b/ntc_templates/templates/cisco_ios_show_lldp_neighbors.textfsm index f2b8010053..d1c7910a53 100644 --- a/ntc_templates/templates/cisco_ios_show_lldp_neighbors.textfsm +++ b/ntc_templates/templates/cisco_ios_show_lldp_neighbors.textfsm @@ -1,4 +1,4 @@ -Value Required NEIGHBOR (.{0,20}(? Record - ^${NEIGHBOR} + ^${NEIGHBOR_NAME}\s*${LOCAL_INTERFACE}\s+\d+\s+${CAPABILITIES}\s+${NEIGHBOR_INTERFACE} -> Record + ^${NEIGHBOR_NAME} ^\s+${LOCAL_INTERFACE}\s+\d+\s+${CAPABILITIES}\s+${NEIGHBOR_INTERFACE} -> Record diff --git a/ntc_templates/templates/cisco_ios_show_lldp_neighbors_detail.textfsm b/ntc_templates/templates/cisco_ios_show_lldp_neighbors_detail.textfsm index 730bdcd957..dfa2ce8bf6 100644 --- a/ntc_templates/templates/cisco_ios_show_lldp_neighbors_detail.textfsm +++ b/ntc_templates/templates/cisco_ios_show_lldp_neighbors_detail.textfsm @@ -2,7 +2,7 @@ Value LOCAL_INTERFACE (\S+) Value CHASSIS_ID ([^:]+) Value NEIGHBOR_PORT_ID (.*) Value NEIGHBOR_INTERFACE (.*) -Value NEIGHBOR (.+?) +Value NEIGHBOR_NAME (.+?) Value SYSTEM_DESCRIPTION (.*) Value CAPABILITIES (.*) Value MANAGEMENT_IP (\S+) @@ -31,7 +31,7 @@ Start ^Port\s+Description:\s+${NEIGHBOR_INTERFACE}\s*$$ ^System\s+Name(\s+-\s+not\s+advertised)\s*$$ ^System\s+Name:?\s*$$ - ^System\s+Name(:\s+${NEIGHBOR})\s*$$ + ^System\s+Name(:\s+${NEIGHBOR_NAME})\s*$$ ^System\s+Description -> GetDescription ^Time ^System\s+Capabilities diff --git a/ntc_templates/templates/cisco_nxos_show_cdp_neighbors.textfsm b/ntc_templates/templates/cisco_nxos_show_cdp_neighbors.textfsm index d1943e8ddb..2ce7341397 100644 --- a/ntc_templates/templates/cisco_nxos_show_cdp_neighbors.textfsm +++ b/ntc_templates/templates/cisco_nxos_show_cdp_neighbors.textfsm @@ -1,4 +1,4 @@ -Value Required,Filldown NEIGHBOR (\S+) +Value Required,Filldown NEIGHBOR_NAME (\S+) Value Required LOCAL_INTERFACE (\S+) Value HOLDTIME (\d+) Value CAPABILITIES ([\S+\s+]+?) @@ -9,8 +9,8 @@ Start ^Device.*ID -> CDP CDP - ^${NEIGHBOR}\s+${LOCAL_INTERFACE}\s+${HOLDTIME}\s+${CAPABILITIES}\s+${PLATFORM}\s+${NEIGHBOR_INTERFACE}\s*$$ -> Record - ^${NEIGHBOR}\s*$$ + ^${NEIGHBOR_NAME}\s+${LOCAL_INTERFACE}\s+${HOLDTIME}\s+${CAPABILITIES}\s+${PLATFORM}\s+${NEIGHBOR_INTERFACE}\s*$$ -> Record + ^${NEIGHBOR_NAME}\s*$$ ^\s+${LOCAL_INTERFACE}\s+${HOLDTIME}\s+${CAPABILITIES}\s+${PLATFORM}\s+${NEIGHBOR_INTERFACE}\s*$$ -> Record diff --git a/ntc_templates/templates/cisco_nxos_show_lldp_neighbors.textfsm b/ntc_templates/templates/cisco_nxos_show_lldp_neighbors.textfsm index 679175d93b..83fdf3987d 100644 --- a/ntc_templates/templates/cisco_nxos_show_lldp_neighbors.textfsm +++ b/ntc_templates/templates/cisco_nxos_show_lldp_neighbors.textfsm @@ -1,4 +1,4 @@ -Value NEIGHBOR (\S+) +Value NEIGHBOR_NAME (\S+) Value LOCAL_INTERFACE (\S+) Value NEIGHBOR_INTERFACE (\S+) Value CAPABILITIES (\w+) @@ -7,6 +7,6 @@ Start ^Device.*ID -> LLDP LLDP - ^${NEIGHBOR}\s+${LOCAL_INTERFACE}\s+\d+\s+(${CAPABILITIES}?\s+)?${NEIGHBOR_INTERFACE} -> Record - ^${NEIGHBOR}\s*$$ - ^\s+${LOCAL_INTERFACE}\s+\d+\s+(${CAPABILITIES}?\s+)?${NEIGHBOR_INTERFACE} -> Record + ^${NEIGHBOR_NAME}$$ + ^${NEIGHBOR_NAME}\s+${LOCAL_INTERFACE}\s+\d+\s+(${CAPABILITIES}?\s)+\s+${NEIGHBOR_INTERFACE} -> Record + ^\s+${LOCAL_INTERFACE}\s+\d+\s+(${CAPABILITIES}?\s)+\s+${NEIGHBOR_INTERFACE} -> Record diff --git a/ntc_templates/templates/cisco_nxos_show_lldp_neighbors_detail.textfsm b/ntc_templates/templates/cisco_nxos_show_lldp_neighbors_detail.textfsm index 05d086b9f5..6f1f58b07c 100644 --- a/ntc_templates/templates/cisco_nxos_show_lldp_neighbors_detail.textfsm +++ b/ntc_templates/templates/cisco_nxos_show_lldp_neighbors_detail.textfsm @@ -1,4 +1,4 @@ -Value Required NEIGHBOR (\S+) +Value Required NEIGHBOR_NAME (\S+) Value Required LOCAL_INTERFACE (\S+) Value Required NEIGHBOR_INTERFACE (\S+) Value CHASSIS_ID (\w+?\.\w+?\.\w+?) @@ -12,7 +12,7 @@ Start ^[Cc]hassis\s[idID]{2}\:\s${CHASSIS_ID}$$ ^[Pp]ort\s[idID]{2}\:\s${NEIGHBOR_INTERFACE}$$ ^[Ll]ocal\s[Pp]ort\s[idID]{2}\:\s${LOCAL_INTERFACE}$$ - ^[Ss]ystem\s[Nn]ame\:\s${NEIGHBOR}$$ + ^[Ss]ystem\s[Nn]ame\:\s${NEIGHBOR_NAME}$$ ^[Ss]ystem\s[Dd]escription\:\s${SYSTEM_DESCRIPTION}$$ ^[Ee]nabled\s[Cc]apabilities\:\s${CAPABILITIES}$$ ^[Mm]anagement\s[Aa]ddress\:\s${MGMT_ADDRESS}$$ diff --git a/ntc_templates/templates/cisco_s300_show_lldp_neighbors.textfsm b/ntc_templates/templates/cisco_s300_show_lldp_neighbors.textfsm index 7f6eafc92d..61ee90770f 100644 --- a/ntc_templates/templates/cisco_s300_show_lldp_neighbors.textfsm +++ b/ntc_templates/templates/cisco_s300_show_lldp_neighbors.textfsm @@ -1,4 +1,4 @@ -Value NEIGHBOR (\S+) +Value NEIGHBOR_NAME (\S+) Value LOCAL_INTERFACE (\S+) Value NEIGHBOR_INTERFACE (\S+) Value CHASSIS_ID (([0-9a-f]{2}[:-]){5}([0-9a-f]{2})) @@ -12,6 +12,6 @@ Start Begin ^-+ - ^${LOCAL_INTERFACE}\s+${CHASSIS_ID}\s+${NEIGHBOR_INTERFACE}\s+${NEIGHBOR}.+ -> Record + ^${LOCAL_INTERFACE}\s+${CHASSIS_ID}\s+${NEIGHBOR_INTERFACE}\s+${NEIGHBOR_NAME}.+ -> Record ^\s*$$ ^. -> Error diff --git a/ntc_templates/templates/cisco_xr_show_lldp_neighbors.textfsm b/ntc_templates/templates/cisco_xr_show_lldp_neighbors.textfsm index c480c1b206..6e0a5bb750 100644 --- a/ntc_templates/templates/cisco_xr_show_lldp_neighbors.textfsm +++ b/ntc_templates/templates/cisco_xr_show_lldp_neighbors.textfsm @@ -1,4 +1,4 @@ -Value Required NEIGHBOR (\S+) +Value Required NEIGHBOR_NAME (\S+) Value Required LOCAL_INTERFACE (\S+) Value Required NEIGHBOR_INTERFACE (\S+) @@ -6,8 +6,8 @@ Start ^Device.*ID -> LLDP LLDP - ^${NEIGHBOR}\s+${LOCAL_INTERFACE}\s+\d+\s+(.+?)\s+${NEIGHBOR_INTERFACE}$$ -> Record - ^${NEIGHBOR} + ^${NEIGHBOR_NAME}\s+${LOCAL_INTERFACE}\s+\d+\s+(.+?)\s+${NEIGHBOR_INTERFACE}$$ -> Record + ^${NEIGHBOR_NAME} ^\s+${LOCAL_INTERFACE}\s+\d+\s+(.*?)\s+${NEIGHBOR_INTERFACE} -> Record ^Total entries ^\s+$$ diff --git a/ntc_templates/templates/hp_comware_display_lldp_neighbor-information_list.textfsm b/ntc_templates/templates/hp_comware_display_lldp_neighbor-information_list.textfsm index 5d5f280818..e16343caee 100644 --- a/ntc_templates/templates/hp_comware_display_lldp_neighbor-information_list.textfsm +++ b/ntc_templates/templates/hp_comware_display_lldp_neighbor-information_list.textfsm @@ -1,7 +1,7 @@ Value Required LOCAL_INTERFACE (\S+) Value Required CHASSIS_ID (\S+) Value Required NEIGHBOR_INTERFACE ((\S+)|(Port\s\d+)) -Value Required NEIGHBOR (\S+) +Value Required NEIGHBOR_NAME (\S+) Start ^.*Nearest\s+nontpmr\s+bridge\s+neighbor @@ -12,11 +12,11 @@ Start ^. -> Error Format1 - ^\s*${NEIGHBOR}\s+${LOCAL_INTERFACE}\s+${CHASSIS_ID}\s+${NEIGHBOR_INTERFACE}\s*$$ -> Record Format1 + ^\s*${NEIGHBOR_NAME}\s+${LOCAL_INTERFACE}\s+${CHASSIS_ID}\s+${NEIGHBOR_INTERFACE}\s*$$ -> Record Format1 # Dropping long hostnames ^\s*\S+\s*$$ ^. -> Error Format2 - ^\s*${LOCAL_INTERFACE}\s+${CHASSIS_ID}\s+${NEIGHBOR_INTERFACE}\s+${NEIGHBOR}\s*$$ -> Record Format2 + ^\s*${LOCAL_INTERFACE}\s+${CHASSIS_ID}\s+${NEIGHBOR_INTERFACE}\s+${NEIGHBOR_NAME}\s*$$ -> Record Format2 ^. -> Error diff --git a/ntc_templates/templates/hp_comware_display_lldp_neighbor-information_verbose.textfsm b/ntc_templates/templates/hp_comware_display_lldp_neighbor-information_verbose.textfsm index 436d8c6320..43e3c7f8fe 100644 --- a/ntc_templates/templates/hp_comware_display_lldp_neighbor-information_verbose.textfsm +++ b/ntc_templates/templates/hp_comware_display_lldp_neighbor-information_verbose.textfsm @@ -2,7 +2,7 @@ Value Required LOCAL_INTERFACE (\S+) Value CHASSIS_ID (\S+) Value NEIGHBOR_INTERFACE (.*) Value NEIGHBOR_INTERFACE_DESCRIPTION (.*) -Value NEIGHBOR (\S+) +Value NEIGHBOR_NAME (\S+) Value MANAGEMENT_IP (\S+) Value VLAN_ID (\d+) @@ -18,7 +18,7 @@ Start ^\s+Port\s+ID\s+:\s+${NEIGHBOR_INTERFACE} ^\s+Time\s+to\s+live\d+:.* ^\s+Port\s+description\s+:\s+${NEIGHBOR_INTERFACE_DESCRIPTION} - ^\s+System\s+name\s+:\s+${NEIGHBOR} + ^\s+System\s+name\s+:\s+${NEIGHBOR_NAME} ^\s+Management\s+address\s+:\s+${MANAGEMENT_IP} ^\s+Management\s+address\s+interface\s+type ^\s+Management\s+address\s+interface\s+ID diff --git a/ntc_templates/templates/huawei_vrp_display_lldp_neighbor.textfsm b/ntc_templates/templates/huawei_vrp_display_lldp_neighbor.textfsm index ee91906e92..f8c210c1c7 100644 --- a/ntc_templates/templates/huawei_vrp_display_lldp_neighbor.textfsm +++ b/ntc_templates/templates/huawei_vrp_display_lldp_neighbor.textfsm @@ -4,7 +4,7 @@ Value MANUFACTURER_NAME (.*?) Value MODEL_NAME (.*?) Value NEIGHBOR_PORT_ID (.*?) Value NEIGHBOR_INTERFACE (.*?) -Value NEIGHBOR (.+?) +Value NEIGHBOR_NAME (.+?) Value List SYSTEM_DESCRIPTION (.*) Value CAPABILITIES (.*?) Value MANAGEMENT_IP (\S+) @@ -20,7 +20,7 @@ Start ^Port\s+ID\s+type ^Port\s+ID\s+:${NEIGHBOR_PORT_ID}\s*$$ ^Port\s+description\s+:${NEIGHBOR_INTERFACE}\s*$$ - ^System\s+name\s+:${NEIGHBOR}\s*$$ + ^System\s+name\s+:${NEIGHBOR_NAME}\s*$$ ^System\s+description\s+:${SYSTEM_DESCRIPTION} -> SystemDescription ^System\s+capabilities\s+supported ^System\s+capabilities\s+enabled\s+:${CAPABILITIES}\s*$$ diff --git a/ntc_templates/templates/ipinfusion_ocnos_show_lldp_table.textfsm b/ntc_templates/templates/ipinfusion_ocnos_show_lldp_table.textfsm index 70bc878c41..f39a22d3f9 100644 --- a/ntc_templates/templates/ipinfusion_ocnos_show_lldp_table.textfsm +++ b/ntc_templates/templates/ipinfusion_ocnos_show_lldp_table.textfsm @@ -1,5 +1,5 @@ Value LOCAL_INTERFACE (\S+) -Value NEIGHBOR (\S+) +Value NEIGHBOR_NAME (\S+) Value NEIGHBOR_INTERFACE (\S+) Value CAPABILITIES (R|B|O|RO|RB|BR|BO|OR|OB|RBO|ROB|BRO|BOR|ORB|OBR) Value NEIGHBOR_INTERFACE_DESCRIPTION (\S+) @@ -11,7 +11,7 @@ Start ^. -> Error Row - ^${LOCAL_INTERFACE}\s+${NEIGHBOR}\s+${NEIGHBOR_INTERFACE}\s+${CAPABILITIES}\s+${NEIGHBOR_INTERFACE_DESCRIPTION} -> Record + ^${LOCAL_INTERFACE}\s+${NEIGHBOR_NAME}\s+${NEIGHBOR_INTERFACE}\s+${CAPABILITIES}\s+${NEIGHBOR_INTERFACE_DESCRIPTION} -> Record ^-+ ^[\w+\s+]*:\s+\d+ ^. -> Error diff --git a/tests/arista_eos/show_lldp_neighbors/arista_eos_show_lldp_neighbors.yml b/tests/arista_eos/show_lldp_neighbors/arista_eos_show_lldp_neighbors.yml index ba622c830f..7ebab9e261 100644 --- a/tests/arista_eos/show_lldp_neighbors/arista_eos_show_lldp_neighbors.yml +++ b/tests/arista_eos/show_lldp_neighbors/arista_eos_show_lldp_neighbors.yml @@ -1,14 +1,14 @@ --- parsed_sample: - - neighbor: "localhost" - local_interface: "Et1" + - local_interface: "Et1" neighbor_interface: "Ethernet1" - - neighbor: "localhost" - local_interface: "Et2" + neighbor_name: "localhost" + - local_interface: "Et2" neighbor_interface: "Ethernet2" - - neighbor: "tg104.sjc.aristanetworks.com" - local_interface: "Et3/1" + neighbor_name: "localhost" + - local_interface: "Et3/1" neighbor_interface: "Ethernet3/2" - - neighbor: "dc1-rack11-tor1.sjc" - local_interface: "Ma1/1" + neighbor_name: "tg104.sjc.aristanetworks.com" + - local_interface: "Ma1/1" neighbor_interface: "1/1" + neighbor_name: "dc1-rack11-tor1.sjc" diff --git a/tests/brocade_fastiron/show_lldp_neighbors/brocade_fastiron_show_lldp_neighbors.yml b/tests/brocade_fastiron/show_lldp_neighbors/brocade_fastiron_show_lldp_neighbors.yml index 0c8a143543..7e2c44a834 100644 --- a/tests/brocade_fastiron/show_lldp_neighbors/brocade_fastiron_show_lldp_neighbors.yml +++ b/tests/brocade_fastiron/show_lldp_neighbors/brocade_fastiron_show_lldp_neighbors.yml @@ -1,7 +1,7 @@ --- parsed_sample: - - neighbor: "core-sw01" - local_interface: "Gi1/3" + - capabilities: "B,R" hold_time: "120" - capabilities: "B,R" + local_interface: "Gi1/3" neighbor_interface: "Gi0/3" + neighbor_name: "core-sw01" diff --git a/tests/cisco_ios/show_cdp_neighbors/cisco_ios_show_cdp_neighbors.yml b/tests/cisco_ios/show_cdp_neighbors/cisco_ios_show_cdp_neighbors.yml index 930cecc984..65853bb1cd 100644 --- a/tests/cisco_ios/show_cdp_neighbors/cisco_ios_show_cdp_neighbors.yml +++ b/tests/cisco_ios/show_cdp_neighbors/cisco_ios_show_cdp_neighbors.yml @@ -2,31 +2,31 @@ parsed_sample: - capabilities: "R S I" local_interface: "Gig 1/0/10" - neighbor: "R1-PBX" neighbor_interface: "Fas 0/0" + neighbor_name: "R1-PBX" platform: "2811" - capabilities: "R" local_interface: "Gig 1/0/39" - neighbor: "TS-1" neighbor_interface: "Eth 0/1" + neighbor_name: "TS-1" platform: "2611" - capabilities: "T I" local_interface: "Gig 1/0/1" - neighbor: "Cisco-WAP-N" neighbor_interface: "Gig 0" + neighbor_name: "Cisco-WAP-N" platform: "AIR-AP125" - capabilities: "H P" local_interface: "Gig 1/0/2" - neighbor: "SEP04FE7F689D33" neighbor_interface: "Port 1" + neighbor_name: "SEP04FE7F689D33" platform: "IP Phone" - capabilities: "H P" local_interface: "Gig 1/0/4" - neighbor: "SEP000DBC50FCD1" neighbor_interface: "Port 1" + neighbor_name: "SEP000DBC50FCD1" platform: "IP Phone" - capabilities: "H P" local_interface: "Gig 1/0/42" - neighbor: "SEP00124362C4D2" neighbor_interface: "Port 1" + neighbor_name: "SEP00124362C4D2" platform: "IP Phone" diff --git a/tests/cisco_ios/show_cdp_neighbors/cisco_ios_show_cdp_neighbors_2.yml b/tests/cisco_ios/show_cdp_neighbors/cisco_ios_show_cdp_neighbors_2.yml index af7baee33f..0d73bc5f82 100644 --- a/tests/cisco_ios/show_cdp_neighbors/cisco_ios_show_cdp_neighbors_2.yml +++ b/tests/cisco_ios/show_cdp_neighbors/cisco_ios_show_cdp_neighbors_2.yml @@ -2,56 +2,56 @@ parsed_sample: - capabilities: "R I" local_interface: "Ten 1/1/3" - neighbor: "asr1002-2.some.example.com" neighbor_interface: "Ten 0/1/0" + neighbor_name: "asr1002-2.some.example.com" platform: "ASR1002-H" - capabilities: "H" local_interface: "Ten 1/0/6" - neighbor: "vWAAS3b" neighbor_interface: "Virtual 2/0" + neighbor_name: "vWAAS3b" platform: "OE-VWAAS" - capabilities: "H" local_interface: "Ten 1/0/6" - neighbor: "vWAAS3b" neighbor_interface: "Virtual 1/0" + neighbor_name: "vWAAS3b" platform: "OE-VWAAS" - capabilities: "H" local_interface: "Ten 1/0/7" - neighbor: "vWAAS4b" neighbor_interface: "Virtual 2/0" + neighbor_name: "vWAAS4b" platform: "OE-VWAAS" - capabilities: "H" local_interface: "Ten 1/0/7" - neighbor: "vWAAS4b" neighbor_interface: "Virtual 1/0" + neighbor_name: "vWAAS4b" platform: "OE-VWAAS" - capabilities: "S I" local_interface: "Gig 0/0" - neighbor: "NEXTGENLABSWT01.some.example.com" neighbor_interface: "Gig 0/23" + neighbor_name: "NEXTGENLABSWT01.some.example.com" platform: "WS-C3560X" - capabilities: "R B S I" local_interface: "Ten 1/0/4" - neighbor: "router01.some.example.com" neighbor_interface: "Gig 0/0" + neighbor_name: "router01.some.example.com" platform: "CISCO2911" - capabilities: "R S I" local_interface: "Ten 1/1/6" - neighbor: "9300mgig-1.some.example.com" neighbor_interface: "Ten 1/1/7" + neighbor_name: "9300mgig-1.some.example.com" platform: "C9300-24U" - capabilities: "R S I" local_interface: "Ten 1/1/7" - neighbor: "9300mgig-1.some.example.com" neighbor_interface: "Ten 1/1/6" + neighbor_name: "9300mgig-1.some.example.com" platform: "C9300-24U" - capabilities: "R S I" local_interface: "Ten 1/1/8" - neighbor: "9500-1.some.example.com" neighbor_interface: "Ten 2/0/36" + neighbor_name: "9500-1.some.example.com" platform: "C9500-40X" - capabilities: "R S I" local_interface: "Ten 1/1/1" - neighbor: "9300mgig-2.some.example.com" neighbor_interface: "Ten 1/1/2" + neighbor_name: "9300mgig-2.some.example.com" platform: "C9300-24U" diff --git a/tests/cisco_ios/show_cdp_neighbors/cisco_ios_show_cdp_neighbors_3.yml b/tests/cisco_ios/show_cdp_neighbors/cisco_ios_show_cdp_neighbors_3.yml index c6fd760efe..169d359066 100644 --- a/tests/cisco_ios/show_cdp_neighbors/cisco_ios_show_cdp_neighbors_3.yml +++ b/tests/cisco_ios/show_cdp_neighbors/cisco_ios_show_cdp_neighbors_3.yml @@ -2,111 +2,111 @@ parsed_sample: - capabilities: "H P" local_interface: "Gig 1/0/16" - neighbor: "SEP000000000000" neighbor_interface: "port 1" + neighbor_name: "SEP000000000000" platform: "IP Phone" - capabilities: "T B I" local_interface: "Gig 1/0/45" - neighbor: "AP000000000" neighbor_interface: "Gig 0" + neighbor_name: "AP000000000" platform: "AIR-CAP35" - capabilities: "T B I" local_interface: "Gig 1/0/46" - neighbor: "AP000000001" neighbor_interface: "Gig 0" + neighbor_name: "AP000000001" platform: "AIR-CAP35" - capabilities: "T" local_interface: "Gig 1/0/1" - neighbor: "WAAS0000000" neighbor_interface: "InlinePort 1/1/lan" + neighbor_name: "WAAS0000000" platform: "OE474" - capabilities: "H" local_interface: "Gig 1/0/40" - neighbor: "WAAS0000000" neighbor_interface: "Gig 1/0" + neighbor_name: "WAAS0000000" platform: "OE474" - capabilities: "R B S" local_interface: "Gig 1/0/1" - neighbor: "router.domain.local" neighbor_interface: "Gig 0/0" + neighbor_name: "router.domain.local" platform: "CISCO2911" - capabilities: "H P M" local_interface: "Gig 1/0/33" - neighbor: "SEP000000000001" neighbor_interface: "Port 1" + neighbor_name: "SEP000000000001" platform: "IP Phone" - capabilities: "H P M" local_interface: "Gig 1/0/29" - neighbor: "SEP000000000002" neighbor_interface: "Port 1" + neighbor_name: "SEP000000000002" platform: "IP Phone" - capabilities: "H P M" local_interface: "Gig 1/0/30" - neighbor: "SEP000000000003" neighbor_interface: "Port 1" + neighbor_name: "SEP000000000003" platform: "IP Phone" - capabilities: "H P M" local_interface: "Gig 1/0/14" - neighbor: "SEP000000000004" neighbor_interface: "Port 1" + neighbor_name: "SEP000000000004" platform: "IP Phone" - capabilities: "H P M" local_interface: "Gig 1/0/8" - neighbor: "SEP000000000005" neighbor_interface: "Port 1" + neighbor_name: "SEP000000000005" platform: "IP Phone" - capabilities: "H P M" local_interface: "Gig 1/0/13" - neighbor: "SEP000000000006" neighbor_interface: "Port 1" + neighbor_name: "SEP000000000006" platform: "IP Phone" - capabilities: "H P" local_interface: "Gig 1/0/15" - neighbor: "SEP000000000007" neighbor_interface: "eth0" + neighbor_name: "SEP000000000007" platform: "CTS-CODEC" - capabilities: "H P M" local_interface: "Gig 1/0/37" - neighbor: "SEP000000000008" neighbor_interface: "Port 1" + neighbor_name: "SEP000000000008" platform: "IP Phone" - capabilities: "H P M" local_interface: "Gig 1/0/34" - neighbor: "SEP000000000009" neighbor_interface: "Port 1" + neighbor_name: "SEP000000000009" platform: "IP Phone" - capabilities: "H P" local_interface: "Gig 1/0/21" - neighbor: "SEP00000000000A" neighbor_interface: "eth0" + neighbor_name: "SEP00000000000A" platform: "CTS-CODEC" - capabilities: "H P M" local_interface: "Gig 1/0/35" - neighbor: "SEP00000000000B" neighbor_interface: "Port 1" + neighbor_name: "SEP00000000000B" platform: "IP Phone" - capabilities: "H P M" local_interface: "Gig 1/0/24" - neighbor: "SEP00000000000C" neighbor_interface: "Port 1" + neighbor_name: "SEP00000000000C" platform: "IP Phone" - capabilities: "H P M" local_interface: "Gig 1/0/9" - neighbor: "SEP00000000000D" neighbor_interface: "Port 1" + neighbor_name: "SEP00000000000D" platform: "IP Phone" - capabilities: "H P M" local_interface: "Gig 1/0/17" - neighbor: "SEP00000000000E" neighbor_interface: "Port 1" + neighbor_name: "SEP00000000000E" platform: "IP Phone" - capabilities: "H P M" local_interface: "Gig 1/0/20" - neighbor: "SEP00000000000F" neighbor_interface: "Port 1" + neighbor_name: "SEP00000000000F" platform: "IP Phone" - capabilities: "H P M" local_interface: "Gig 1/0/36" - neighbor: "SEP000000000010" neighbor_interface: "Port 1" + neighbor_name: "SEP000000000010" platform: "IP Phone" diff --git a/tests/cisco_ios/show_cdp_neighbors/cisco_ios_show_cdp_neighbors_4.yml b/tests/cisco_ios/show_cdp_neighbors/cisco_ios_show_cdp_neighbors_4.yml index c038b8571f..105657bdcb 100644 --- a/tests/cisco_ios/show_cdp_neighbors/cisco_ios_show_cdp_neighbors_4.yml +++ b/tests/cisco_ios/show_cdp_neighbors/cisco_ios_show_cdp_neighbors_4.yml @@ -2,6 +2,6 @@ parsed_sample: - capabilities: "R" local_interface: "Ten 3/7" - neighbor: "acc-sw101" neighbor_interface: "0/47" + neighbor_name: "acc-sw101" platform: "AS5610-52" diff --git a/tests/cisco_ios/show_lldp_neighbors/cisco_ios_show_lldp_neighbors.yml b/tests/cisco_ios/show_lldp_neighbors/cisco_ios_show_lldp_neighbors.yml index 92179081dd..90009ed973 100644 --- a/tests/cisco_ios/show_lldp_neighbors/cisco_ios_show_lldp_neighbors.yml +++ b/tests/cisco_ios/show_lldp_neighbors/cisco_ios_show_lldp_neighbors.yml @@ -2,21 +2,21 @@ parsed_sample: - capabilities: "B" local_interface: "Fa0/13" - neighbor: "S2" neighbor_interface: "Gi0/13" + neighbor_name: "S2" - capabilities: "" local_interface: "Gi1/0/7" - neighbor: "Cisco-switch-1" neighbor_interface: "Gi0/1" + neighbor_name: "Cisco-switch-1" - capabilities: "B,R" local_interface: "Gi2/0/1" - neighbor: "Juniper-switch1" neighbor_interface: "666" + neighbor_name: "Juniper-switch1" - capabilities: "B,R" local_interface: "Gi1/0/1" - neighbor: "Juniper-switch1" neighbor_interface: "531" + neighbor_name: "Juniper-switch1" - capabilities: "T" local_interface: "Gi1/0/2" - neighbor: "Polycom VVX 500" neighbor_interface: "0004.f2d1.2222" + neighbor_name: "Polycom VVX 500" diff --git a/tests/cisco_ios/show_lldp_neighbors/cisco_ios_show_lldp_neighbors2.yml b/tests/cisco_ios/show_lldp_neighbors/cisco_ios_show_lldp_neighbors2.yml index 40e76026e1..c59e5e9a18 100644 --- a/tests/cisco_ios/show_lldp_neighbors/cisco_ios_show_lldp_neighbors2.yml +++ b/tests/cisco_ios/show_lldp_neighbors/cisco_ios_show_lldp_neighbors2.yml @@ -1,6 +1,6 @@ --- parsed_sample: - - neighbor: "long_name_swt.josh-v" + - capabilities: "R" local_interface: "Gi0/2" - capabilities: "R" neighbor_interface: "Gi0/0" + neighbor_name: "long_name_swt.josh-v" diff --git a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail1.yml b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail1.yml index f509e5a50d..2e830d7d23 100644 --- a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail1.yml +++ b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail1.yml @@ -9,8 +9,8 @@ parsed_sample: management_ip: "" manufacturer: "" model: "" - neighbor: "" neighbor_interface: "ge-0/0/0.0" + neighbor_name: "" neighbor_port_id: "502" power_class: "" power_device_type: "" @@ -32,8 +32,8 @@ parsed_sample: management_ip: "192.168.1.81" manufacturer: "" model: "" - neighbor: "HpSwitch" neighbor_interface: "13" + neighbor_name: "HpSwitch" neighbor_port_id: "94f1.2879.5555" power_class: "" power_device_type: "" @@ -55,8 +55,8 @@ parsed_sample: management_ip: "192.168.1.40" manufacturer: "" model: "" - neighbor: "44:48:c1:c4:dd:dd" neighbor_interface: "eth0" + neighbor_name: "44:48:c1:c4:dd:dd" neighbor_port_id: "4448.c1c4.dddd" power_class: "" power_device_type: "" diff --git a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail2.yml b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail2.yml index ebec7ae74b..7137b3d4fc 100644 --- a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail2.yml +++ b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail2.yml @@ -9,8 +9,8 @@ parsed_sample: management_ip: "11.11.11.11" manufacturer: "" model: "" - neighbor: "USSC-CAMPUS-CORE-GW2" neighbor_interface: "PO2631-10Gx2-R261R5" + neighbor_name: "USSC-CAMPUS-CORE-GW2" neighbor_port_id: "Eth1/6" power_class: "" power_device_type: "" @@ -33,8 +33,8 @@ parsed_sample: management_ip: "33.33.33.3" manufacturer: "" model: "" - neighbor: "USSC-CAMPUS-CORE-GW1.acme123.com" neighbor_interface: "PO2631-10Gx2-R261R5" + neighbor_name: "USSC-CAMPUS-CORE-GW1.acme123.com" neighbor_port_id: "Eth1/6" power_class: "" power_device_type: "" @@ -57,8 +57,8 @@ parsed_sample: management_ip: "55.55.55.55" manufacturer: "" model: "" - neighbor: "DMZ-SW1" neighbor_interface: "GigabitEthernet2/0/24" + neighbor_name: "DMZ-SW1" neighbor_port_id: "Gi2/0/24" power_class: "" power_device_type: "" @@ -80,8 +80,8 @@ parsed_sample: management_ip: "" manufacturer: "" model: "" - neighbor: "" neighbor_interface: "" + neighbor_name: "" neighbor_port_id: "g2" power_class: "" power_device_type: "" diff --git a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail3.yml b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail3.yml index c6c6c2d66c..6e52164521 100644 --- a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail3.yml +++ b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail3.yml @@ -9,8 +9,8 @@ parsed_sample: management_ip: "10.10.0.1" manufacturer: "Cisco Systems, Inc." model: "CP-7962G" - neighbor: "SEPC8F9F9D61BC2" neighbor_interface: "SW PORT" + neighbor_name: "SEPC8F9F9D61BC2" neighbor_port_id: "C8F9F9D61BC2:P1" power_class: "" power_device_type: "" diff --git a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail4.yml b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail4.yml index c590927cff..49d2bc748b 100644 --- a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail4.yml +++ b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail4.yml @@ -9,8 +9,8 @@ parsed_sample: management_ip: "" manufacturer: "ZULTYS" model: "ZIP 33G" - neighbor: "ZULTYS IP Phone" neighbor_interface: "WAN PORT" + neighbor_name: "ZULTYS IP Phone" neighbor_port_id: "000b.ea00.16e0" power_class: "" power_device_type: "" @@ -31,8 +31,8 @@ parsed_sample: management_ip: "172.16.0.10" manufacturer: "" model: "" - neighbor: "dsw01" neighbor_interface: "asw22" + neighbor_name: "dsw01" neighbor_port_id: "Te1/2/13" power_class: "" power_device_type: "" diff --git a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail5.yml b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail5.yml index 11474689b8..e3a10934e5 100644 --- a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail5.yml +++ b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail5.yml @@ -9,8 +9,8 @@ parsed_sample: management_ip: "172.31.176.154" manufacturer: "" model: "" - neighbor: "system1" neighbor_interface: "eth0" + neighbor_name: "system1" neighbor_port_id: "0" power_class: "" power_device_type: "" @@ -31,8 +31,8 @@ parsed_sample: management_ip: "10.132.14.52" manufacturer: "" model: "" - neighbor: "system2" neighbor_interface: "eth0" + neighbor_name: "system2" neighbor_port_id: "0004.7a2a.bbbb" power_class: "4" power_device_type: "2" @@ -53,8 +53,8 @@ parsed_sample: management_ip: "10.132.14.53" manufacturer: "" model: "" - neighbor: "system3" neighbor_interface: "eth0" + neighbor_name: "system3" neighbor_port_id: "0004.7a2a.cccc" power_class: "4" power_device_type: "2" @@ -76,8 +76,8 @@ parsed_sample: management_ip: "10.176.0.245" manufacturer: "" model: "" - neighbor: "" neighbor_interface: "Siemens, SIMATIC S7, Ethernet Port, X1 P1" + neighbor_name: "" neighbor_port_id: "port-001.ploobdfad" power_class: "" power_device_type: "" diff --git a/tests/cisco_nxos/show_cdp_neighbors/cisco_nxos_show_cdp_neighbors.yml b/tests/cisco_nxos/show_cdp_neighbors/cisco_nxos_show_cdp_neighbors.yml index ce63f661b5..6c32a4ce13 100644 --- a/tests/cisco_nxos/show_cdp_neighbors/cisco_nxos_show_cdp_neighbors.yml +++ b/tests/cisco_nxos/show_cdp_neighbors/cisco_nxos_show_cdp_neighbors.yml @@ -3,42 +3,42 @@ parsed_sample: - capabilities: "R S I" holdtime: "179" local_interface: "mgmt0" - neighbor: "PERIMETER" neighbor_interface: "Fas1/0/9" + neighbor_name: "PERIMETER" platform: "WS-C3750-48TS" - capabilities: "R S s" holdtime: "133" local_interface: "Eth1/1" - neighbor: "N9K2_TEST.lab.com(SAL1819S6BE)" neighbor_interface: "Eth1/1" + neighbor_name: "N9K2_TEST.lab.com(SAL1819S6BE)" platform: "N9K-C9396PX" - capabilities: "R S s" holdtime: "154" local_interface: "Eth1/2" - neighbor: "N9K2_TEST.lab.com(SAL1819S6BE)" neighbor_interface: "Eth1/2" + neighbor_name: "N9K2_TEST.lab.com(SAL1819S6BE)" platform: "N9K-C9396PX" - capabilities: "S I" holdtime: "177" local_interface: "mgmt1" - neighbor: "savbu-qa-dist-120" neighbor_interface: "Gig1/0/13" + neighbor_name: "savbu-qa-dist-120" platform: "WS-C3750E-24T" - capabilities: "S I s" holdtime: "165" local_interface: "Eth1/17" - neighbor: "swor96(SSI13110AAQ)" neighbor_interface: "Eth1/19" + neighbor_name: "swor96(SSI13110AAQ)" platform: "N5K-C5010P-BF" - capabilities: "S I S I d" holdtime: "1" local_interface: "mgmt0" - neighbor: "test" neighbor_interface: "Gig1/0/13" + neighbor_name: "test" platform: "WS-C3750E-24T" - capabilities: "S" holdtime: "20" local_interface: "Eth1/10" - neighbor: "new_test" neighbor_interface: "Eth2/1" + neighbor_name: "new_test" platform: "N5k" diff --git a/tests/cisco_nxos/show_cdp_neighbors/cisco_nxos_show_cdp_neighbors2.yml b/tests/cisco_nxos/show_cdp_neighbors/cisco_nxos_show_cdp_neighbors2.yml index 1e66882784..76fc7bef7d 100644 --- a/tests/cisco_nxos/show_cdp_neighbors/cisco_nxos_show_cdp_neighbors2.yml +++ b/tests/cisco_nxos/show_cdp_neighbors/cisco_nxos_show_cdp_neighbors2.yml @@ -3,36 +3,36 @@ parsed_sample: - capabilities: "R S I s" holdtime: "138" local_interface: "mgmt0" - neighbor: "my-dc1-mgt-sw1(FOC213230KP)" neighbor_interface: "Eth1/48" + neighbor_name: "my-dc1-mgt-sw1(FOC213230KP)" platform: "N3K-C3172PQ-XL" - capabilities: "H" holdtime: "109" local_interface: "Eth1/1/1" - neighbor: "lx-dc1-server01.mynetwork.com" neighbor_interface: "eth9" + neighbor_name: "lx-dc1-server01.mynetwork.com" platform: "Linux" - capabilities: "H" holdtime: "106" local_interface: "Eth1/1/2" - neighbor: "lx-dc1-server02.mynetwork.com" neighbor_interface: "eth9" + neighbor_name: "lx-dc1-server02.mynetwork.com" platform: "Linux" - capabilities: "H" holdtime: "91" local_interface: "Eth1/1/3" - neighbor: "lx-dc1-server03.mynetwork.com" neighbor_interface: "eth9" + neighbor_name: "lx-dc1-server03.mynetwork.com" platform: "Linux" - capabilities: "H" holdtime: "112" local_interface: "Eth1/1/4" - neighbor: "lx-dc1-server04.mynetwork.com" neighbor_interface: "eth9" + neighbor_name: "lx-dc1-server04.mynetwork.com" platform: "Linux" - capabilities: "H" holdtime: "100" local_interface: "Eth1/2/1" - neighbor: "lx-dc1-server05.mynetwork.com" neighbor_interface: "eth9" + neighbor_name: "lx-dc1-server05.mynetwork.com" platform: "Linux" diff --git a/tests/cisco_nxos/show_lldp_neighbors/cisco_nxos_show_lldp_neighbors.yml b/tests/cisco_nxos/show_lldp_neighbors/cisco_nxos_show_lldp_neighbors.yml index 9576b8714c..de653447d6 100644 --- a/tests/cisco_nxos/show_lldp_neighbors/cisco_nxos_show_lldp_neighbors.yml +++ b/tests/cisco_nxos/show_lldp_neighbors/cisco_nxos_show_lldp_neighbors.yml @@ -2,13 +2,13 @@ parsed_sample: - capabilities: "BR" local_interface: "Eth1/1" - neighbor: "nx-osv9000-3-long-name.com" neighbor_interface: "Ethernet1/1" + neighbor_name: "nx-osv9000-3-long-name.com" - capabilities: "BR" local_interface: "Eth1/2" - neighbor: "nx-osv9000-4-extremely-long-name" neighbor_interface: "Ethernet1/1" + neighbor_name: "nx-osv9000-4-extremely-long-name" - capabilities: "BR" local_interface: "Eth1/3" - neighbor: "nx-osv9000-2" neighbor_interface: "Ethernet1/3" + neighbor_name: "nx-osv9000-2" diff --git a/tests/cisco_nxos/show_lldp_neighbors/cisco_nxos_show_lldp_neighbors_multiline.yml b/tests/cisco_nxos/show_lldp_neighbors/cisco_nxos_show_lldp_neighbors_multiline.yml index e98c3a72fc..e5fe8e6c09 100644 --- a/tests/cisco_nxos/show_lldp_neighbors/cisco_nxos_show_lldp_neighbors_multiline.yml +++ b/tests/cisco_nxos/show_lldp_neighbors/cisco_nxos_show_lldp_neighbors_multiline.yml @@ -2,61 +2,61 @@ parsed_sample: - capabilities: "B" local_interface: "mgmt0" - neighbor: "dcx3.org.local" neighbor_interface: "Gi1/0/37" + neighbor_name: "dcx3.org.local" - capabilities: "BR" local_interface: "Eth1/1" - neighbor: "r2-services" neighbor_interface: "Eth1/1" + neighbor_name: "r2-services" - capabilities: "B" local_interface: "Eth1/3" - neighbor: "dx1.org.local" neighbor_interface: "Te1/1/1" + neighbor_name: "dx1.org.local" - capabilities: "" local_interface: "Eth1/5" - neighbor: "fw1-clinical-partner" neighbor_interface: "ethernet1/9" + neighbor_name: "" - capabilities: "" local_interface: "Eth1/6" - neighbor: "fw1-clinical-partner" neighbor_interface: "ethernet1/10" + neighbor_name: "" - capabilities: "" local_interface: "Eth1/7" - neighbor: "fw2-clinical-partner" neighbor_interface: "ethernet1/9" + neighbor_name: "" - capabilities: "" local_interface: "Eth1/8" - neighbor: "fw2-clinical-partner" neighbor_interface: "ethernet1/10" + neighbor_name: "" - capabilities: "BR" local_interface: "Eth3/1" - neighbor: "cr-ebc.org.local" neighbor_interface: "Fo1/0/8" + neighbor_name: "cr-ebc.org.local" - capabilities: "BR" local_interface: "Eth3/13" - neighbor: "r2-services" neighbor_interface: "Eth3/13" + neighbor_name: "r2-services" - capabilities: "" local_interface: "Eth3/23" - neighbor: "fw1-services" neighbor_interface: "ethernet1/21" + neighbor_name: "fw1-services" - capabilities: "" local_interface: "Eth3/24" - neighbor: "fw2-services" neighbor_interface: "ethernet1/23" + neighbor_name: "fw2-services" - capabilities: "BR" local_interface: "Eth4/1" - neighbor: "cr-park.org.local" neighbor_interface: "Fo1/0/8" + neighbor_name: "" - capabilities: "BR" local_interface: "Eth4/13" - neighbor: "r2-services" neighbor_interface: "Eth4/13" + neighbor_name: "r2-services" - capabilities: "" local_interface: "Eth4/23" - neighbor: "fw1-services" neighbor_interface: "ethernet1/22" + neighbor_name: "fw1-services" - capabilities: "" local_interface: "Eth4/24" - neighbor: "fw2-services" neighbor_interface: "ethernet1/24" + neighbor_name: "fw2-services" diff --git a/tests/cisco_nxos/show_lldp_neighbors_detail/cisco_nxos_show_lldp_neighbors_detail.yml b/tests/cisco_nxos/show_lldp_neighbors_detail/cisco_nxos_show_lldp_neighbors_detail.yml index 9e8483ecd0..d7c0beab67 100644 --- a/tests/cisco_nxos/show_lldp_neighbors_detail/cisco_nxos_show_lldp_neighbors_detail.yml +++ b/tests/cisco_nxos/show_lldp_neighbors_detail/cisco_nxos_show_lldp_neighbors_detail.yml @@ -4,8 +4,8 @@ parsed_sample: chassis_id: "0014.1c57.a48b" local_interface: "mgmt0" mgmt_address: "10.30.140.1" - neighbor: "Switch.cisco.com" neighbor_interface: "Fa1/0/9" + neighbor_name: "Switch.cisco.com" system_description: "Cisco IOS Software, C3750 Software (C3750-IPBASEK9-M), Version\ \ 12.2(44)SE2, RELEASE SOFTWARE (fc2)" vlan_id: "100" @@ -13,23 +13,23 @@ parsed_sample: chassis_id: "5087.89a1.d8d6" local_interface: "Eth1/1" mgmt_address: "10.30.140.21" - neighbor: "n9k2.company.com" neighbor_interface: "Ethernet1/1" + neighbor_name: "n9k2.company.com" system_description: "Cisco Nexus Operating System (NX-OS) Software 7.0(3)I4(1)" vlan_id: "1" - capabilities: "B, R" chassis_id: "5087.89a1.d8d7" local_interface: "Eth1/2" mgmt_address: "10.30.140.21" - neighbor: "n9k2.company.com" neighbor_interface: "Ethernet1/2" + neighbor_name: "n9k2.company.com" system_description: "Cisco Nexus Operating System (NX-OS) Software 7.0(3)I4(1)" vlan_id: "1" - capabilities: "B, R" chassis_id: "547f.eeaf.7818" local_interface: "Eth2/2" mgmt_address: "10.30.140.30" - neighbor: "N3K.cisconxapi.com" neighbor_interface: "Ethernet1/49" + neighbor_name: "N3K.cisconxapi.com" system_description: "Cisco Nexus Operating System (NX-OS) Software 6.0(2)U4(1)" vlan_id: "1" diff --git a/tests/cisco_nxos/show_lldp_neighbors_detail/cisco_nxos_show_lldp_neighbors_detail2.yml b/tests/cisco_nxos/show_lldp_neighbors_detail/cisco_nxos_show_lldp_neighbors_detail2.yml index 60a8929519..b0ecf177cc 100644 --- a/tests/cisco_nxos/show_lldp_neighbors_detail/cisco_nxos_show_lldp_neighbors_detail2.yml +++ b/tests/cisco_nxos/show_lldp_neighbors_detail/cisco_nxos_show_lldp_neighbors_detail2.yml @@ -4,15 +4,15 @@ parsed_sample: chassis_id: "3473.2d00.0001" local_interface: "Eth1/52" mgmt_address: "192.168.1.2" - neighbor: "SW-NEXUS" neighbor_interface: "Ethernet1/52" + neighbor_name: "SW-NEXUS" system_description: "Cisco Nexus Operating System (NX-OS) Software 9.3(8)" vlan_id: "" - capabilities: "B" chassis_id: "24a9.3700.0001" local_interface: "Eth101/1/10" mgmt_address: "" - neighbor: "pure-storage" neighbor_interface: "1a51.4800.0001" + neighbor_name: "pure-storage" system_description: "FlashArray FA-X20R3 pure-storage" vlan_id: "0" diff --git a/tests/cisco_s300/show_lldp_neighbors/cisco_s300_show_lldp_neighbors.yml b/tests/cisco_s300/show_lldp_neighbors/cisco_s300_show_lldp_neighbors.yml index f955cf5326..6262d742e3 100644 --- a/tests/cisco_s300/show_lldp_neighbors/cisco_s300_show_lldp_neighbors.yml +++ b/tests/cisco_s300/show_lldp_neighbors/cisco_s300_show_lldp_neighbors.yml @@ -2,9 +2,9 @@ parsed_sample: - chassis_id: "00:08:32:0f:1e:bd" local_interface: "gi27" - neighbor: "prsw03freeporil" neighbor_interface: "gi27" + neighbor_name: "prsw03freeporil" - chassis_id: "00:08:32:0f:04:cc" local_interface: "gi28" - neighbor: "prsw01freeportin" neighbor_interface: "gi28" + neighbor_name: "prsw01freeportin" diff --git a/tests/cisco_xr/show_lldp_neighbors/cisco_xr_show_lldp_neighbors.yml b/tests/cisco_xr/show_lldp_neighbors/cisco_xr_show_lldp_neighbors.yml index 472fd8e6b2..c67adc138d 100644 --- a/tests/cisco_xr/show_lldp_neighbors/cisco_xr_show_lldp_neighbors.yml +++ b/tests/cisco_xr/show_lldp_neighbors/cisco_xr_show_lldp_neighbors.yml @@ -1,8 +1,8 @@ --- parsed_sample: - local_interface: "Gi0/0/0/0" - neighbor: "ASR-OCC-P1" neighbor_interface: "Gi0/0/0/2" + neighbor_name: "ASR-OCC-P1" - local_interface: "Gi0/0/0/3" - neighbor: "ASR-LON-P1" neighbor_interface: "Gi0/0/0/2" + neighbor_name: "ASR-LON-P1" diff --git a/tests/hp_comware/display_lldp_neighbor-information_list/hp_comware_display_lldp_neighbor-information_list.yml b/tests/hp_comware/display_lldp_neighbor-information_list/hp_comware_display_lldp_neighbor-information_list.yml index 396f141f6a..7c1059d3c8 100644 --- a/tests/hp_comware/display_lldp_neighbor-information_list/hp_comware_display_lldp_neighbor-information_list.yml +++ b/tests/hp_comware/display_lldp_neighbor-information_list/hp_comware_display_lldp_neighbor-information_list.yml @@ -1,18 +1,18 @@ --- parsed_sample: - - local_interface: "XGE1/0/1" - chassis_id: "bcea-fa00-0001" + - chassis_id: "bcea-fa00-0001" + local_interface: "XGE1/0/1" neighbor_interface: "Ten-GigabitEthernet1/0/30" - neighbor: "SW-TEST-001" - - local_interface: "XGE1/0/17" - chassis_id: "5c8a-3800-0002" + neighbor_name: "SW-TEST-001" + - chassis_id: "5c8a-3800-0002" + local_interface: "XGE1/0/17" neighbor_interface: "Ten-GigabitEthernet1/0/29" - neighbor: "SW-TEST-002" - - local_interface: "XGE1/0/19" - chassis_id: "bcea-fa00-0003" + neighbor_name: "SW-TEST-002" + - chassis_id: "bcea-fa00-0003" + local_interface: "XGE1/0/19" neighbor_interface: "Ten-GigabitEthernet1/0/54" - neighbor: "SW-TEST-003" - - local_interface: "XGE1/0/21" - chassis_id: "bcea-fa00-0004" + neighbor_name: "SW-TEST-003" + - chassis_id: "bcea-fa00-0004" + local_interface: "XGE1/0/21" neighbor_interface: "Ten-GigabitEthernet1/0/32" - neighbor: "SW-TEST-004" + neighbor_name: "SW-TEST-004" diff --git a/tests/hp_comware/display_lldp_neighbor-information_list/hp_comware_display_lldp_neighbor-information_list1.yml b/tests/hp_comware/display_lldp_neighbor-information_list/hp_comware_display_lldp_neighbor-information_list1.yml index 661da1cdf0..eba4848481 100644 --- a/tests/hp_comware/display_lldp_neighbor-information_list/hp_comware_display_lldp_neighbor-information_list1.yml +++ b/tests/hp_comware/display_lldp_neighbor-information_list/hp_comware_display_lldp_neighbor-information_list1.yml @@ -1,10 +1,10 @@ --- parsed_sample: - - local_interface: "XGE1/0/0/1" - chassis_id: "bcea-fa00-0033" + - chassis_id: "bcea-fa00-0033" + local_interface: "XGE1/0/0/1" neighbor_interface: "Ten-GigabitEthernet1/0/47" - neighbor: "SWITCH01" - - local_interface: "XGE1/0/0/2" - chassis_id: "bcea-fa00-0033" + neighbor_name: "SWITCH01" + - chassis_id: "bcea-fa00-0033" + local_interface: "XGE1/0/0/2" neighbor_interface: "Ten-GigabitEthernet2/0/47" - neighbor: "SWITCH01" + neighbor_name: "SWITCH01" diff --git a/tests/hp_comware/display_lldp_neighbor-information_list/hp_comware_display_lldp_neighbor-information_list2.yml b/tests/hp_comware/display_lldp_neighbor-information_list/hp_comware_display_lldp_neighbor-information_list2.yml index 7b619a80d7..6e553884e1 100644 --- a/tests/hp_comware/display_lldp_neighbor-information_list/hp_comware_display_lldp_neighbor-information_list2.yml +++ b/tests/hp_comware/display_lldp_neighbor-information_list/hp_comware_display_lldp_neighbor-information_list2.yml @@ -1,14 +1,14 @@ --- parsed_sample: - - local_interface: "GE1/0/24" - chassis_id: "10.1.2.3" + - chassis_id: "10.1.2.3" + local_interface: "GE1/0/24" neighbor_interface: "AABBCCDDEEFF:P1" - neighbor: "SEP0000000000A0.exam" - - local_interface: "XGE1/0/29" - chassis_id: "bcea-fa00-0033" + neighbor_name: "SEP0000000000A0.exam" + - chassis_id: "bcea-fa00-0033" + local_interface: "XGE1/0/29" neighbor_interface: "Ten-GigabitEthernet1/0/17" - neighbor: "SWITCH01" - - local_interface: "GE2/0/45" - chassis_id: "SEP0000000000A0" + neighbor_name: "SWITCH01" + - chassis_id: "SEP0000000000A0" + local_interface: "GE2/0/45" neighbor_interface: "Port 1" - neighbor: "-" + neighbor_name: "-" diff --git a/tests/hp_comware/display_lldp_neighbor-information_verbose/hp_comware_display_lldp_neighbor-information_verbose.yml b/tests/hp_comware/display_lldp_neighbor-information_verbose/hp_comware_display_lldp_neighbor-information_verbose.yml index a558cc1c2d..c7ef7de5f0 100644 --- a/tests/hp_comware/display_lldp_neighbor-information_verbose/hp_comware_display_lldp_neighbor-information_verbose.yml +++ b/tests/hp_comware/display_lldp_neighbor-information_verbose/hp_comware_display_lldp_neighbor-information_verbose.yml @@ -3,28 +3,28 @@ parsed_sample: - chassis_id: "70f9-6d6b-1234" local_interface: "Ten-GigabitEthernet1/0/0/1" management_ip: "" - neighbor: "SW1" neighbor_interface: "GigabitEthernet0/0/1" neighbor_interface_description: "TO_CORE_1" + neighbor_name: "SW1" vlan_id: "" - chassis_id: "70f9-6d17-1235" local_interface: "Ten-GigabitEthernet1/0/0/2" management_ip: "10.6.5.4" - neighbor: "SW2" neighbor_interface: "Ten-GigabitEthernet1/0/0/5" neighbor_interface_description: "TO_CORE_2" + neighbor_name: "SW2" vlan_id: "10" - chassis_id: "70f9-6d17-1236" local_interface: "Ten-GigabitEthernet1/0/0/3" management_ip: "10.6.5.3" - neighbor: "SW3" neighbor_interface: "Ten-GigabitEthernet2/0/0/5" neighbor_interface_description: "TO_SPINE" + neighbor_name: "SW3" vlan_id: "10" - chassis_id: "4c1c-503a-1234" local_interface: "GigabitEthernet0/0" management_ip: "10.1.1.2" - neighbor: "Test-Router" neighbor_interface: "GigabitEthernet0/0" neighbor_interface_description: "GigabitEthernet0/0 Interface" + neighbor_name: "Test-Router" vlan_id: "" diff --git a/tests/huawei_vrp/display_lldp_neighbor/huawei_vrp_display_lldp_neighbor.yml b/tests/huawei_vrp/display_lldp_neighbor/huawei_vrp_display_lldp_neighbor.yml index 4636ed27da..b3ce01729c 100644 --- a/tests/huawei_vrp/display_lldp_neighbor/huawei_vrp_display_lldp_neighbor.yml +++ b/tests/huawei_vrp/display_lldp_neighbor/huawei_vrp_display_lldp_neighbor.yml @@ -6,8 +6,8 @@ parsed_sample: management_ip: "192.168.0.240" manufacturer_name: "Cisco Systems, Inc." model_name: "WS-C2960S-48LPS-L" - neighbor: "tsa-2960-sw01" neighbor_interface: "GigabitEthernet1/0/1" + neighbor_name: "tsa-2960-sw01" neighbor_port_id: "Gi1/0/1" serial: "NA" system_description: @@ -23,8 +23,8 @@ parsed_sample: management_ip: "192.168.0.241" manufacturer_name: "Cisco Systems, Inc." model_name: "WS-C2960S-48LPS-L" - neighbor: "tsa-2960-sw01" neighbor_interface: "GigabitEthernet1/0/2" + neighbor_name: "tsa-2960-sw01" neighbor_port_id: "Gi1/0/2" serial: "NA" system_description: diff --git a/tests/ipinfusion_ocnos/show_lldp_table/ipinfusion_ocnos_show_lldp_table.yml b/tests/ipinfusion_ocnos/show_lldp_table/ipinfusion_ocnos_show_lldp_table.yml index 4e3df5de50..2c5fb52104 100644 --- a/tests/ipinfusion_ocnos/show_lldp_table/ipinfusion_ocnos_show_lldp_table.yml +++ b/tests/ipinfusion_ocnos/show_lldp_table/ipinfusion_ocnos_show_lldp_table.yml @@ -2,36 +2,36 @@ parsed_sample: - capabilities: "BR" local_interface: "Ethernet0" - neighbor: "spine01" neighbor_interface: "fortyGigE0/20" neighbor_interface_description: "Ethernet20" + neighbor_name: "spine01" - capabilities: "BR" local_interface: "Ethernet4" - neighbor: "spine02" neighbor_interface: "fortyGigE0/20" neighbor_interface_description: "Ethernet20" + neighbor_name: "spine02" - capabilities: "BR" local_interface: "Ethernet8" - neighbor: "leaf01" neighbor_interface: "fortyGigE0/20" neighbor_interface_description: "Ethernet20" + neighbor_name: "leaf01" - capabilities: "BR" local_interface: "Ethernet12" - neighbor: "leaf02" neighbor_interface: "fortyGigE0/20" neighbor_interface_description: "Ethernet20" + neighbor_name: "leaf02" - capabilities: "BR" local_interface: "Ethernet16" - neighbor: "leaf03" neighbor_interface: "fortyGigE0/24" neighbor_interface_description: "Ethernet24" + neighbor_name: "leaf03" - capabilities: "BR" local_interface: "Ethernet20" - neighbor: "leaf04" neighbor_interface: "fortyGigE0/24" neighbor_interface_description: "Ethernet24" + neighbor_name: "leaf04" - capabilities: "BR" local_interface: "eth0" - neighbor: "mgmt-switch" neighbor_interface: "swp14" neighbor_interface_description: "swp14" + neighbor_name: "mgmt-switch" From daa0c5b57f222dbc97fc7e665c550bc5e68e7741 Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sun, 3 Sep 2023 08:57:30 -0400 Subject: [PATCH 22/41] replace SYSTEM_NAME with NEIGHBOR_NAME to normalize --- ...m_icos_show_lldp_remote-device_all.textfsm | 4 +- .../juniper_junos_show_lldp_neighbors.textfsm | 4 +- ...adcom_icos_show_lldp_remote-device_all.yml | 224 +++++++++--------- .../juniper_junos_show_lldp_neighbors.yml | 4 +- .../juniper_junos_show_lldp_neighbors_ae7.yml | 8 +- 5 files changed, 122 insertions(+), 122 deletions(-) diff --git a/ntc_templates/templates/broadcom_icos_show_lldp_remote-device_all.textfsm b/ntc_templates/templates/broadcom_icos_show_lldp_remote-device_all.textfsm index f4f7283733..6d080e90af 100644 --- a/ntc_templates/templates/broadcom_icos_show_lldp_remote-device_all.textfsm +++ b/ntc_templates/templates/broadcom_icos_show_lldp_remote-device_all.textfsm @@ -2,7 +2,7 @@ Value LOCAL_INTERFACE (\S+) Value REMOTE_ID (\S+) Value CHASSIS_ID (\S+) Value PORT_ID (\S+) -Value SYSTEM_NAME (\S+) +Value NEIGHBOR_NAME (\S+) Start # Captures show lldp remote-device all for: @@ -12,7 +12,7 @@ Start ^Local ^\s*Interface\s+RemID\s+Chassis\s+ID\s+Port\s+ID\s+System\s+Name$$ ^-+ - ^\s*${LOCAL_INTERFACE}\s+${REMOTE_ID}\s+${CHASSIS_ID}\s+${PORT_ID}\s+${SYSTEM_NAME} -> Record + ^\s*${LOCAL_INTERFACE}\s+${REMOTE_ID}\s+${CHASSIS_ID}\s+${PORT_ID}\s+${NEIGHBOR_NAME} -> Record # Match records that only include the interface value ^\s*${LOCAL_INTERFACE} -> Record ^\s*$$ diff --git a/ntc_templates/templates/juniper_junos_show_lldp_neighbors.textfsm b/ntc_templates/templates/juniper_junos_show_lldp_neighbors.textfsm index 783ffa3c80..7dfe695d8b 100644 --- a/ntc_templates/templates/juniper_junos_show_lldp_neighbors.textfsm +++ b/ntc_templates/templates/juniper_junos_show_lldp_neighbors.textfsm @@ -2,10 +2,10 @@ Value Required LOCAL_INTERFACE (\S+) Value Required PARENT_INTERFACE (\S+) Value Required CHASSIS_ID (\S+) Value Required NEIGHBOR_INTERFACE (\S+) -Value Required SYSTEM_NAME (\S+) +Value Required NEIGHBOR_NAME (\S+) Start ^Local\s+Interface\s+Parent\s+Interface\s+Chassis\s+Id\s+Port\s+info\s+System\s+Name - ^${LOCAL_INTERFACE}\s*${PARENT_INTERFACE}\s+${CHASSIS_ID}\s+${NEIGHBOR_INTERFACE}\s+${SYSTEM_NAME} -> Record + ^${LOCAL_INTERFACE}\s*${PARENT_INTERFACE}\s+${CHASSIS_ID}\s+${NEIGHBOR_INTERFACE}\s+${NEIGHBOR_NAME} -> Record ^\s*$$ ^. -> Error \ No newline at end of file diff --git a/tests/broadcom_icos/show_lldp_remote-device_all/broadcom_icos_show_lldp_remote-device_all.yml b/tests/broadcom_icos/show_lldp_remote-device_all/broadcom_icos_show_lldp_remote-device_all.yml index eb01c84ed4..69dba816ed 100644 --- a/tests/broadcom_icos/show_lldp_remote-device_all/broadcom_icos_show_lldp_remote-device_all.yml +++ b/tests/broadcom_icos/show_lldp_remote-device_all/broadcom_icos_show_lldp_remote-device_all.yml @@ -1,157 +1,157 @@ --- parsed_sample: - - local_interface: "0/1" + - chassis_id: "84:3D:C6:00:12:E0" + local_interface: "0/1" + neighbor_name: "abc-1-00001.y" + port_id: "Gi0" remote_id: "17" - chassis_id: "84:3D:C6:00:12:E0" + - chassis_id: "00:A6:CA:00:53:C0" + local_interface: "0/2" + neighbor_name: "abc-1-00002.y" port_id: "Gi0" - system_name: "abc-1-00001.y" - - local_interface: "0/2" remote_id: "16" - chassis_id: "00:A6:CA:00:53:C0" - port_id: "Gi0" - system_name: "abc-1-00002.y" - - local_interface: "0/3" + - chassis_id: "F4:DB:E6:00:9F:46" + local_interface: "0/3" + neighbor_name: "abc-1-00003M" + port_id: "0" remote_id: "18" - chassis_id: "F4:DB:E6:00:9F:46" + - chassis_id: "F4:DB:E6:00:44:9E" + local_interface: "0/4" + neighbor_name: "abc-1-00004M" port_id: "0" - system_name: "abc-1-00003M" - - local_interface: "0/4" remote_id: "19" - chassis_id: "F4:DB:E6:00:44:9E" - port_id: "0" - system_name: "abc-1-00004M" - - local_interface: "0/5" - remote_id: "20" - chassis_id: "F4:DB:E6:00:AC:FE" + - chassis_id: "F4:DB:E6:00:AC:FE" + local_interface: "0/5" + neighbor_name: "abc-1-00005M" port_id: "Te2/1" - system_name: "abc-1-00005M" - - local_interface: "0/25" - remote_id: "" - chassis_id: "" + remote_id: "20" + - chassis_id: "" + local_interface: "0/25" + neighbor_name: "" port_id: "" - system_name: "" - - local_interface: "0/26" remote_id: "" - chassis_id: "" + - chassis_id: "" + local_interface: "0/26" + neighbor_name: "" port_id: "" - system_name: "" - - local_interface: "0/27" remote_id: "" - chassis_id: "" + - chassis_id: "" + local_interface: "0/27" + neighbor_name: "" port_id: "" - system_name: "" - - local_interface: "0/28" remote_id: "" - chassis_id: "" + - chassis_id: "" + local_interface: "0/28" + neighbor_name: "" port_id: "" - system_name: "" - - local_interface: "0/29" remote_id: "" - chassis_id: "" + - chassis_id: "" + local_interface: "0/29" + neighbor_name: "" port_id: "" - system_name: "" - - local_interface: "0/30" remote_id: "" - chassis_id: "" + - chassis_id: "" + local_interface: "0/30" + neighbor_name: "" port_id: "" - system_name: "" - - local_interface: "0/31" remote_id: "" - chassis_id: "" + - chassis_id: "" + local_interface: "0/31" + neighbor_name: "" port_id: "" - system_name: "" - - local_interface: "0/32" remote_id: "" - chassis_id: "" + - chassis_id: "" + local_interface: "0/32" + neighbor_name: "" port_id: "" - system_name: "" - - local_interface: "0/33" remote_id: "" - chassis_id: "" + - chassis_id: "" + local_interface: "0/33" + neighbor_name: "" port_id: "" - system_name: "" - - local_interface: "0/34" remote_id: "" - chassis_id: "" + - chassis_id: "" + local_interface: "0/34" + neighbor_name: "" port_id: "" - system_name: "" - - local_interface: "0/35" - remote_id: "8" - chassis_id: "6C:00:C5:4D:86:3A" - port_id: "6C:00:C5:4D:86:3B" - system_name: "abc-aa-acc-sw" - - local_interface: "0/36" remote_id: "" - chassis_id: "" + - chassis_id: "6C:00:C5:4D:86:3A" + local_interface: "0/35" + neighbor_name: "abc-aa-acc-sw" + port_id: "6C:00:C5:4D:86:3B" + remote_id: "8" + - chassis_id: "" + local_interface: "0/36" + neighbor_name: "" port_id: "" - system_name: "" - - local_interface: "0/37" - remote_id: "7" - chassis_id: "6C:00:C5:49:E7:40" - port_id: "6C:00:C5:49:E7:41" - system_name: "abc-bb-acc-sw" - - local_interface: "0/38" remote_id: "" - chassis_id: "" + - chassis_id: "6C:00:C5:49:E7:40" + local_interface: "0/37" + neighbor_name: "abc-bb-acc-sw" + port_id: "6C:00:C5:49:E7:41" + remote_id: "7" + - chassis_id: "" + local_interface: "0/38" + neighbor_name: "" port_id: "" - system_name: "" - - local_interface: "0/39" - remote_id: "29" - chassis_id: "6C:00:C5:49:08:8A" - port_id: "6C:00:C5:49:08:8B" - system_name: "abc-cc-acc-sw" - - local_interface: "0/40" remote_id: "" - chassis_id: "" + - chassis_id: "6C:00:C5:49:08:8A" + local_interface: "0/39" + neighbor_name: "abc-cc-acc-sw" + port_id: "6C:00:C5:49:08:8B" + remote_id: "29" + - chassis_id: "" + local_interface: "0/40" + neighbor_name: "" port_id: "" - system_name: "" - - local_interface: "0/41" remote_id: "" - chassis_id: "" + - chassis_id: "" + local_interface: "0/41" + neighbor_name: "" port_id: "" - system_name: "" - - local_interface: "0/42" - remote_id: "26" - chassis_id: "00:00:64:4D:00:68" + remote_id: "" + - chassis_id: "00:00:64:4D:00:68" + local_interface: "0/42" + neighbor_name: "u0030644d6e685" port_id: "00:00:64:4D:6E:68" - system_name: "u0030644d6e685" - - local_interface: "0/43" - remote_id: "9" - chassis_id: "6C:00:C5:49:8D:DE" + remote_id: "26" + - chassis_id: "6C:00:C5:49:8D:DE" + local_interface: "0/43" + neighbor_name: "abc-dd-acc-sw" port_id: "6C:00:C5:49:8D:DF" - system_name: "abc-dd-acc-sw" - - local_interface: "0/44" - remote_id: "" - chassis_id: "" + remote_id: "9" + - chassis_id: "" + local_interface: "0/44" + neighbor_name: "" port_id: "" - system_name: "" - - local_interface: "0/45" - remote_id: "24" - chassis_id: "00:00:64:4D:D7:F0" - port_id: "00:00:64:4D:D7:F0" - system_name: "u0030644dd7f05" - - local_interface: "0/46" remote_id: "" - chassis_id: "" + - chassis_id: "00:00:64:4D:D7:F0" + local_interface: "0/45" + neighbor_name: "u0030644dd7f05" + port_id: "00:00:64:4D:D7:F0" + remote_id: "24" + - chassis_id: "" + local_interface: "0/46" + neighbor_name: "" port_id: "" - system_name: "" - - local_interface: "0/47" - remote_id: "4" - chassis_id: "00:00:64:4D:72:8A" - port_id: "00:00:64:4D:72:8A" - system_name: "u0030644d728a5" - - local_interface: "0/48" remote_id: "" - chassis_id: "" + - chassis_id: "00:00:64:4D:72:8A" + local_interface: "0/47" + neighbor_name: "u0030644d728a5" + port_id: "00:00:64:4D:72:8A" + remote_id: "4" + - chassis_id: "" + local_interface: "0/48" + neighbor_name: "" port_id: "" - system_name: "" - - local_interface: "0/49" - remote_id: "1" - chassis_id: "A8:00:B5:57:CC:8D" + remote_id: "" + - chassis_id: "A8:00:B5:57:CC:8D" + local_interface: "0/49" + neighbor_name: "abc-ee-abc-sw0101" port_id: "A8:00:B5:57:CC:8E" - system_name: "abc-ee-abc-sw0101" - - local_interface: "0/50" - remote_id: "2" - chassis_id: "A8:00:B5:57:CB:01" + remote_id: "1" + - chassis_id: "A8:00:B5:57:CB:01" + local_interface: "0/50" + neighbor_name: "abc-ff-abc-sw0102" port_id: "A8:00:B5:57:CB:02" - system_name: "abc-ff-abc-sw0102" + remote_id: "2" diff --git a/tests/juniper_junos/show_lldp_neighbors/juniper_junos_show_lldp_neighbors.yml b/tests/juniper_junos/show_lldp_neighbors/juniper_junos_show_lldp_neighbors.yml index 13e7369b75..7f28704e76 100644 --- a/tests/juniper_junos/show_lldp_neighbors/juniper_junos_show_lldp_neighbors.yml +++ b/tests/juniper_junos/show_lldp_neighbors/juniper_junos_show_lldp_neighbors.yml @@ -3,10 +3,10 @@ parsed_sample: - chassis_id: "2c:6b:f5:a1:c2:c0" local_interface: "ge-0/0/1" neighbor_interface: "ge-0/0/1" + neighbor_name: "vmx2" parent_interface: "-" - system_name: "vmx2" - chassis_id: "2c:6b:f5:a2:08:c0" local_interface: "ge-0/0/0" neighbor_interface: "ge-0/0/0" + neighbor_name: "vmx3" parent_interface: "-" - system_name: "vmx3" diff --git a/tests/juniper_junos/show_lldp_neighbors/juniper_junos_show_lldp_neighbors_ae7.yml b/tests/juniper_junos/show_lldp_neighbors/juniper_junos_show_lldp_neighbors_ae7.yml index 1f8cae6a21..4c6bd42b9e 100644 --- a/tests/juniper_junos/show_lldp_neighbors/juniper_junos_show_lldp_neighbors_ae7.yml +++ b/tests/juniper_junos/show_lldp_neighbors/juniper_junos_show_lldp_neighbors_ae7.yml @@ -3,20 +3,20 @@ parsed_sample: - chassis_id: "00:1c:73:ee:c0:46" local_interface: "xe-0/1/1" neighbor_interface: "Ethernet3/29/1" + neighbor_name: "core01.sjc01" parent_interface: "ae7" - system_name: "core01.sjc01" - chassis_id: "00:1c:73:ee:c0:46" local_interface: "xe-0/3/3" neighbor_interface: "Ethernet3/29/2" + neighbor_name: "core01.sjc01" parent_interface: "ae7" - system_name: "core01.sjc01" - chassis_id: "00:1c:73:ee:c0:46" local_interface: "xe-2/0/5" neighbor_interface: "Ethernet3/29/3" + neighbor_name: "core01.sjc01" parent_interface: "ae7" - system_name: "core01.sjc01" - chassis_id: "00:1c:73:ee:c0:46" local_interface: "xe-2/1/5" neighbor_interface: "Ethernet3/29/4" + neighbor_name: "core01.sjc01" parent_interface: "ae7" - system_name: "core01.sjc01" From 24888102c70683719f7805ecffc5e7e659e83199 Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sun, 3 Sep 2023 09:19:56 -0400 Subject: [PATCH 23/41] replace NEIGHBOR_SYSNAME with NEIGHBOR_NAME in two hp_procurve LLDP templates to normalize --- ...procurve_show_lldp_info_remote-device.textfsm | 6 +++--- ...e_show_lldp_info_remote-device_detail.textfsm | 4 ++-- .../hp_procurve_show_lldp_info_remote-device.yml | 16 ++++++++-------- ...curve_show_lldp_info_remote-device_detail.yml | 16 ++++++++-------- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device.textfsm b/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device.textfsm index f5bf9d3a31..a1e29b3281 100644 --- a/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device.textfsm +++ b/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device.textfsm @@ -2,7 +2,7 @@ Value Required LOCAL_INTERFACE (\S+) Value NEIGHBOR_CHASSIS_ID ((?:[a-z0-9]{2}\s){5}[a-z0-9]{2}|\S+) Value NEIGHBOR_PORTID ((?:[a-z0-9]{2}\s){5}[a-z0-9]{2}|\S+) Value NEIGHBOR_DESCR (\S+|.*?) -Value NEIGHBOR_SYSNAME (\S+) +Value NEIGHBOR_NAME (\S+) Start ^\s*LLDP\sRemote\sDevices\sInformation\s*$$ @@ -13,8 +13,8 @@ Start LLDP ^\s+${LOCAL_INTERFACE}\s+\|\s${NEIGHBOR_CHASSIS_ID}\s+${NEIGHBOR_PORTID}\s*$$ -> Record - ^\s+${LOCAL_INTERFACE}\s+\|\s${NEIGHBOR_CHASSIS_ID}\s+${NEIGHBOR_PORTID}\s+${NEIGHBOR_SYSNAME}\s*$$ -> Record - ^\s+${LOCAL_INTERFACE}\s+\|\s${NEIGHBOR_CHASSIS_ID}\s+${NEIGHBOR_PORTID}\s+${NEIGHBOR_DESCR}\s+${NEIGHBOR_SYSNAME}\s*$$ -> Record + ^\s+${LOCAL_INTERFACE}\s+\|\s${NEIGHBOR_CHASSIS_ID}\s+${NEIGHBOR_PORTID}\s+${NEIGHBOR_NAME}\s*$$ -> Record + ^\s+${LOCAL_INTERFACE}\s+\|\s${NEIGHBOR_CHASSIS_ID}\s+${NEIGHBOR_PORTID}\s+${NEIGHBOR_DESCR}\s+${NEIGHBOR_NAME}\s*$$ -> Record ^\S+\#\s*$$ ^\s*$$ ^. -> Error diff --git a/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device_detail.textfsm b/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device_detail.textfsm index e8c280b5c2..f1ae439dab 100644 --- a/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device_detail.textfsm +++ b/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device_detail.textfsm @@ -3,7 +3,7 @@ Value NEIGHBOR_CHASSIS_TYPE (\S+) Value CHASSIS_ID ([a-f0-9]{6}-[a-f0-9]{6}|(?:[a-z0-9]{2}\s){5}[a-z0-9]{2}|\S+) Value PORT_TYPE (\S+) Value NEIGHBOR_PORTID (.*?) -Value NEIGHBOR_SYSNAME (.*?) +Value NEIGHBOR_NAME (.*?) Value SYSTEM_DESCR (.*?) Value NEIGHBOR_INTERFACE_DESCRIPTION (\S+|.*?) Value VLAN_ID (\d+|.*?) @@ -22,7 +22,7 @@ LLDP ^\s+ChassisId\s+:\s${CHASSIS_ID}\s*$$ ^\s+PortType\s+:\s${PORT_TYPE}\s*$$ ^\s+PortId\s+:\s${NEIGHBOR_PORTID}\s*$$ - ^\s+SysName\s+:\s${NEIGHBOR_SYSNAME}\s*$$ + ^\s+SysName\s+:\s${NEIGHBOR_NAME}\s*$$ ^\s+System\sDescr\s:\s${SYSTEM_DESCR}\s*$$ ^\s+PortDescr\s+:\s${NEIGHBOR_INTERFACE_DESCRIPTION}\s*$$ # Port VLAN ID diff --git a/tests/hp_procurve/show_lldp_info_remote-device/hp_procurve_show_lldp_info_remote-device.yml b/tests/hp_procurve/show_lldp_info_remote-device/hp_procurve_show_lldp_info_remote-device.yml index 4f3d2afbd4..edd02aa936 100644 --- a/tests/hp_procurve/show_lldp_info_remote-device/hp_procurve_show_lldp_info_remote-device.yml +++ b/tests/hp_procurve/show_lldp_info_remote-device/hp_procurve_show_lldp_info_remote-device.yml @@ -3,40 +3,40 @@ parsed_sample: - local_interface: "1" neighbor_chassis_id: "3821c7-c1cd00" neighbor_descr: "1" + neighbor_name: "65432p-swi006-g..." neighbor_portid: "1" - neighbor_sysname: "65432p-swi006-g..." - local_interface: "3" neighbor_chassis_id: "3ce1a1-2218f0" neighbor_descr: "" + neighbor_name: "" neighbor_portid: "3c e1 a1 22 18 f0" - neighbor_sysname: "" - local_interface: "7" neighbor_chassis_id: "bcf310-1f8b40" neighbor_descr: "" + neighbor_name: "AH-cust-AP21" neighbor_portid: "mgt0" - neighbor_sysname: "AH-cust-AP21" - local_interface: "25" neighbor_chassis_id: "d8cb8a-6d303c" neighbor_descr: "" + neighbor_name: "" neighbor_portid: "d8 cb 8a 6d 30 3c" - neighbor_sysname: "" - local_interface: "29" neighbor_chassis_id: "484d7e-e66c42" neighbor_descr: "" + neighbor_name: "" neighbor_portid: "48 4d 7e e6 6c 42" - neighbor_sysname: "" - local_interface: "36" neighbor_chassis_id: "603197-7aa548" neighbor_descr: "UPLINK" + neighbor_name: "NAP203" neighbor_portid: "1" - neighbor_sysname: "NAP203" - local_interface: "37" neighbor_chassis_id: "b00cd1-359a98" neighbor_descr: "" + neighbor_name: "" neighbor_portid: "b0 0c d1 35 9a 98" - neighbor_sysname: "" - local_interface: "42" neighbor_chassis_id: "d8cb8a-894644" neighbor_descr: "" + neighbor_name: "" neighbor_portid: "d8 cb 8a 89 46 44" - neighbor_sysname: "" diff --git a/tests/hp_procurve/show_lldp_info_remote-device_detail/hp_procurve_show_lldp_info_remote-device_detail.yml b/tests/hp_procurve/show_lldp_info_remote-device_detail/hp_procurve_show_lldp_info_remote-device_detail.yml index 4e45f40084..d5c480b84e 100644 --- a/tests/hp_procurve/show_lldp_info_remote-device_detail/hp_procurve_show_lldp_info_remote-device_detail.yml +++ b/tests/hp_procurve/show_lldp_info_remote-device_detail/hp_procurve_show_lldp_info_remote-device_detail.yml @@ -6,8 +6,8 @@ parsed_sample: local_interface: "1" neighbor_chassis_type: "mac-address" neighbor_interface_description: "1" + neighbor_name: "65432p-swi006-abcd-srvroom-4asd" neighbor_portid: "1" - neighbor_sysname: "65432p-swi006-abcd-srvroom-4asd" port_type: "local" remote_management_address: "192.168.130.100" system_descr: "Aruba JL357A 2540-48G-PoE+-4SFP+ Switch, revision YC.16.0..." @@ -18,8 +18,8 @@ parsed_sample: local_interface: "3" neighbor_chassis_type: "mac-address" neighbor_interface_description: "" + neighbor_name: "" neighbor_portid: "3c e1 a1 22 18 f0" - neighbor_sysname: "" port_type: "mac-address" remote_management_address: "" system_descr: "" @@ -30,8 +30,8 @@ parsed_sample: local_interface: "7" neighbor_chassis_type: "mac-address" neighbor_interface_description: "" + neighbor_name: "AH-cust-AP21" neighbor_portid: "mgt0" - neighbor_sysname: "AH-cust-AP21" port_type: "interface-name" remote_management_address: "192.168.100.55" system_descr: "" @@ -42,8 +42,8 @@ parsed_sample: local_interface: "25" neighbor_chassis_type: "mac-address" neighbor_interface_description: "" + neighbor_name: "" neighbor_portid: "d8 cb 8a 6d 30 3c" - neighbor_sysname: "" port_type: "mac-address" remote_management_address: "" system_descr: "" @@ -54,8 +54,8 @@ parsed_sample: local_interface: "29" neighbor_chassis_type: "mac-address" neighbor_interface_description: "" + neighbor_name: "" neighbor_portid: "48 4d 7e e6 6c 42" - neighbor_sysname: "" port_type: "mac-address" remote_management_address: "" system_descr: "" @@ -66,8 +66,8 @@ parsed_sample: local_interface: "36" neighbor_chassis_type: "mac-address" neighbor_interface_description: "UPLINK" + neighbor_name: "NAP203" neighbor_portid: "1" - neighbor_sysname: "NAP203" port_type: "local" remote_management_address: "192.168.100.50" system_descr: "ZLD 6.00(###.8)B1 (cannon)" @@ -78,8 +78,8 @@ parsed_sample: local_interface: "37" neighbor_chassis_type: "mac-address" neighbor_interface_description: "" + neighbor_name: "" neighbor_portid: "b0 0c d1 35 9a 98" - neighbor_sysname: "" port_type: "mac-address" remote_management_address: "" system_descr: "" @@ -90,8 +90,8 @@ parsed_sample: local_interface: "42" neighbor_chassis_type: "mac-address" neighbor_interface_description: "" + neighbor_name: "" neighbor_portid: "d8 cb 8a 89 46 44" - neighbor_sysname: "" port_type: "mac-address" remote_management_address: "" system_descr: "" From ec7033b44b5e000bfce49caf07d64e4f5057f813 Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sun, 3 Sep 2023 09:23:42 -0400 Subject: [PATCH 24/41] replace CHASSIS_NAME with NEIGHBOR_NAME in aruba_aoscx_show_lldp_neighbors-info_detail to normalize --- ...uba_aoscx_show_lldp_neighbors-info_detail.textfsm | 6 +++--- .../show_lldp_neighbors-info_detail.yml | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ntc_templates/templates/aruba_aoscx_show_lldp_neighbors-info_detail.textfsm b/ntc_templates/templates/aruba_aoscx_show_lldp_neighbors-info_detail.textfsm index 3a9310a138..ede58121e8 100644 --- a/ntc_templates/templates/aruba_aoscx_show_lldp_neighbors-info_detail.textfsm +++ b/ntc_templates/templates/aruba_aoscx_show_lldp_neighbors-info_detail.textfsm @@ -1,6 +1,6 @@ Value Required LOCAL_INTERFACE (\S+) Value Required CHASSIS_ID (\S+) -Value CHASSIS_NAME (\S+) +Value NEIGHBOR_NAME (\S+) Value CHASSIS_DESC (.+) Value CAPABILITIES_SUPPORTED (.+) Value CAPABILITIES (.+) @@ -11,8 +11,8 @@ Value NEIGHBOR_INTERFACE (\S+) Start ^Port\s*:\s*${LOCAL_INTERFACE} - ^Neighbor\s*Chassis-Name\s*:\s*${CHASSIS_NAME} - ^Neighbor\s+System-Name\s*:\s*${CHASSIS_NAME} + ^Neighbor\s*Chassis-Name\s*:\s*${NEIGHBOR_NAME} + ^Neighbor\s+System-Name\s*:\s*${NEIGHBOR_NAME} ^Neighbor\s*Chassis-Description\s*:\s*${CHASSIS_DESC} ^Neighbor\s+System-Description\s*:\s*${CHASSIS_DESC} ^Neighbor\s*Chassis-ID\s*:\s*${CHASSIS_ID} diff --git a/tests/aruba_aoscx/show_lldp_neighbors-info_detail/show_lldp_neighbors-info_detail.yml b/tests/aruba_aoscx/show_lldp_neighbors-info_detail/show_lldp_neighbors-info_detail.yml index 5e7dfec0f5..d4e7a9d0cf 100644 --- a/tests/aruba_aoscx/show_lldp_neighbors-info_detail/show_lldp_neighbors-info_detail.yml +++ b/tests/aruba_aoscx/show_lldp_neighbors-info_detail/show_lldp_neighbors-info_detail.yml @@ -4,53 +4,53 @@ parsed_sample: capabilities_supported: "Bridge, WLAN" chassis_desc: "ArubaOS (MODEL: 335), Version Aruba AP" chassis_id: "70:3a:0e:cd:41:fe" - chassis_name: "ap-9999-335-fe" local_interface: "1/1/1" mgmt_addr: "10.252.99.12" neighbor_interface: "eth0" + neighbor_name: "ap-9999-335-fe" port_id: "70:3a:0e:cd:41:fe" - capabilities: "WLAN" capabilities_supported: "Bridge, WLAN" chassis_desc: "ArubaOS (MODEL: 535), Version Aruba AP" chassis_id: "00:4e:35:c5:d2:2e" - chassis_name: "ap-9999-535-fe" local_interface: "1/1/2" mgmt_addr: "10.252.99.11" neighbor_interface: "eth0" + neighbor_name: "ap-9999-535-fe" port_id: "00:4e:35:c5:d2:2e" - capabilities: "Bridge, Router" capabilities_supported: "Bridge, Router" chassis_desc: "Aruba JL635A GL.10.05.0021" chassis_id: "90:20:c2:bf:ae:00" - chassis_name: "rtr-agg-0620-a" local_interface: "1/1/52" mgmt_addr: "10.252.15.17" neighbor_interface: "1/1/1" + neighbor_name: "rtr-agg-0620-a" port_id: "1/1/1" - capabilities: "WLAN" capabilities_supported: "Bridge, WLAN" chassis_desc: "ArubaOS (MODEL: 335), Version Aruba AP" chassis_id: "70:3a:0e:cd:41:fe" - chassis_name: "ap-9999-335-fe" local_interface: "2/1/1" mgmt_addr: "10.252.99.12" neighbor_interface: "eth1" + neighbor_name: "ap-9999-335-fe" port_id: "70:3a:0e:cd:41:ff" - capabilities: "WLAN" capabilities_supported: "Bridge, WLAN" chassis_desc: "ArubaOS (MODEL: 535), Version Aruba AP" chassis_id: "00:4e:35:c5:d2:2e" - chassis_name: "ap-9999-535-fe" local_interface: "2/1/2" mgmt_addr: "10.252.99.11" neighbor_interface: "eth1" + neighbor_name: "ap-9999-535-fe" port_id: "00:4e:35:c5:d2:2f" - capabilities: "Bridge, Router" capabilities_supported: "Bridge, Router" chassis_desc: "Aruba JL635A GL.10.05.0021" chassis_id: "90:20:c2:bf:ed:00" - chassis_name: "rtr-agg-0620-b" local_interface: "2/1/52" mgmt_addr: "10.252.15.18" neighbor_interface: "1/1/1" + neighbor_name: "rtr-agg-0620-b" port_id: "1/1/1" From 038311ac4f1405bfaa5e56cf6aad1518f97fda9b Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sun, 3 Sep 2023 13:51:26 -0400 Subject: [PATCH 25/41] normalize hp_procurve_show_lldp_info_remote-device with other CDP or LLDP templates - replace NEIGHBOR_PORTID with NEIGHBOR_INTERFACE - replace NEIGHBOR_DESCR with NEIGHBOR_DESCRIPTION --- ...curve_show_lldp_info_remote-device.textfsm | 10 +++--- ..._procurve_show_lldp_info_remote-device.yml | 32 +++++++++---------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device.textfsm b/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device.textfsm index a1e29b3281..dbc14d3f04 100644 --- a/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device.textfsm +++ b/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device.textfsm @@ -1,7 +1,7 @@ Value Required LOCAL_INTERFACE (\S+) Value NEIGHBOR_CHASSIS_ID ((?:[a-z0-9]{2}\s){5}[a-z0-9]{2}|\S+) -Value NEIGHBOR_PORTID ((?:[a-z0-9]{2}\s){5}[a-z0-9]{2}|\S+) -Value NEIGHBOR_DESCR (\S+|.*?) +Value NEIGHBOR_INTERFACE ((?:[a-z0-9]{2}\s){5}[a-z0-9]{2}|\S+) +Value NEIGHBOR_DESCRIPTION (\S+|.*?) Value NEIGHBOR_NAME (\S+) Start @@ -12,9 +12,9 @@ Start ^. -> Error LLDP - ^\s+${LOCAL_INTERFACE}\s+\|\s${NEIGHBOR_CHASSIS_ID}\s+${NEIGHBOR_PORTID}\s*$$ -> Record - ^\s+${LOCAL_INTERFACE}\s+\|\s${NEIGHBOR_CHASSIS_ID}\s+${NEIGHBOR_PORTID}\s+${NEIGHBOR_NAME}\s*$$ -> Record - ^\s+${LOCAL_INTERFACE}\s+\|\s${NEIGHBOR_CHASSIS_ID}\s+${NEIGHBOR_PORTID}\s+${NEIGHBOR_DESCR}\s+${NEIGHBOR_NAME}\s*$$ -> Record + ^\s+${LOCAL_INTERFACE}\s+\|\s${NEIGHBOR_CHASSIS_ID}\s+${NEIGHBOR_INTERFACE}\s*$$ -> Record + ^\s+${LOCAL_INTERFACE}\s+\|\s${NEIGHBOR_CHASSIS_ID}\s+${NEIGHBOR_INTERFACE}\s+${NEIGHBOR_NAME}\s*$$ -> Record + ^\s+${LOCAL_INTERFACE}\s+\|\s${NEIGHBOR_CHASSIS_ID}\s+${NEIGHBOR_INTERFACE}\s+${NEIGHBOR_DESCRIPTION}\s+${NEIGHBOR_NAME}\s*$$ -> Record ^\S+\#\s*$$ ^\s*$$ ^. -> Error diff --git a/tests/hp_procurve/show_lldp_info_remote-device/hp_procurve_show_lldp_info_remote-device.yml b/tests/hp_procurve/show_lldp_info_remote-device/hp_procurve_show_lldp_info_remote-device.yml index edd02aa936..340ba3c8b6 100644 --- a/tests/hp_procurve/show_lldp_info_remote-device/hp_procurve_show_lldp_info_remote-device.yml +++ b/tests/hp_procurve/show_lldp_info_remote-device/hp_procurve_show_lldp_info_remote-device.yml @@ -2,41 +2,41 @@ parsed_sample: - local_interface: "1" neighbor_chassis_id: "3821c7-c1cd00" - neighbor_descr: "1" + neighbor_description: "1" + neighbor_interface: "1" neighbor_name: "65432p-swi006-g..." - neighbor_portid: "1" - local_interface: "3" neighbor_chassis_id: "3ce1a1-2218f0" - neighbor_descr: "" + neighbor_description: "" + neighbor_interface: "3c e1 a1 22 18 f0" neighbor_name: "" - neighbor_portid: "3c e1 a1 22 18 f0" - local_interface: "7" neighbor_chassis_id: "bcf310-1f8b40" - neighbor_descr: "" + neighbor_description: "" + neighbor_interface: "mgt0" neighbor_name: "AH-cust-AP21" - neighbor_portid: "mgt0" - local_interface: "25" neighbor_chassis_id: "d8cb8a-6d303c" - neighbor_descr: "" + neighbor_description: "" + neighbor_interface: "d8 cb 8a 6d 30 3c" neighbor_name: "" - neighbor_portid: "d8 cb 8a 6d 30 3c" - local_interface: "29" neighbor_chassis_id: "484d7e-e66c42" - neighbor_descr: "" + neighbor_description: "" + neighbor_interface: "48 4d 7e e6 6c 42" neighbor_name: "" - neighbor_portid: "48 4d 7e e6 6c 42" - local_interface: "36" neighbor_chassis_id: "603197-7aa548" - neighbor_descr: "UPLINK" + neighbor_description: "UPLINK" + neighbor_interface: "1" neighbor_name: "NAP203" - neighbor_portid: "1" - local_interface: "37" neighbor_chassis_id: "b00cd1-359a98" - neighbor_descr: "" + neighbor_description: "" + neighbor_interface: "b0 0c d1 35 9a 98" neighbor_name: "" - neighbor_portid: "b0 0c d1 35 9a 98" - local_interface: "42" neighbor_chassis_id: "d8cb8a-894644" - neighbor_descr: "" + neighbor_description: "" + neighbor_interface: "d8 cb 8a 89 46 44" neighbor_name: "" - neighbor_portid: "d8 cb 8a 89 46 44" From eb1895889d72c48447e6f9c1c31593475f768e75 Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sun, 3 Sep 2023 14:00:27 -0400 Subject: [PATCH 26/41] normalize hp_procurve_show_lldp_info_remote-device_detail with other CDP or LLDP templates - replace NEIGHBOR_PORTID with NEIGHBOR_INTERFACE - replace SYSTEM_DESCR with NEIGHBOR_DESCRIPTION --- ...how_lldp_info_remote-device_detail.textfsm | 8 ++--- ...ve_show_lldp_info_remote-device_detail.yml | 32 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device_detail.textfsm b/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device_detail.textfsm index f1ae439dab..6a95ad1098 100644 --- a/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device_detail.textfsm +++ b/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device_detail.textfsm @@ -2,9 +2,9 @@ Value Required LOCAL_INTERFACE (\S+) Value NEIGHBOR_CHASSIS_TYPE (\S+) Value CHASSIS_ID ([a-f0-9]{6}-[a-f0-9]{6}|(?:[a-z0-9]{2}\s){5}[a-z0-9]{2}|\S+) Value PORT_TYPE (\S+) -Value NEIGHBOR_PORTID (.*?) +Value NEIGHBOR_INTERFACE (.*?) Value NEIGHBOR_NAME (.*?) -Value SYSTEM_DESCR (.*?) +Value NEIGHBOR_DESCRIPTION (.*?) Value NEIGHBOR_INTERFACE_DESCRIPTION (\S+|.*?) Value VLAN_ID (\d+|.*?) Value CAPABILITIES_SUPPORTED (.*?) @@ -21,9 +21,9 @@ LLDP ^\s+ChassisType\s+:\s${NEIGHBOR_CHASSIS_TYPE}\s*$$ ^\s+ChassisId\s+:\s${CHASSIS_ID}\s*$$ ^\s+PortType\s+:\s${PORT_TYPE}\s*$$ - ^\s+PortId\s+:\s${NEIGHBOR_PORTID}\s*$$ + ^\s+PortId\s+:\s${NEIGHBOR_INTERFACE}\s*$$ ^\s+SysName\s+:\s${NEIGHBOR_NAME}\s*$$ - ^\s+System\sDescr\s:\s${SYSTEM_DESCR}\s*$$ + ^\s+System\sDescr\s:\s${NEIGHBOR_DESCRIPTION}\s*$$ ^\s+PortDescr\s+:\s${NEIGHBOR_INTERFACE_DESCRIPTION}\s*$$ # Port VLAN ID ^\s+Pvid\s+:\s${VLAN_ID}\s*$$ diff --git a/tests/hp_procurve/show_lldp_info_remote-device_detail/hp_procurve_show_lldp_info_remote-device_detail.yml b/tests/hp_procurve/show_lldp_info_remote-device_detail/hp_procurve_show_lldp_info_remote-device_detail.yml index d5c480b84e..bd4cf8ed31 100644 --- a/tests/hp_procurve/show_lldp_info_remote-device_detail/hp_procurve_show_lldp_info_remote-device_detail.yml +++ b/tests/hp_procurve/show_lldp_info_remote-device_detail/hp_procurve_show_lldp_info_remote-device_detail.yml @@ -5,94 +5,94 @@ parsed_sample: chassis_id: "3821c7-c1cd00" local_interface: "1" neighbor_chassis_type: "mac-address" + neighbor_description: "Aruba JL357A 2540-48G-PoE+-4SFP+ Switch, revision YC.16.0..." + neighbor_interface: "1" neighbor_interface_description: "1" neighbor_name: "65432p-swi006-abcd-srvroom-4asd" - neighbor_portid: "1" port_type: "local" remote_management_address: "192.168.130.100" - system_descr: "Aruba JL357A 2540-48G-PoE+-4SFP+ Switch, revision YC.16.0..." vlan_id: "0" - capabilities: "" capabilities_supported: "" chassis_id: "3ce1a1-2218f0" local_interface: "3" neighbor_chassis_type: "mac-address" + neighbor_description: "" + neighbor_interface: "3c e1 a1 22 18 f0" neighbor_interface_description: "" neighbor_name: "" - neighbor_portid: "3c e1 a1 22 18 f0" port_type: "mac-address" remote_management_address: "" - system_descr: "" vlan_id: "" - capabilities: "bridge, wlan-access-point" capabilities_supported: "bridge, wlan-access-point" chassis_id: "bcf310-1f8b40" local_interface: "7" neighbor_chassis_type: "mac-address" + neighbor_description: "" + neighbor_interface: "mgt0" neighbor_interface_description: "" neighbor_name: "AH-cust-AP21" - neighbor_portid: "mgt0" port_type: "interface-name" remote_management_address: "192.168.100.55" - system_descr: "" vlan_id: "" - capabilities: "" capabilities_supported: "" chassis_id: "d8cb8a-6d303c" local_interface: "25" neighbor_chassis_type: "mac-address" + neighbor_description: "" + neighbor_interface: "d8 cb 8a 6d 30 3c" neighbor_interface_description: "" neighbor_name: "" - neighbor_portid: "d8 cb 8a 6d 30 3c" port_type: "mac-address" remote_management_address: "" - system_descr: "" vlan_id: "" - capabilities: "" capabilities_supported: "" chassis_id: "484d7e-e66c42" local_interface: "29" neighbor_chassis_type: "mac-address" + neighbor_description: "" + neighbor_interface: "48 4d 7e e6 6c 42" neighbor_interface_description: "" neighbor_name: "" - neighbor_portid: "48 4d 7e e6 6c 42" port_type: "mac-address" remote_management_address: "" - system_descr: "" vlan_id: "" - capabilities: "bridge, wlan-access-point, router" capabilities_supported: "bridge, wlan-access-point, router" chassis_id: "603197-7aa548" local_interface: "36" neighbor_chassis_type: "mac-address" + neighbor_description: "ZLD 6.00(###.8)B1 (cannon)" + neighbor_interface: "1" neighbor_interface_description: "UPLINK" neighbor_name: "NAP203" - neighbor_portid: "1" port_type: "local" remote_management_address: "192.168.100.50" - system_descr: "ZLD 6.00(###.8)B1 (cannon)" vlan_id: "" - capabilities: "" capabilities_supported: "" chassis_id: "b00cd1-359a98" local_interface: "37" neighbor_chassis_type: "mac-address" + neighbor_description: "" + neighbor_interface: "b0 0c d1 35 9a 98" neighbor_interface_description: "" neighbor_name: "" - neighbor_portid: "b0 0c d1 35 9a 98" port_type: "mac-address" remote_management_address: "" - system_descr: "" vlan_id: "" - capabilities: "" capabilities_supported: "" chassis_id: "d8cb8a-894644" local_interface: "42" neighbor_chassis_type: "mac-address" + neighbor_description: "" + neighbor_interface: "d8 cb 8a 89 46 44" neighbor_interface_description: "" neighbor_name: "" - neighbor_portid: "d8 cb 8a 89 46 44" port_type: "mac-address" remote_management_address: "" - system_descr: "" vlan_id: "" From 2d260f17eed402f608f8227760bcff50b67a92b3 Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sun, 3 Sep 2023 14:05:54 -0400 Subject: [PATCH 27/41] normalize aruba_aoscx_show_lldp_neighbors-info_detail with other CDP or LLDP templates - replace CHASSIS_DESC with NEIGHBOR_DESCRIPTION - replace PORT_ID with NEIGHBOR_PORT_ID --- ...cx_show_lldp_neighbors-info_detail.textfsm | 10 ++++---- .../show_lldp_neighbors-info_detail.yml | 24 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ntc_templates/templates/aruba_aoscx_show_lldp_neighbors-info_detail.textfsm b/ntc_templates/templates/aruba_aoscx_show_lldp_neighbors-info_detail.textfsm index ede58121e8..0308cf2db4 100644 --- a/ntc_templates/templates/aruba_aoscx_show_lldp_neighbors-info_detail.textfsm +++ b/ntc_templates/templates/aruba_aoscx_show_lldp_neighbors-info_detail.textfsm @@ -1,11 +1,11 @@ Value Required LOCAL_INTERFACE (\S+) Value Required CHASSIS_ID (\S+) Value NEIGHBOR_NAME (\S+) -Value CHASSIS_DESC (.+) +Value NEIGHBOR_DESCRIPTION (.+) Value CAPABILITIES_SUPPORTED (.+) Value CAPABILITIES (.+) Value MGMT_ADDR (\S+) -Value PORT_ID (\S+) +Value NEIGHBOR_PORT_ID (\S+) Value NEIGHBOR_INTERFACE (\S+) @@ -13,13 +13,13 @@ Start ^Port\s*:\s*${LOCAL_INTERFACE} ^Neighbor\s*Chassis-Name\s*:\s*${NEIGHBOR_NAME} ^Neighbor\s+System-Name\s*:\s*${NEIGHBOR_NAME} - ^Neighbor\s*Chassis-Description\s*:\s*${CHASSIS_DESC} - ^Neighbor\s+System-Description\s*:\s*${CHASSIS_DESC} + ^Neighbor\s*Chassis-Description\s*:\s*${NEIGHBOR_DESCRIPTION} + ^Neighbor\s+System-Description\s*:\s*${NEIGHBOR_DESCRIPTION} ^Neighbor\s*Chassis-ID\s*:\s*${CHASSIS_ID} ^Neighbor\s*Management-Address\s*:\s*${MGMT_ADDR} ^Chassis\s*Capabilities\s*Available\s*:\s*${CAPABILITIES_SUPPORTED} ^Chassis\s*Capabilities\s*Enabled\s*:\s*${CAPABILITIES} - ^Neighbor\s*Port-ID\s*:\s*${PORT_ID} + ^Neighbor\s*Port-ID\s*:\s*${NEIGHBOR_PORT_ID} ^Neighbor\s*Port-Desc\s*:\s*${NEIGHBOR_INTERFACE} ^-+$$ -> Record ^Neighbor\.* diff --git a/tests/aruba_aoscx/show_lldp_neighbors-info_detail/show_lldp_neighbors-info_detail.yml b/tests/aruba_aoscx/show_lldp_neighbors-info_detail/show_lldp_neighbors-info_detail.yml index d4e7a9d0cf..3884307776 100644 --- a/tests/aruba_aoscx/show_lldp_neighbors-info_detail/show_lldp_neighbors-info_detail.yml +++ b/tests/aruba_aoscx/show_lldp_neighbors-info_detail/show_lldp_neighbors-info_detail.yml @@ -2,55 +2,55 @@ parsed_sample: - capabilities: "WLAN" capabilities_supported: "Bridge, WLAN" - chassis_desc: "ArubaOS (MODEL: 335), Version Aruba AP" chassis_id: "70:3a:0e:cd:41:fe" local_interface: "1/1/1" mgmt_addr: "10.252.99.12" + neighbor_description: "ArubaOS (MODEL: 335), Version Aruba AP" neighbor_interface: "eth0" neighbor_name: "ap-9999-335-fe" - port_id: "70:3a:0e:cd:41:fe" + neighbor_port_id: "70:3a:0e:cd:41:fe" - capabilities: "WLAN" capabilities_supported: "Bridge, WLAN" - chassis_desc: "ArubaOS (MODEL: 535), Version Aruba AP" chassis_id: "00:4e:35:c5:d2:2e" local_interface: "1/1/2" mgmt_addr: "10.252.99.11" + neighbor_description: "ArubaOS (MODEL: 535), Version Aruba AP" neighbor_interface: "eth0" neighbor_name: "ap-9999-535-fe" - port_id: "00:4e:35:c5:d2:2e" + neighbor_port_id: "00:4e:35:c5:d2:2e" - capabilities: "Bridge, Router" capabilities_supported: "Bridge, Router" - chassis_desc: "Aruba JL635A GL.10.05.0021" chassis_id: "90:20:c2:bf:ae:00" local_interface: "1/1/52" mgmt_addr: "10.252.15.17" + neighbor_description: "Aruba JL635A GL.10.05.0021" neighbor_interface: "1/1/1" neighbor_name: "rtr-agg-0620-a" - port_id: "1/1/1" + neighbor_port_id: "1/1/1" - capabilities: "WLAN" capabilities_supported: "Bridge, WLAN" - chassis_desc: "ArubaOS (MODEL: 335), Version Aruba AP" chassis_id: "70:3a:0e:cd:41:fe" local_interface: "2/1/1" mgmt_addr: "10.252.99.12" + neighbor_description: "ArubaOS (MODEL: 335), Version Aruba AP" neighbor_interface: "eth1" neighbor_name: "ap-9999-335-fe" - port_id: "70:3a:0e:cd:41:ff" + neighbor_port_id: "70:3a:0e:cd:41:ff" - capabilities: "WLAN" capabilities_supported: "Bridge, WLAN" - chassis_desc: "ArubaOS (MODEL: 535), Version Aruba AP" chassis_id: "00:4e:35:c5:d2:2e" local_interface: "2/1/2" mgmt_addr: "10.252.99.11" + neighbor_description: "ArubaOS (MODEL: 535), Version Aruba AP" neighbor_interface: "eth1" neighbor_name: "ap-9999-535-fe" - port_id: "00:4e:35:c5:d2:2f" + neighbor_port_id: "00:4e:35:c5:d2:2f" - capabilities: "Bridge, Router" capabilities_supported: "Bridge, Router" - chassis_desc: "Aruba JL635A GL.10.05.0021" chassis_id: "90:20:c2:bf:ed:00" local_interface: "2/1/52" mgmt_addr: "10.252.15.18" + neighbor_description: "Aruba JL635A GL.10.05.0021" neighbor_interface: "1/1/1" neighbor_name: "rtr-agg-0620-b" - port_id: "1/1/1" + neighbor_port_id: "1/1/1" From 4396e50bf352740f6256c93bb9e72359fb167701 Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sun, 3 Sep 2023 15:35:58 -0400 Subject: [PATCH 28/41] replace SYSTEM_DESCRIPTION with NEIGHBOR_DESCRIPTION to normalize cisco_ios_show_lldp_neighbors_detail --- docs/dev/data_model.md | 72 ++++++++++--------- ...sco_ios_show_lldp_neighbors_detail.textfsm | 4 +- .../cisco_ios_show_lldp_neighbors_detail1.yml | 10 +-- .../cisco_ios_show_lldp_neighbors_detail2.yml | 18 ++--- .../cisco_ios_show_lldp_neighbors_detail3.yml | 2 +- .../cisco_ios_show_lldp_neighbors_detail4.yml | 6 +- .../cisco_ios_show_lldp_neighbors_detail5.yml | 10 +-- 7 files changed, 62 insertions(+), 60 deletions(-) diff --git a/docs/dev/data_model.md b/docs/dev/data_model.md index 8527998f70..e5e140823f 100644 --- a/docs/dev/data_model.md +++ b/docs/dev/data_model.md @@ -18,38 +18,40 @@ Example: Imagine the extra programming logic needed to consume structured data w # Common Capture Groups -| Capture Group | Usage Description | -|---------------------------|:------------------| -| `BIA` | use this if the template already has MAC_ADDRESS in use for the active MAC address | -| `BUNDLE_NAME` | virtual interface name for etherchannel, LACP, LAG, or port-channel interfaces | -| `BUNDLE_PROTOCOL` | virtual interface protocol type (LACP, PAgP) for etherchannel or port-channel interfaces | -| `BUNDLE_PROTOCOL_STATE` | virtual interface protocol state for etherchannel or port-channel interfaces | -| `BUNDLE_STATUS` | virtual interface status for etherchannel, LACP, LAG, or port-channel interfaces | -| `CAPABILITIES` | often represents active/operational neighbor capabilities shared via CDP or LLDP | -| `CAPABILITIES_SUPPORTED` | often represents neighbor capabilities from CDP or LLDP | -| `DESCRIPTION` | often used for port or interface descriptions | -| `GATEWAY` | gateway address for a subnet | -| `INTERFACE` | full word instead of IFACE, INTF, INTFC, etc | -| `IP_ADDRESS` | for a single IP address, often IPv4 | -| `IP_ADDRESSES` | for lists of IPv4 addresses, but in the case of some templates there may be a mix of IP protocol versions | -| `IP_HELPER` | for lists DHCP IP helper addresses | -| `IP_VERSION` | Internet Protocol (IP) version in the case of multiple versions appearing in output (use where necessary) | -| `IPV6_ADDRESS` | for a single IPv6 address | -| `IPV6_ADDRESSES` | for lists of IPv6 addresses | -| `IPV6_GATEWAY` | for IPv6 gateway address | -| `LOCAL_INTERFACE` | often represents local interface or port for CDP or LLDP | -| `LOCAL_IP_ADDRESS` | local IP address in the case of First Hop Redundancy Protocols (FHRP) | -| `MAC_ADDRESS` | instead of MAC or MACADDR | -| `MEMBER_INTERFACE` | list of physical member interface names that are bundled to make an etherchannel, LACP, LAG, or port-channel interface | -| `MEMBER_INTERFACE_STATUS` | list of member interface statuses for an etherchannel, LACP, LAG, or port-channel interface | -| `MGMT_IP_ADDRESS` | instead of MGMT_IP or MGMT_ADDRESS or MANAGEMENT_IP or REMOTE_MANAGEMENT_ADDRESS | -| `NEIGHBOR_ID` | for router IDs remote to the system being parsed | -| `NEIGHBOR_INTERFACE` | often represents neighbor or remote interface or port for CDP or LLDP | -| `NEIGHBOR_NAME` | often represents neighbor name for CDP or LLDP | -| `NETMASK` | for IPv4 dotted quad masks | -| `NETWORK` | for network numbers or subnet address (without the mask or prefix/slash notation); in place of ROUTE | -| `PREFIX_LENGTH` | instead of PREFIX or CIDR for the numbers of a slash notation or CIDR mask | -| `PROTOCOL` | instead of PROTO | -| `ROUTER_ID` | for local router IDs (local to the device being parsed) | -| `VLAN_ID` | instead of VLAN or TAG | -| `VLAN_NAME` | VLAN name or description | +| Capture Group | Usage Description | +|----------------------------------|:------------------| +| `BIA` | use this if the template already has MAC_ADDRESS in use for the active MAC address | +| `BUNDLE_NAME` | virtual interface name for etherchannel, LACP, LAG, or port-channel interfaces | +| `BUNDLE_PROTOCOL` | virtual interface protocol type (LACP, PAgP) for etherchannel or port-channel interfaces | +| `BUNDLE_PROTOCOL_STATE` | virtual interface protocol state for etherchannel or port-channel interfaces | +| `BUNDLE_STATUS` | virtual interface status for etherchannel, LACP, LAG, or port-channel interfaces | +| `CAPABILITIES` | often represents active/operational neighbor capabilities shared via CDP or LLDP | +| `CAPABILITIES_SUPPORTED` | often represents neighbor capabilities from CDP or LLDP | +| `DESCRIPTION` | often used for port or interface descriptions | +| `GATEWAY` | gateway address for a subnet | +| `INTERFACE` | full word instead of IFACE, INTF, INTFC, etc | +| `IP_ADDRESS` | for a single IP address, often IPv4 | +| `IP_ADDRESSES` | for lists of IPv4 addresses, but in the case of some templates there may be a mix of IP protocol versions | +| `IP_HELPER` | for lists DHCP IP helper addresses | +| `IP_VERSION` | Internet Protocol (IP) version in the case of multiple versions appearing in output (use where necessary) | +| `IPV6_ADDRESS` | for a single IPv6 address | +| `IPV6_ADDRESSES` | for lists of IPv6 addresses | +| `IPV6_GATEWAY` | for IPv6 gateway address | +| `LOCAL_INTERFACE` | often represents local interface or port for CDP or LLDP | +| `LOCAL_IP_ADDRESS` | local IP address in the case of First Hop Redundancy Protocols (FHRP) | +| `MAC_ADDRESS` | instead of MAC or MACADDR | +| `MEMBER_INTERFACE` | list of physical member interface names that are bundled to make an etherchannel, LACP, LAG, or port-channel interface | +| `MEMBER_INTERFACE_STATUS` | list of member interface statuses for an etherchannel, LACP, LAG, or port-channel interface | +| `MGMT_IP_ADDRESS` | instead of MGMT_IP or MGMT_ADDRESS or MANAGEMENT_IP or REMOTE_MANAGEMENT_ADDRESS | +| `NEIGHBOR_DESCRIPTION` | often represents CDP or LLDP neighbor or system name description | +| `NEIGHBOR_ID` | for router IDs remote to the system being parsed | +| `NEIGHBOR_INTERFACE` | often represents neighbor or remote interface or port for CDP or LLDP | +| `NEIGHBOR_INTERFACE_DESCRIPTION` | represents CDP or LLDP neighbor (remote host) interface or port descriptions (Note: see NEIGHBOR_INTERFACE) | +| `NEIGHBOR_NAME` | often represents neighbor name for CDP or LLDP | +| `NETMASK` | for IPv4 dotted quad masks | +| `NETWORK` | for network numbers or subnet address (without the mask or prefix/slash notation); in place of ROUTE | +| `PREFIX_LENGTH` | instead of PREFIX or CIDR for the numbers of a slash notation or CIDR mask | +| `PROTOCOL` | instead of PROTO | +| `ROUTER_ID` | for local router IDs (local to the device being parsed) | +| `VLAN_ID` | instead of VLAN or TAG | +| `VLAN_NAME` | VLAN name or description | diff --git a/ntc_templates/templates/cisco_ios_show_lldp_neighbors_detail.textfsm b/ntc_templates/templates/cisco_ios_show_lldp_neighbors_detail.textfsm index dfa2ce8bf6..9761ebe101 100644 --- a/ntc_templates/templates/cisco_ios_show_lldp_neighbors_detail.textfsm +++ b/ntc_templates/templates/cisco_ios_show_lldp_neighbors_detail.textfsm @@ -3,7 +3,7 @@ Value CHASSIS_ID ([^:]+) Value NEIGHBOR_PORT_ID (.*) Value NEIGHBOR_INTERFACE (.*) Value NEIGHBOR_NAME (.+?) -Value SYSTEM_DESCRIPTION (.*) +Value NEIGHBOR_DESCRIPTION (.*) Value CAPABILITIES (.*) Value MANAGEMENT_IP (\S+) Value VLAN_ID (\d+) @@ -69,7 +69,7 @@ Start ^.*$$ -> Error GetDescription - ^${SYSTEM_DESCRIPTION} -> IgnoreDescription + ^${NEIGHBOR_DESCRIPTION} -> IgnoreDescription IgnoreDescription ^Time\s+remaining -> Start diff --git a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail1.yml b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail1.yml index 2e830d7d23..d50ff2471f 100644 --- a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail1.yml +++ b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail1.yml @@ -9,6 +9,8 @@ parsed_sample: management_ip: "" manufacturer: "" model: "" + neighbor_description: "Juniper Networks, Inc. ex2200-24t-4g , version 12.3R9.4\ + \ Build date: 2015-02-12 11:25:30 UTC" neighbor_interface: "ge-0/0/0.0" neighbor_name: "" neighbor_port_id: "502" @@ -20,8 +22,6 @@ parsed_sample: power_source: "" serial: "" sw_revision: "" - system_description: "Juniper Networks, Inc. ex2200-24t-4g , version 12.3R9.4 Build\ - \ date: 2015-02-12 11:25:30 UTC" vlan_id: "1" - capabilities: "B" chassis_id: "94f1.2879.5555" @@ -32,6 +32,8 @@ parsed_sample: management_ip: "192.168.1.81" manufacturer: "" model: "" + neighbor_description: "HPE OfficeConnect Switch 1820 48G J9981A, PT.02.01, Linux\ + \ 3.6.5-79c95a77, U-Boot 2012.10-00116-g3ab515c (Jul 30 2014 - 10:52:01)" neighbor_interface: "13" neighbor_name: "HpSwitch" neighbor_port_id: "94f1.2879.5555" @@ -43,8 +45,6 @@ parsed_sample: power_source: "" serial: "" sw_revision: "" - system_description: "HPE OfficeConnect Switch 1820 48G J9981A, PT.02.01, Linux\ - \ 3.6.5-79c95a77, U-Boot 2012.10-00116-g3ab515c (Jul 30 2014 - 10:52:01)" vlan_id: "" - capabilities: "W" chassis_id: "4448.c1c4.dddd" @@ -55,6 +55,7 @@ parsed_sample: management_ip: "192.168.1.40" manufacturer: "" model: "" + neighbor_description: "ArubaOS (MODEL: 225), Version 6.4.2.6-4.1.1.6 (50009)" neighbor_interface: "eth0" neighbor_name: "44:48:c1:c4:dd:dd" neighbor_port_id: "4448.c1c4.dddd" @@ -66,5 +67,4 @@ parsed_sample: power_source: "" serial: "" sw_revision: "" - system_description: "ArubaOS (MODEL: 225), Version 6.4.2.6-4.1.1.6 (50009)" vlan_id: "" diff --git a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail2.yml b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail2.yml index 7137b3d4fc..fff977828f 100644 --- a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail2.yml +++ b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail2.yml @@ -9,6 +9,9 @@ parsed_sample: management_ip: "11.11.11.11" manufacturer: "" model: "" + neighbor_description: "Cisco NX-OS(tm) n7700, Software (n7700-s2-dk9), Version\ + \ 6.2(10), RELEASE SOFTWARE Copyright (c) 2002-2013 by Cisco Systems, Inc. Compiled\ + \ 10/9/2014 12:00:00" neighbor_interface: "PO2631-10Gx2-R261R5" neighbor_name: "USSC-CAMPUS-CORE-GW2" neighbor_port_id: "Eth1/6" @@ -20,9 +23,6 @@ parsed_sample: power_source: "" serial: "" sw_revision: "" - system_description: "Cisco NX-OS(tm) n7700, Software (n7700-s2-dk9), Version 6.2(10),\ - \ RELEASE SOFTWARE Copyright (c) 2002-2013 by Cisco Systems, Inc. Compiled 10/9/2014\ - \ 12:00:00" vlan_id: "1" - capabilities: "B,R" chassis_id: "2222.0642.7333" @@ -33,6 +33,9 @@ parsed_sample: management_ip: "33.33.33.3" manufacturer: "" model: "" + neighbor_description: "Cisco NX-OS(tm) n7700, Software (n7700-s2-dk9), Version\ + \ 6.2(10), RELEASE SOFTWARE Copyright (c) 2002-2013 by Cisco Systems, Inc. Compiled\ + \ 10/9/2014 12:00:00" neighbor_interface: "PO2631-10Gx2-R261R5" neighbor_name: "USSC-CAMPUS-CORE-GW1.acme123.com" neighbor_port_id: "Eth1/6" @@ -44,9 +47,6 @@ parsed_sample: power_source: "" serial: "" sw_revision: "" - system_description: "Cisco NX-OS(tm) n7700, Software (n7700-s2-dk9), Version 6.2(10),\ - \ RELEASE SOFTWARE Copyright (c) 2002-2013 by Cisco Systems, Inc. Compiled 10/9/2014\ - \ 12:00:00" vlan_id: "1" - capabilities: "B" chassis_id: "0015.2222.c330" @@ -57,6 +57,8 @@ parsed_sample: management_ip: "55.55.55.55" manufacturer: "" model: "" + neighbor_description: "Cisco IOS Software, C3750 Software (C3750-IPSERVICESK9-M),\ + \ Version 12.2(53)SE2, RELEASE SOFTWARE (fc3)" neighbor_interface: "GigabitEthernet2/0/24" neighbor_name: "DMZ-SW1" neighbor_port_id: "Gi2/0/24" @@ -68,8 +70,6 @@ parsed_sample: power_source: "" serial: "" sw_revision: "" - system_description: "Cisco IOS Software, C3750 Software (C3750-IPSERVICESK9-M),\ - \ Version 12.2(53)SE2, RELEASE SOFTWARE (fc3)" vlan_id: "" - capabilities: "" chassis_id: "0022.1111.2222" @@ -80,6 +80,7 @@ parsed_sample: management_ip: "" manufacturer: "" model: "" + neighbor_description: "" neighbor_interface: "" neighbor_name: "" neighbor_port_id: "g2" @@ -91,5 +92,4 @@ parsed_sample: power_source: "" serial: "" sw_revision: "" - system_description: "" vlan_id: "" diff --git a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail3.yml b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail3.yml index 6e52164521..525c974c4b 100644 --- a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail3.yml +++ b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail3.yml @@ -9,6 +9,7 @@ parsed_sample: management_ip: "10.10.0.1" manufacturer: "Cisco Systems, Inc." model: "CP-7962G" + neighbor_description: "Cisco IP Phone 7962G,V12, SCCP42.9-3-1ES27S" neighbor_interface: "SW PORT" neighbor_name: "SEPC8F9F9D61BC2" neighbor_port_id: "C8F9F9D61BC2:P1" @@ -20,5 +21,4 @@ parsed_sample: power_source: "" serial: "FCH1610A5S5" sw_revision: "SCCP42.9-3-1ES27S" - system_description: "Cisco IP Phone 7962G,V12, SCCP42.9-3-1ES27S" vlan_id: "" diff --git a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail4.yml b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail4.yml index 49d2bc748b..5e8f432895 100644 --- a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail4.yml +++ b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail4.yml @@ -9,6 +9,7 @@ parsed_sample: management_ip: "" manufacturer: "ZULTYS" model: "ZIP 33G" + neighbor_description: "ZULTYS IP Phone" neighbor_interface: "WAN PORT" neighbor_name: "ZULTYS IP Phone" neighbor_port_id: "000b.ea00.16e0" @@ -20,7 +21,6 @@ parsed_sample: power_source: "" serial: "000bea0016e0" sw_revision: "47.80.132.1" - system_description: "ZULTYS IP Phone" vlan_id: "" - capabilities: "B,R" chassis_id: "2c33.1100.a6c0" @@ -31,6 +31,8 @@ parsed_sample: management_ip: "172.16.0.10" manufacturer: "" model: "" + neighbor_description: "Cisco IOS Software, s6t64 Software (s6t64-ADVENTERPRISEK9-M),\ + \ Version 15.4(1)SY3, RELEASE SOFTWARE (fc4)" neighbor_interface: "asw22" neighbor_name: "dsw01" neighbor_port_id: "Te1/2/13" @@ -42,6 +44,4 @@ parsed_sample: power_source: "" serial: "" sw_revision: "" - system_description: "Cisco IOS Software, s6t64 Software (s6t64-ADVENTERPRISEK9-M),\ - \ Version 15.4(1)SY3, RELEASE SOFTWARE (fc4)" vlan_id: "1" diff --git a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail5.yml b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail5.yml index e3a10934e5..0be63dd7e9 100644 --- a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail5.yml +++ b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail5.yml @@ -9,6 +9,7 @@ parsed_sample: management_ip: "172.31.176.154" manufacturer: "" model: "" + neighbor_description: "Cisco AP Software, ap3g3-k9w8 Version: 8.10.162.0" neighbor_interface: "eth0" neighbor_name: "system1" neighbor_port_id: "0" @@ -20,7 +21,6 @@ parsed_sample: power_source: "" serial: "" sw_revision: "" - system_description: "Cisco AP Software, ap3g3-k9w8 Version: 8.10.162.0" vlan_id: "" - capabilities: "S" chassis_id: "0004.7a2a.bbbb" @@ -31,6 +31,7 @@ parsed_sample: management_ip: "10.132.14.52" manufacturer: "" model: "" + neighbor_description: "Dragonfly" neighbor_interface: "eth0" neighbor_name: "system2" neighbor_port_id: "0004.7a2a.bbbb" @@ -42,7 +43,6 @@ parsed_sample: power_source: "PSE" serial: "" sw_revision: "" - system_description: "Dragonfly" vlan_id: "" - capabilities: "S" chassis_id: "0004.7a2a.cccc" @@ -53,6 +53,7 @@ parsed_sample: management_ip: "10.132.14.53" manufacturer: "" model: "" + neighbor_description: "Dragonfly" neighbor_interface: "eth0" neighbor_name: "system3" neighbor_port_id: "0004.7a2a.cccc" @@ -64,7 +65,6 @@ parsed_sample: power_source: "PSE" serial: "" sw_revision: "" - system_description: "Dragonfly" vlan_id: "" - capabilities: "B,S" chassis_id: "S7-1200 6DS7 212-1BH40-0XB0 S V-LCCC5820 \ @@ -76,6 +76,8 @@ parsed_sample: management_ip: "10.176.0.245" manufacturer: "" model: "" + neighbor_description: "Siemens, SIMATIC S7, CPU-1200, 6ES7 211-1CC40-0XB0, HW:\ + \ 10, FW: V.4.3.1, S V-LDCE8620" neighbor_interface: "Siemens, SIMATIC S7, Ethernet Port, X1 P1" neighbor_name: "" neighbor_port_id: "port-001.ploobdfad" @@ -87,6 +89,4 @@ parsed_sample: power_source: "" serial: "" sw_revision: "" - system_description: "Siemens, SIMATIC S7, CPU-1200, 6ES7 211-1CC40-0XB0, HW: 10,\ - \ FW: V.4.3.1, S V-LDCE8620" vlan_id: "" From 0f2f207a4ad867ac2ad0fdb0dbd26c76bb83d932 Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sun, 3 Sep 2023 15:39:59 -0400 Subject: [PATCH 29/41] replace SYSTEM_DESCRIPTION with NEIGHBOR_DESCRIPTION to normalize cisco_nxos_show_lldp_neighbors_detail --- .../cisco_nxos_show_lldp_neighbors_detail.textfsm | 4 ++-- .../cisco_nxos_show_lldp_neighbors_detail.yml | 10 +++++----- .../cisco_nxos_show_lldp_neighbors_detail2.yml | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ntc_templates/templates/cisco_nxos_show_lldp_neighbors_detail.textfsm b/ntc_templates/templates/cisco_nxos_show_lldp_neighbors_detail.textfsm index 6f1f58b07c..d101d2da0d 100644 --- a/ntc_templates/templates/cisco_nxos_show_lldp_neighbors_detail.textfsm +++ b/ntc_templates/templates/cisco_nxos_show_lldp_neighbors_detail.textfsm @@ -3,7 +3,7 @@ Value Required LOCAL_INTERFACE (\S+) Value Required NEIGHBOR_INTERFACE (\S+) Value CHASSIS_ID (\w+?\.\w+?\.\w+?) Value MGMT_ADDRESS (\d+?\.\d+?\.\d+?\.\d+?|\w+?\.\w+?\.\w+?) -Value SYSTEM_DESCRIPTION (.*) +Value NEIGHBOR_DESCRIPTION (.*) Value CAPABILITIES (.*) Value VLAN_ID ([0-9]+) @@ -13,7 +13,7 @@ Start ^[Pp]ort\s[idID]{2}\:\s${NEIGHBOR_INTERFACE}$$ ^[Ll]ocal\s[Pp]ort\s[idID]{2}\:\s${LOCAL_INTERFACE}$$ ^[Ss]ystem\s[Nn]ame\:\s${NEIGHBOR_NAME}$$ - ^[Ss]ystem\s[Dd]escription\:\s${SYSTEM_DESCRIPTION}$$ + ^[Ss]ystem\s[Dd]escription\:\s${NEIGHBOR_DESCRIPTION}$$ ^[Ee]nabled\s[Cc]apabilities\:\s${CAPABILITIES}$$ ^[Mm]anagement\s[Aa]ddress\:\s${MGMT_ADDRESS}$$ ^[Vv]lan\s[idID]{2}\:\s${VLAN_ID}$$ -> Record diff --git a/tests/cisco_nxos/show_lldp_neighbors_detail/cisco_nxos_show_lldp_neighbors_detail.yml b/tests/cisco_nxos/show_lldp_neighbors_detail/cisco_nxos_show_lldp_neighbors_detail.yml index d7c0beab67..e9a78fc581 100644 --- a/tests/cisco_nxos/show_lldp_neighbors_detail/cisco_nxos_show_lldp_neighbors_detail.yml +++ b/tests/cisco_nxos/show_lldp_neighbors_detail/cisco_nxos_show_lldp_neighbors_detail.yml @@ -4,32 +4,32 @@ parsed_sample: chassis_id: "0014.1c57.a48b" local_interface: "mgmt0" mgmt_address: "10.30.140.1" + neighbor_description: "Cisco IOS Software, C3750 Software (C3750-IPBASEK9-M),\ + \ Version 12.2(44)SE2, RELEASE SOFTWARE (fc2)" neighbor_interface: "Fa1/0/9" neighbor_name: "Switch.cisco.com" - system_description: "Cisco IOS Software, C3750 Software (C3750-IPBASEK9-M), Version\ - \ 12.2(44)SE2, RELEASE SOFTWARE (fc2)" vlan_id: "100" - capabilities: "B, R" chassis_id: "5087.89a1.d8d6" local_interface: "Eth1/1" mgmt_address: "10.30.140.21" + neighbor_description: "Cisco Nexus Operating System (NX-OS) Software 7.0(3)I4(1)" neighbor_interface: "Ethernet1/1" neighbor_name: "n9k2.company.com" - system_description: "Cisco Nexus Operating System (NX-OS) Software 7.0(3)I4(1)" vlan_id: "1" - capabilities: "B, R" chassis_id: "5087.89a1.d8d7" local_interface: "Eth1/2" mgmt_address: "10.30.140.21" + neighbor_description: "Cisco Nexus Operating System (NX-OS) Software 7.0(3)I4(1)" neighbor_interface: "Ethernet1/2" neighbor_name: "n9k2.company.com" - system_description: "Cisco Nexus Operating System (NX-OS) Software 7.0(3)I4(1)" vlan_id: "1" - capabilities: "B, R" chassis_id: "547f.eeaf.7818" local_interface: "Eth2/2" mgmt_address: "10.30.140.30" + neighbor_description: "Cisco Nexus Operating System (NX-OS) Software 6.0(2)U4(1)" neighbor_interface: "Ethernet1/49" neighbor_name: "N3K.cisconxapi.com" - system_description: "Cisco Nexus Operating System (NX-OS) Software 6.0(2)U4(1)" vlan_id: "1" diff --git a/tests/cisco_nxos/show_lldp_neighbors_detail/cisco_nxos_show_lldp_neighbors_detail2.yml b/tests/cisco_nxos/show_lldp_neighbors_detail/cisco_nxos_show_lldp_neighbors_detail2.yml index b0ecf177cc..7a2147b064 100644 --- a/tests/cisco_nxos/show_lldp_neighbors_detail/cisco_nxos_show_lldp_neighbors_detail2.yml +++ b/tests/cisco_nxos/show_lldp_neighbors_detail/cisco_nxos_show_lldp_neighbors_detail2.yml @@ -4,15 +4,15 @@ parsed_sample: chassis_id: "3473.2d00.0001" local_interface: "Eth1/52" mgmt_address: "192.168.1.2" + neighbor_description: "Cisco Nexus Operating System (NX-OS) Software 9.3(8)" neighbor_interface: "Ethernet1/52" neighbor_name: "SW-NEXUS" - system_description: "Cisco Nexus Operating System (NX-OS) Software 9.3(8)" vlan_id: "" - capabilities: "B" chassis_id: "24a9.3700.0001" local_interface: "Eth101/1/10" mgmt_address: "" + neighbor_description: "FlashArray FA-X20R3 pure-storage" neighbor_interface: "1a51.4800.0001" neighbor_name: "pure-storage" - system_description: "FlashArray FA-X20R3 pure-storage" vlan_id: "0" From e0fd61b69a80a61b97e8fbd556ab21d92473ea83 Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sun, 3 Sep 2023 15:46:09 -0400 Subject: [PATCH 30/41] replace SYSTEM_DESCRIPTION with NEIGHBOR_DESCRIPTION to normalize huawei_vrp_display_lldp_neighbor --- .../huawei_vrp_display_lldp_neighbor.textfsm | 8 ++++---- .../huawei_vrp_display_lldp_neighbor.yml | 20 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ntc_templates/templates/huawei_vrp_display_lldp_neighbor.textfsm b/ntc_templates/templates/huawei_vrp_display_lldp_neighbor.textfsm index f8c210c1c7..d8fd619f6d 100644 --- a/ntc_templates/templates/huawei_vrp_display_lldp_neighbor.textfsm +++ b/ntc_templates/templates/huawei_vrp_display_lldp_neighbor.textfsm @@ -5,7 +5,7 @@ Value MODEL_NAME (.*?) Value NEIGHBOR_PORT_ID (.*?) Value NEIGHBOR_INTERFACE (.*?) Value NEIGHBOR_NAME (.+?) -Value List SYSTEM_DESCRIPTION (.*) +Value List NEIGHBOR_DESCRIPTION (.*) Value CAPABILITIES (.*?) Value MANAGEMENT_IP (\S+) Value VLAN_ID (\d+) @@ -21,7 +21,7 @@ Start ^Port\s+ID\s+:${NEIGHBOR_PORT_ID}\s*$$ ^Port\s+description\s+:${NEIGHBOR_INTERFACE}\s*$$ ^System\s+name\s+:${NEIGHBOR_NAME}\s*$$ - ^System\s+description\s+:${SYSTEM_DESCRIPTION} -> SystemDescription + ^System\s+description\s+:${NEIGHBOR_DESCRIPTION} -> SystemDescription ^System\s+capabilities\s+supported ^System\s+capabilities\s+enabled\s+:${CAPABILITIES}\s*$$ ^Management\s+address\s+type @@ -44,11 +44,11 @@ Start ^. -> Error SystemDescription - ^${SYSTEM_DESCRIPTION} -> IgnoreDescription + ^${NEIGHBOR_DESCRIPTION} -> IgnoreDescription IgnoreDescription ^System\s+capabilities\s+supported -> Start - ^${SYSTEM_DESCRIPTION} + ^${NEIGHBOR_DESCRIPTION} ^\s*$$ ^.*$$ -> Error diff --git a/tests/huawei_vrp/display_lldp_neighbor/huawei_vrp_display_lldp_neighbor.yml b/tests/huawei_vrp/display_lldp_neighbor/huawei_vrp_display_lldp_neighbor.yml index b3ce01729c..9d74544e89 100644 --- a/tests/huawei_vrp/display_lldp_neighbor/huawei_vrp_display_lldp_neighbor.yml +++ b/tests/huawei_vrp/display_lldp_neighbor/huawei_vrp_display_lldp_neighbor.yml @@ -6,16 +6,16 @@ parsed_sample: management_ip: "192.168.0.240" manufacturer_name: "Cisco Systems, Inc." model_name: "WS-C2960S-48LPS-L" - neighbor_interface: "GigabitEthernet1/0/1" - neighbor_name: "tsa-2960-sw01" - neighbor_port_id: "Gi1/0/1" - serial: "NA" - system_description: + neighbor_description: - "Cisco IOS Software, C2960S Software (C2960S-UNIVERSALK9-M), Version 12.2(55)SE7,\ \ RELEASE SOFTWARE (fc1)" - "Technical Support: http://www.cisco.com/techsupport" - "Copyright (c) 1986-2013 by Cisco Systems, Inc." - "Compiled Mon 28-Jan-13 10:28 by prod_rel_team" + neighbor_interface: "GigabitEthernet1/0/1" + neighbor_name: "tsa-2960-sw01" + neighbor_port_id: "Gi1/0/1" + serial: "NA" vlan_id: "1" - capabilities: "bridge" chassis_id: "f41f-c2c5-e180" @@ -23,14 +23,14 @@ parsed_sample: management_ip: "192.168.0.241" manufacturer_name: "Cisco Systems, Inc." model_name: "WS-C2960S-48LPS-L" - neighbor_interface: "GigabitEthernet1/0/2" - neighbor_name: "tsa-2960-sw01" - neighbor_port_id: "Gi1/0/2" - serial: "NA" - system_description: + neighbor_description: - "Cisco IOS Software, C2960S Software (C2960S-UNIVERSALK9-M), Version 12.2(55)SE7,\ \ RELEASE SOFTWARE (fc1)" - "Technical Support: http://www.cisco.com/techsupport" - "Copyright (c) 1986-2013 by Cisco Systems, Inc." - "Compiled Mon 28-Jan-13 10:28 by prod_rel_team" + neighbor_interface: "GigabitEthernet1/0/2" + neighbor_name: "tsa-2960-sw01" + neighbor_port_id: "Gi1/0/2" + serial: "NA" vlan_id: "1" From 2169e2f31bca3f54683dd1da6469c2abc19a97f1 Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sun, 3 Sep 2023 16:11:26 -0400 Subject: [PATCH 31/41] - normalize PLATFORM_VERSION with NEIGHBOR_DESCRIPTION in arista_eos_show_lldp_neighbors_detail - normalize SOFTWARE_VERSION with NEIGHBOR_DESCRIPTION in cisco_ios_show_cdp_neighbors_detail --- ...sta_eos_show_lldp_neighbors_detail.textfsm | 4 +- ...isco_ios_show_cdp_neighbors_detail.textfsm | 4 +- .../arista_eos_show_lldp_neighbors_detail.yml | 78 +++++++++---------- .../cisco_ios_show_cdp_neighbors_detail.yml | 18 ++--- .../cisco_ios_show_cdp_neighbors_detail2.yml | 4 +- 5 files changed, 54 insertions(+), 54 deletions(-) diff --git a/ntc_templates/templates/arista_eos_show_lldp_neighbors_detail.textfsm b/ntc_templates/templates/arista_eos_show_lldp_neighbors_detail.textfsm index cfe36eaa18..3876a18237 100644 --- a/ntc_templates/templates/arista_eos_show_lldp_neighbors_detail.textfsm +++ b/ntc_templates/templates/arista_eos_show_lldp_neighbors_detail.textfsm @@ -1,7 +1,7 @@ Value Required NEIGHBOR_NAME (\S+) Value CHASSIS_ID (.+?) Value MGMT_ADDRESS (.+?) -Value PLATFORM_VERSION (.+?) +Value NEIGHBOR_DESCRIPTION (.+?) Value NEIGHBOR_INTERFACE (.+?) Value Filldown LOCAL_INTERFACE (\S+?) Value Filldown NEIGHBOR_COUNT ([1-9]\d*) @@ -15,7 +15,7 @@ Interface ^\s+Chassis ID\s+:\s+${CHASSIS_ID}$$ ^\s+-\s+Port ID type -> Port_ID ^\s+-\s+\S+\s+Name:\s+\"${NEIGHBOR_NAME}\" - ^.*System Description:\s+\"${PLATFORM_VERSION}(\"|$$) + ^.*System Description:\s+\"${NEIGHBOR_DESCRIPTION}(\"|$$) ^\s+\S+\s+Address\s+:\s+${MGMT_ADDRESS}$$ ^\s*$$ -> Record Start diff --git a/ntc_templates/templates/cisco_ios_show_cdp_neighbors_detail.textfsm b/ntc_templates/templates/cisco_ios_show_cdp_neighbors_detail.textfsm index 0c7fca400c..4d55e8888b 100644 --- a/ntc_templates/templates/cisco_ios_show_cdp_neighbors_detail.textfsm +++ b/ntc_templates/templates/cisco_ios_show_cdp_neighbors_detail.textfsm @@ -3,7 +3,7 @@ Value MANAGEMENT_IP (\d+\.\d+\.\d+\.\d+|\w+\.\w+\.\w+) Value PLATFORM (.*) Value NEIGHBOR_INTERFACE (.*) Value LOCAL_INTERFACE (.*) -Value SOFTWARE_VERSION (.*$) +Value NEIGHBOR_DESCRIPTION (.*$) Value CAPABILITIES (.+?) Start @@ -24,4 +24,4 @@ ParseIP ^.* -> Start GetVersion - ^${SOFTWARE_VERSION} -> Record Start + ^${NEIGHBOR_DESCRIPTION} -> Record Start diff --git a/tests/arista_eos/show_lldp_neighbors_detail/arista_eos_show_lldp_neighbors_detail.yml b/tests/arista_eos/show_lldp_neighbors_detail/arista_eos_show_lldp_neighbors_detail.yml index 5abbc5a8bd..84bf5ddfaa 100644 --- a/tests/arista_eos/show_lldp_neighbors_detail/arista_eos_show_lldp_neighbors_detail.yml +++ b/tests/arista_eos/show_lldp_neighbors_detail/arista_eos_show_lldp_neighbors_detail.yml @@ -5,177 +5,177 @@ parsed_sample: local_interface: "Ethernet1" mgmt_address: "2cc2.6081.eaf9" neighbor_count: "1" + neighbor_description: "Arista Networks EOS version 4.15.2F running on an Arista\ + \ Networks vEOS" neighbor_interface: "Ethernet1" neighbor_name: "spine2.company.com" - platform_version: "Arista Networks EOS version 4.15.2F running on an Arista Networks\ - \ vEOS" - age: "12 seconds" chassis_id: "2cc2.6081.eaf9" local_interface: "Ethernet2" mgmt_address: "2cc2.6081.eaf9" neighbor_count: "1" + neighbor_description: "Arista Networks EOS version 4.15.2F running on an Arista\ + \ Networks vEOS" neighbor_interface: "Ethernet2" neighbor_name: "spine2.company.com" - platform_version: "Arista Networks EOS version 4.15.2F running on an Arista Networks\ - \ vEOS" - age: "12 seconds" chassis_id: "2cc2.6081.eaf9" local_interface: "Ethernet3" mgmt_address: "2cc2.6081.eaf9" neighbor_count: "1" + neighbor_description: "Arista Networks EOS version 4.15.2F running on an Arista\ + \ Networks vEOS" neighbor_interface: "Ethernet3" neighbor_name: "spine2.company.com" - platform_version: "Arista Networks EOS version 4.15.2F running on an Arista Networks\ - \ vEOS" - age: "12 seconds" chassis_id: "2cc2.6081.eaf9" local_interface: "Ethernet4" mgmt_address: "2cc2.6081.eaf9" neighbor_count: "1" + neighbor_description: "Arista Networks EOS version 4.15.2F running on an Arista\ + \ Networks vEOS" neighbor_interface: "Ethernet4" neighbor_name: "spine2.company.com" - platform_version: "Arista Networks EOS version 4.15.2F running on an Arista Networks\ - \ vEOS" - age: "27 seconds" chassis_id: "0005.8671.4ec0" local_interface: "Management1" mgmt_address: "10.0.0.31" neighbor_count: "2" + neighbor_description: "Juniper Networks, Inc. vmx internet router, kernel JUNOS\ + \ 15.1F4.15, Build date: 2015-12-23 19:22:55 UTC Copyright (c) 1996-2015 Juniper\ + \ Networks, Inc." neighbor_interface: "fxp0" neighbor_name: "vmx1" - platform_version: "Juniper Networks, Inc. vmx internet router, kernel JUNOS 15.1F4.15,\ - \ Build date: 2015-12-23 19:22:55 UTC Copyright (c) 1996-2015 Juniper Networks,\ - \ Inc." - age: "17 seconds" chassis_id: "2cc2.6081.eaf9" local_interface: "Management1" mgmt_address: "2cc2.6081.eaf9" neighbor_count: "2" + neighbor_description: "Arista Networks EOS version 4.15.2F running on an Arista\ + \ Networks vEOS" neighbor_interface: "Management1" neighbor_name: "spine2.company.com" - platform_version: "Arista Networks EOS version 4.15.2F running on an Arista Networks\ - \ vEOS" - age: "4 seconds" chassis_id: "0050.56eb.3ef3" local_interface: "Ethernet8" mgmt_address: "172.16.2.141" neighbor_count: "3" + neighbor_description: "Arista Networks EOS version 4.15.5M running on an Arista\ + \ Networks CVX" neighbor_interface: "Management1" neighbor_name: "cvx" - platform_version: "Arista Networks EOS version 4.15.5M running on an Arista Networks\ - \ CVX" - age: "29 seconds" chassis_id: "0050.568b.67c8" local_interface: "Ethernet8" mgmt_address: "172.16.2.142" neighbor_count: "3" + neighbor_description: "Arista Networks EOS version 4.15.5M running on an Arista\ + \ Networks CVX" neighbor_interface: "Ethernet1" neighbor_name: "cvx-client-1" - platform_version: "Arista Networks EOS version 4.15.5M running on an Arista Networks\ - \ CVX" - age: "30 seconds" chassis_id: "0050.568b.67c8" local_interface: "Ethernet8" mgmt_address: "172.16.2.142" neighbor_count: "3" + neighbor_description: "Arista Networks EOS version 4.15.5M running on an Arista\ + \ Networks CVX" neighbor_interface: "Management1" neighbor_name: "cvx-client-1" - platform_version: "Arista Networks EOS version 4.15.5M running on an Arista Networks\ - \ CVX" - age: "29 seconds" chassis_id: "7c0e.cecb.659b" local_interface: "Ethernet9" mgmt_address: "7c0e.cecb.659b" neighbor_count: "1" + neighbor_description: "topology/pod-1/node-101" neighbor_interface: "Eth1/23" neighbor_name: "Leaf1.cliqr.com" - platform_version: "topology/pod-1/node-101" - age: "29 seconds" chassis_id: "7c0e.cecb.659c" local_interface: "Ethernet10" mgmt_address: "7c0e.cecb.659c" neighbor_count: "1" + neighbor_description: "topology/pod-1/node-101" neighbor_interface: "Eth1/24" neighbor_name: "Leaf1.cliqr.com" - platform_version: "topology/pod-1/node-101" - age: "21 seconds" chassis_id: "3c8a.b089.9898" local_interface: "Ethernet23" mgmt_address: "" neighbor_count: "1" - neighbor_interface: "527" - neighbor_name: "MX" - platform_version: "Juniper Networks, Inc. mx5-t internet router, kernel JUNOS\ + neighbor_description: "Juniper Networks, Inc. mx5-t internet router, kernel JUNOS\ \ 14.2R5.8, Build date: 2015-11-25 01:57:41 UTC Copyright (c) 1996-2015 Juniper\ \ Networks, Inc." + neighbor_interface: "527" + neighbor_name: "MX" - age: "29 seconds" chassis_id: "0050.560b.66ea" local_interface: "Ethernet33" mgmt_address: "172.16.2.143" neighbor_count: "4" + neighbor_description: "Arista Networks EOS version 4.15.5M running on an Arista\ + \ Networks CVX" neighbor_interface: "Management1" neighbor_name: "cvx-client-2" - platform_version: "Arista Networks EOS version 4.15.5M running on an Arista Networks\ - \ CVX" - age: "29 seconds" chassis_id: "0050.560b.66ea" local_interface: "Ethernet33" mgmt_address: "172.16.2.143" neighbor_count: "4" + neighbor_description: "Arista Networks EOS version 4.15.5M running on an Arista\ + \ Networks CVX" neighbor_interface: "Ethernet1" neighbor_name: "cvx-client-2" - platform_version: "Arista Networks EOS version 4.15.5M running on an Arista Networks\ - \ CVX" - age: "29 seconds" chassis_id: "0050.56ac.4cd9" local_interface: "Ethernet33" mgmt_address: "fe80::250:56ff:feac:4cd9" neighbor_count: "4" + neighbor_description: "Red Hat Enterprise Linux Linux 3.10.0-327.13.1.el7.x86_64\ + \ #1 SMP Mon Feb 29 13:22:02 EST 2016 x86_64" neighbor_interface: "0050.56ac.4cd9" neighbor_name: "aci-compute" - platform_version: "Red Hat Enterprise Linux Linux 3.10.0-327.13.1.el7.x86_64 #1\ - \ SMP Mon Feb 29 13:22:02 EST 2016 x86_64" - age: "29 seconds" chassis_id: "0050.56ac.4e29" local_interface: "Ethernet33" mgmt_address: "fe80::250:56ff:feac:4e29" neighbor_count: "4" + neighbor_description: "Red Hat Enterprise Linux Linux 3.10.0-327.13.1.el7.x86_64\ + \ #1 SMP Mon Feb 29 13:22:02 EST 2016 x86_64" neighbor_interface: "0050.56ac.4e29" neighbor_name: "aci-control" - platform_version: "Red Hat Enterprise Linux Linux 3.10.0-327.13.1.el7.x86_64 #1\ - \ SMP Mon Feb 29 13:22:02 EST 2016 x86_64" - age: "19 seconds" chassis_id: "001c.737d.77fb" local_interface: "Ethernet49/1" mgmt_address: "2.2.2.2" neighbor_count: "1" + neighbor_description: "Arista Networks EOS version 4.15.0FXA running on an Arista\ + \ Networks DCS-7050SX-64" neighbor_interface: "Ethernet49/1" neighbor_name: "R4-Arista-L3-SDNLAB-SW1" - platform_version: "Arista Networks EOS version 4.15.0FXA running on an Arista\ - \ Networks DCS-7050SX-64" - age: "28 seconds" chassis_id: "001c.737d.745f" local_interface: "Ethernet51/1" mgmt_address: "172.16.1.3" neighbor_count: "1" + neighbor_description: "Arista Networks EOS version 4.15.0FXA running on an Arista\ + \ Networks DCS-7050SX-64" neighbor_interface: "Ethernet49/1" neighbor_name: "R4-Arista-L3-SDNLAB-SW2" - platform_version: "Arista Networks EOS version 4.15.0FXA running on an Arista\ - \ Networks DCS-7050SX-64" - age: "28 seconds" chassis_id: "001c.737d.745f" local_interface: "Ethernet52/1" mgmt_address: "172.16.1.3" neighbor_count: "1" + neighbor_description: "Arista Networks EOS version 4.15.0FXA running on an Arista\ + \ Networks DCS-7050SX-64" neighbor_interface: "Ethernet50/1" neighbor_name: "R4-Arista-L3-SDNLAB-SW2" - platform_version: "Arista Networks EOS version 4.15.0FXA running on an Arista\ - \ Networks DCS-7050SX-64" - age: "2 seconds" chassis_id: "0cca.01c0.e8e1" local_interface: "Management1" mgmt_address: "172.16.208.5" neighbor_count: "1" + neighbor_description: "" neighbor_interface: "Management1" neighbor_name: "test-host.domain.com" - platform_version: "" diff --git a/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail.yml b/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail.yml index a1acdd8d1e..065d06975f 100644 --- a/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail.yml +++ b/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail.yml @@ -3,33 +3,33 @@ parsed_sample: - capabilities: "Switch IGMP" local_interface: "GigabitEthernet1/0/16" management_ip: "10.1.1.2" + neighbor_description: "Cisco IOS Software, C2960 Software (C2960-LANBASEK9-M),\ + \ Version 12.2(55)SE9, RELEASE SOFTWARE (fc1)" neighbor_interface: "GigabitEthernet0/1" neighbor_name: "desktop-switch" platform: "cisco WS-C2960-8TC-L" - software_version: "Cisco IOS Software, C2960 Software (C2960-LANBASEK9-M), Version\ - \ 12.2(55)SE9, RELEASE SOFTWARE (fc1)" - capabilities: "Router Switch IGMP" local_interface: "GigabitEthernet1/0/22" management_ip: "10.1.1.1" + neighbor_description: "Cisco IOS Software, 3800 Software (C3825-ADVENTERPRISEK9-M),\ + \ Version 12.4(24)T1, RELEASE SOFTWARE (fc3)" neighbor_interface: "GigabitEthernet0/0" neighbor_name: "ce-router" platform: "Cisco 3825" - software_version: "Cisco IOS Software, 3800 Software (C3825-ADVENTERPRISEK9-M),\ - \ Version 12.4(24)T1, RELEASE SOFTWARE (fc3)" - capabilities: "Host" local_interface: "GigabitEthernet1/0/19" management_ip: "10.1.1.232" + neighbor_description: "Linux 2.6.32-431.20.3.el6.x86_64 #1 SMP Fri Jun 6 18:30:54\ + \ EDT 2014 CCM:10.5.2.10000-5.i386" neighbor_interface: "eth0" neighbor_name: "server" platform: "VMware" - software_version: "Linux 2.6.32-431.20.3.el6.x86_64 #1 SMP Fri Jun 6 18:30:54\ - \ EDT 2014 CCM:10.5.2.10000-5.i386" - capabilities: "Router Switch IGMP" local_interface: "GigabitEthernet0/3" management_ip: "" + neighbor_description: "Cisco IOS Software, vios_l2 Software (vios_l2-ADVENTERPRISEK9-M),\ + \ Version 15.2(CML_NIGHTLY_20150414)FLO_DSGS7, EARLY DEPLOYMENT DEVELOPMENT\ + \ BUILD, synced to DSGS_PI5_POSTCOLLAPSE_TEAM_TRACK_CLONE" neighbor_interface: "GigabitEthernet0/3" neighbor_name: "vIOS-L2-1" platform: "Cisco " - software_version: "Cisco IOS Software, vios_l2 Software (vios_l2-ADVENTERPRISEK9-M),\ - \ Version 15.2(CML_NIGHTLY_20150414)FLO_DSGS7, EARLY DEPLOYMENT DEVELOPMENT\ - \ BUILD, synced to DSGS_PI5_POSTCOLLAPSE_TEAM_TRACK_CLONE" diff --git a/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail2.yml b/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail2.yml index 377bd63a89..abff96e1e7 100644 --- a/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail2.yml +++ b/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail2.yml @@ -3,8 +3,8 @@ parsed_sample: - capabilities: "Switch IGMP" local_interface: "GigabitEthernet0/3" management_ip: "1.1.1.1" + neighbor_description: "Cisco IOS Software, C3560E Software (C3560E-UNIVERSALK9-M),\ + \ Version 12.2(55)SE10, RELEASE SOFTWARE (fc2)" neighbor_interface: "GigabitEthernet0/8" neighbor_name: "switchxxxxx" platform: "cisco WS-C3560X-24P" - software_version: "Cisco IOS Software, C3560E Software (C3560E-UNIVERSALK9-M),\ - \ Version 12.2(55)SE10, RELEASE SOFTWARE (fc2)" From 7ff4ea5a6fbf3a136ab9e989bea2dd53da14e2d8 Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sun, 3 Sep 2023 17:11:51 -0400 Subject: [PATCH 32/41] - replace NEIGHBOR_VERSION with NEIGHBOR_DESCRIPTION in hp_procurve_show_cdp_neighbors_detail - replace SOFTWARE_VERSION with NEIGHBOR_DESCRIPTION in cisco_wlc_ssh_show_cdp_neighbors_detail --- ...isco_wlc_ssh_show_cdp_neighbors_detail.textfsm | 4 ++-- .../hp_procurve_show_cdp_neighbors_detail.textfsm | 4 ++-- .../cisco_wlc_ssh_show_cdp_neighbors_detail.yml | 15 ++++++++------- .../hp_procurve_show_cdp_neighbors_detail.yml | 8 ++++---- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/ntc_templates/templates/cisco_wlc_ssh_show_cdp_neighbors_detail.textfsm b/ntc_templates/templates/cisco_wlc_ssh_show_cdp_neighbors_detail.textfsm index 9a6b5793c0..269f449067 100644 --- a/ntc_templates/templates/cisco_wlc_ssh_show_cdp_neighbors_detail.textfsm +++ b/ntc_templates/templates/cisco_wlc_ssh_show_cdp_neighbors_detail.textfsm @@ -3,7 +3,7 @@ Value MANAGEMENT_IP (\d+\.\d+\.\d+\.\d+|\w+\.\w+\.\w+) Value PLATFORM (.*) Value NEIGHBOR_INTERFACE (.*) Value LOCAL_INTERFACE (.*) -Value SOFTWARE_VERSION (.*$) +Value NEIGHBOR_DESCRIPTION (.*$) Value CAPABILITIES (.*) Start @@ -19,4 +19,4 @@ ParseIP ^.* -> Start GetVersion - ^${SOFTWARE_VERSION} -> Record Start + ^${NEIGHBOR_DESCRIPTION} -> Record Start diff --git a/ntc_templates/templates/hp_procurve_show_cdp_neighbors_detail.textfsm b/ntc_templates/templates/hp_procurve_show_cdp_neighbors_detail.textfsm index 3db1c15490..55d5e4fe07 100644 --- a/ntc_templates/templates/hp_procurve_show_cdp_neighbors_detail.textfsm +++ b/ntc_templates/templates/hp_procurve_show_cdp_neighbors_detail.textfsm @@ -4,7 +4,7 @@ Value NEIGHBOR_ADDRESS (.+?) Value NEIGHBOR_PLATFORM (.+?) Value CAPABILITIES (.+?) Value NEIGHBOR_INTERFACE (.+?) -Value NEIGHBOR_VERSION (.+?) +Value NEIGHBOR_DESCRIPTION (.+?) Start ^\s*CDP\s+neighbors\s+information @@ -15,7 +15,7 @@ Start ^\s*Platform\s*:\s*${NEIGHBOR_PLATFORM}\s*$$ ^\s*Capability\s*:\s*${CAPABILITIES}\s*$$ ^\s*Device\s+Port\s*:\s*${NEIGHBOR_INTERFACE}\s*$$ - ^\s*Version\s*:\s*${NEIGHBOR_VERSION}\s*$$ -> Record + ^\s*Version\s*:\s*${NEIGHBOR_DESCRIPTION}\s*$$ -> Record ^\s*$$ ^\s*---- ^. -> Error diff --git a/tests/cisco_wlc_ssh/show_cdp_neighbors_detail/cisco_wlc_ssh_show_cdp_neighbors_detail.yml b/tests/cisco_wlc_ssh/show_cdp_neighbors_detail/cisco_wlc_ssh_show_cdp_neighbors_detail.yml index 2b530f6c2c..63b50e20f4 100644 --- a/tests/cisco_wlc_ssh/show_cdp_neighbors_detail/cisco_wlc_ssh_show_cdp_neighbors_detail.yml +++ b/tests/cisco_wlc_ssh/show_cdp_neighbors_detail/cisco_wlc_ssh_show_cdp_neighbors_detail.yml @@ -4,26 +4,27 @@ parsed_sample: chassis_id: "AAA.pizza.com(FXS1828Q2JH)" local_interface: "GigabitEthernet0/0/2" management_ip: "1.2.3.4" + neighbor_description: "Cisco Nexus Operating System (NX-OS) Software, Version\ + \ 6.2(10)" neighbor_interface: "Ethernet1/15" platform: "N77-C7706" - software_version: "Cisco Nexus Operating System (NX-OS) Software, Version 6.2(10)" - capabilities: "Router Switch IGMP" chassis_id: "BBB.beer.com" local_interface: "GigabitEthernet0/0/7" management_ip: "172.5.6.7" - neighbor_interface: "GigabitEthernet1/0/11" - platform: "cisco WS-C3750G-12S" - software_version: "Cisco IOS Software, C3750 Software (C3750-IPSERVICESK9-M),\ + neighbor_description: "Cisco IOS Software, C3750 Software (C3750-IPSERVICESK9-M),\ \ Version 12.2(55)SE11, RELEASE SOFTWARE (fc3) Technical Support: http://www.cisco.com/techsupport\ \ Copyright (c) 1986-2016 by Cisco Systems, Inc. Compiled Wed 17-Aug-16 13:28\ \ by prod_rel_team" + neighbor_interface: "GigabitEthernet1/0/11" + platform: "cisco WS-C3750G-12S" - capabilities: "Router Switch IGMP" chassis_id: "CCC.cake.com" local_interface: "GigabitEthernet0/0/8" management_ip: "172.9.10.11" - neighbor_interface: "GigabitEthernet1/0/1" - platform: "cisco WS-C3750G-12S" - software_version: "Cisco IOS Software, C3750 Software (C3750-IPSERVICESK9-M),\ + neighbor_description: "Cisco IOS Software, C3750 Software (C3750-IPSERVICESK9-M),\ \ Version 12.2(55)SE11, RELEASE SOFTWARE (fc3) Technical Support: http://www.cisco.com/techsupport\ \ Copyright (c) 1986-2016 by Cisco Systems, Inc. Compiled Wed 17-Aug-16 13:28\ \ by prod_rel_team" + neighbor_interface: "GigabitEthernet1/0/1" + platform: "cisco WS-C3750G-12S" diff --git a/tests/hp_procurve/show_cdp_neighbors_detail/hp_procurve_show_cdp_neighbors_detail.yml b/tests/hp_procurve/show_cdp_neighbors_detail/hp_procurve_show_cdp_neighbors_detail.yml index 0e1aa34036..50c803886e 100644 --- a/tests/hp_procurve/show_cdp_neighbors_detail/hp_procurve_show_cdp_neighbors_detail.yml +++ b/tests/hp_procurve/show_cdp_neighbors_detail/hp_procurve_show_cdp_neighbors_detail.yml @@ -4,27 +4,27 @@ parsed_sample: chassis_id: "AP01-Site" local_interface: "1" neighbor_address: "10.11.11.16" + neighbor_description: "5.9.1.5-001RAP-6521-60020-WR" neighbor_interface: "ge1" neighbor_platform: "5.9.1.5-001RAP-6521-60020-WR" - neighbor_version: "5.9.1.5-001RAP-6521-60020-WR" - capabilities: "Router" chassis_id: "5c 0e 8b 11 11 11" local_interface: "1" neighbor_address: "10.11.11.16" + neighbor_description: "AP-6521-60020-WR, Version 5.9.1.5-001R" neighbor_interface: "ge1" neighbor_platform: "AP-6521-60020-WR, Version 5.9.1.5-001R" - neighbor_version: "AP-6521-60020-WR, Version 5.9.1.5-001R" - capabilities: "Router" chassis_id: "5c 0e 8b 12 22 22" local_interface: "2" neighbor_address: "Unsupported format" + neighbor_description: "AP-6521-60020-WR, Version 5.9.1.5-001R" neighbor_interface: "ge1" neighbor_platform: "AP-6521-60020-WR, Version 5.9.1.5-001R" - neighbor_version: "AP-6521-60020-WR, Version 5.9.1.5-001R" - capabilities: "Router" chassis_id: "AP02-Site" local_interface: "2" neighbor_address: "10.11.11.17" + neighbor_description: "5.9.1.5-001RAP-6521-60020-WR" neighbor_interface: "ge1" neighbor_platform: "5.9.1.5-001RAP-6521-60020-WR" - neighbor_version: "5.9.1.5-001RAP-6521-60020-WR" From b5ce002f1a19cfbcaf76f8dbe148ca21a71d2eee Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sun, 3 Sep 2023 18:30:05 -0400 Subject: [PATCH 33/41] replace NEIGHBOR_CHASSIS_ID with CHASSIS_ID in hp_procurve_show_lldp_info_remote-device to normalize --- docs/dev/data_model.md | 3 +- ...curve_show_lldp_info_remote-device.textfsm | 8 ++--- ..._procurve_show_lldp_info_remote-device.yml | 32 +++++++++---------- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/docs/dev/data_model.md b/docs/dev/data_model.md index e5e140823f..56a301221e 100644 --- a/docs/dev/data_model.md +++ b/docs/dev/data_model.md @@ -26,7 +26,8 @@ Example: Imagine the extra programming logic needed to consume structured data w | `BUNDLE_PROTOCOL_STATE` | virtual interface protocol state for etherchannel or port-channel interfaces | | `BUNDLE_STATUS` | virtual interface status for etherchannel, LACP, LAG, or port-channel interfaces | | `CAPABILITIES` | often represents active/operational neighbor capabilities shared via CDP or LLDP | -| `CAPABILITIES_SUPPORTED` | often represents neighbor capabilities from CDP or LLDP | +| `CAPABILITIES_SUPPORTED` | often represents supported neighbor capabilities shared via CDP or LLDP | +| `CHASSIS_ID` | often represents CDP or LLDP neighbor chassis ID | | `DESCRIPTION` | often used for port or interface descriptions | | `GATEWAY` | gateway address for a subnet | | `INTERFACE` | full word instead of IFACE, INTF, INTFC, etc | diff --git a/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device.textfsm b/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device.textfsm index dbc14d3f04..1fab4b128b 100644 --- a/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device.textfsm +++ b/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device.textfsm @@ -1,5 +1,5 @@ Value Required LOCAL_INTERFACE (\S+) -Value NEIGHBOR_CHASSIS_ID ((?:[a-z0-9]{2}\s){5}[a-z0-9]{2}|\S+) +Value CHASSIS_ID ((?:[a-z0-9]{2}\s){5}[a-z0-9]{2}|\S+) Value NEIGHBOR_INTERFACE ((?:[a-z0-9]{2}\s){5}[a-z0-9]{2}|\S+) Value NEIGHBOR_DESCRIPTION (\S+|.*?) Value NEIGHBOR_NAME (\S+) @@ -12,9 +12,9 @@ Start ^. -> Error LLDP - ^\s+${LOCAL_INTERFACE}\s+\|\s${NEIGHBOR_CHASSIS_ID}\s+${NEIGHBOR_INTERFACE}\s*$$ -> Record - ^\s+${LOCAL_INTERFACE}\s+\|\s${NEIGHBOR_CHASSIS_ID}\s+${NEIGHBOR_INTERFACE}\s+${NEIGHBOR_NAME}\s*$$ -> Record - ^\s+${LOCAL_INTERFACE}\s+\|\s${NEIGHBOR_CHASSIS_ID}\s+${NEIGHBOR_INTERFACE}\s+${NEIGHBOR_DESCRIPTION}\s+${NEIGHBOR_NAME}\s*$$ -> Record + ^\s+${LOCAL_INTERFACE}\s+\|\s${CHASSIS_ID}\s+${NEIGHBOR_INTERFACE}\s*$$ -> Record + ^\s+${LOCAL_INTERFACE}\s+\|\s${CHASSIS_ID}\s+${NEIGHBOR_INTERFACE}\s+${NEIGHBOR_NAME}\s*$$ -> Record + ^\s+${LOCAL_INTERFACE}\s+\|\s${CHASSIS_ID}\s+${NEIGHBOR_INTERFACE}\s+${NEIGHBOR_DESCRIPTION}\s+${NEIGHBOR_NAME}\s*$$ -> Record ^\S+\#\s*$$ ^\s*$$ ^. -> Error diff --git a/tests/hp_procurve/show_lldp_info_remote-device/hp_procurve_show_lldp_info_remote-device.yml b/tests/hp_procurve/show_lldp_info_remote-device/hp_procurve_show_lldp_info_remote-device.yml index 340ba3c8b6..0e7085ffc1 100644 --- a/tests/hp_procurve/show_lldp_info_remote-device/hp_procurve_show_lldp_info_remote-device.yml +++ b/tests/hp_procurve/show_lldp_info_remote-device/hp_procurve_show_lldp_info_remote-device.yml @@ -1,42 +1,42 @@ --- parsed_sample: - - local_interface: "1" - neighbor_chassis_id: "3821c7-c1cd00" + - chassis_id: "3821c7-c1cd00" + local_interface: "1" neighbor_description: "1" neighbor_interface: "1" neighbor_name: "65432p-swi006-g..." - - local_interface: "3" - neighbor_chassis_id: "3ce1a1-2218f0" + - chassis_id: "3ce1a1-2218f0" + local_interface: "3" neighbor_description: "" neighbor_interface: "3c e1 a1 22 18 f0" neighbor_name: "" - - local_interface: "7" - neighbor_chassis_id: "bcf310-1f8b40" + - chassis_id: "bcf310-1f8b40" + local_interface: "7" neighbor_description: "" neighbor_interface: "mgt0" neighbor_name: "AH-cust-AP21" - - local_interface: "25" - neighbor_chassis_id: "d8cb8a-6d303c" + - chassis_id: "d8cb8a-6d303c" + local_interface: "25" neighbor_description: "" neighbor_interface: "d8 cb 8a 6d 30 3c" neighbor_name: "" - - local_interface: "29" - neighbor_chassis_id: "484d7e-e66c42" + - chassis_id: "484d7e-e66c42" + local_interface: "29" neighbor_description: "" neighbor_interface: "48 4d 7e e6 6c 42" neighbor_name: "" - - local_interface: "36" - neighbor_chassis_id: "603197-7aa548" + - chassis_id: "603197-7aa548" + local_interface: "36" neighbor_description: "UPLINK" neighbor_interface: "1" neighbor_name: "NAP203" - - local_interface: "37" - neighbor_chassis_id: "b00cd1-359a98" + - chassis_id: "b00cd1-359a98" + local_interface: "37" neighbor_description: "" neighbor_interface: "b0 0c d1 35 9a 98" neighbor_name: "" - - local_interface: "42" - neighbor_chassis_id: "d8cb8a-894644" + - chassis_id: "d8cb8a-894644" + local_interface: "42" neighbor_description: "" neighbor_interface: "d8 cb 8a 89 46 44" neighbor_name: "" From aa6bd8780788b6516fc431a4cd8bd882ce68920a Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sun, 3 Sep 2023 18:45:02 -0400 Subject: [PATCH 34/41] - replace NEIGHBOR_PLATFORM with PLATFORM in hp_procurve_show_cdp_neighbors_detail - replace MODEL with PLATFORM in cisco_ios_show_lldp_neighbors_detail - replace MODEL_NAME with PLATFORM in huawei_vrp_display_lldp_neighbor --- docs/dev/data_model.md | 1 + .../cisco_ios_show_lldp_neighbors_detail.textfsm | 4 ++-- .../hp_procurve_show_cdp_neighbors_detail.textfsm | 4 ++-- .../templates/huawei_vrp_display_lldp_neighbor.textfsm | 4 ++-- .../cisco_ios_show_lldp_neighbors_detail1.yml | 6 +++--- .../cisco_ios_show_lldp_neighbors_detail2.yml | 8 ++++---- .../cisco_ios_show_lldp_neighbors_detail3.yml | 2 +- .../cisco_ios_show_lldp_neighbors_detail4.yml | 4 ++-- .../cisco_ios_show_lldp_neighbors_detail5.yml | 8 ++++---- .../hp_procurve_show_cdp_neighbors_detail.yml | 8 ++++---- .../huawei_vrp_display_lldp_neighbor.yml | 4 ++-- 11 files changed, 27 insertions(+), 26 deletions(-) diff --git a/docs/dev/data_model.md b/docs/dev/data_model.md index 56a301221e..457adae524 100644 --- a/docs/dev/data_model.md +++ b/docs/dev/data_model.md @@ -51,6 +51,7 @@ Example: Imagine the extra programming logic needed to consume structured data w | `NEIGHBOR_NAME` | often represents neighbor name for CDP or LLDP | | `NETMASK` | for IPv4 dotted quad masks | | `NETWORK` | for network numbers or subnet address (without the mask or prefix/slash notation); in place of ROUTE | +| `PLATFORM` | often represents CDP or LLDP neighbor's platform or model name/number | | `PREFIX_LENGTH` | instead of PREFIX or CIDR for the numbers of a slash notation or CIDR mask | | `PROTOCOL` | instead of PROTO | | `ROUTER_ID` | for local router IDs (local to the device being parsed) | diff --git a/ntc_templates/templates/cisco_ios_show_lldp_neighbors_detail.textfsm b/ntc_templates/templates/cisco_ios_show_lldp_neighbors_detail.textfsm index 9761ebe101..ee154a3e16 100644 --- a/ntc_templates/templates/cisco_ios_show_lldp_neighbors_detail.textfsm +++ b/ntc_templates/templates/cisco_ios_show_lldp_neighbors_detail.textfsm @@ -13,7 +13,7 @@ Value MANUFACTURER (.*) Value HW_REVISION (\S+) Value FW_REVISION (\S+) Value SW_REVISION (\S+) -Value MODEL (.*) +Value PLATFORM (.*) Value POWER_PAIR (\S+) Value POWER_CLASS (\d+) Value POWER_DEVICE_TYPE (\S+) @@ -89,7 +89,7 @@ PowerMDI Med ^\s+Serial\s+number:\s+${SERIAL}\s*$$ ^\s+Manufacturer:\s+${MANUFACTURER}\s*$$ - ^\s+Model:\s+${MODEL}\s*$$ + ^\s+Model:\s+${PLATFORM}\s*$$ ^\s+H/W revision:\s+${HW_REVISION}\s*$$ ^\s+F/W revision:\s+${FW_REVISION}\s*$$ ^\s+S/W revision:\s+${SW_REVISION}\s*$$ diff --git a/ntc_templates/templates/hp_procurve_show_cdp_neighbors_detail.textfsm b/ntc_templates/templates/hp_procurve_show_cdp_neighbors_detail.textfsm index 55d5e4fe07..c594e09aad 100644 --- a/ntc_templates/templates/hp_procurve_show_cdp_neighbors_detail.textfsm +++ b/ntc_templates/templates/hp_procurve_show_cdp_neighbors_detail.textfsm @@ -1,7 +1,7 @@ Value Required LOCAL_INTERFACE (.+?) Value CHASSIS_ID (.+?) Value NEIGHBOR_ADDRESS (.+?) -Value NEIGHBOR_PLATFORM (.+?) +Value PLATFORM (.+?) Value CAPABILITIES (.+?) Value NEIGHBOR_INTERFACE (.+?) Value NEIGHBOR_DESCRIPTION (.+?) @@ -12,7 +12,7 @@ Start ^\s*Device\s+ID\s*:\s*${CHASSIS_ID}\s*$$ ^\s*Address\s+Type ^\s*Address\s*:\s*${NEIGHBOR_ADDRESS}\s*$$ - ^\s*Platform\s*:\s*${NEIGHBOR_PLATFORM}\s*$$ + ^\s*Platform\s*:\s*${PLATFORM}\s*$$ ^\s*Capability\s*:\s*${CAPABILITIES}\s*$$ ^\s*Device\s+Port\s*:\s*${NEIGHBOR_INTERFACE}\s*$$ ^\s*Version\s*:\s*${NEIGHBOR_DESCRIPTION}\s*$$ -> Record diff --git a/ntc_templates/templates/huawei_vrp_display_lldp_neighbor.textfsm b/ntc_templates/templates/huawei_vrp_display_lldp_neighbor.textfsm index d8fd619f6d..176823a9f3 100644 --- a/ntc_templates/templates/huawei_vrp_display_lldp_neighbor.textfsm +++ b/ntc_templates/templates/huawei_vrp_display_lldp_neighbor.textfsm @@ -1,7 +1,7 @@ Value Required LOCAL_INTERFACE (\S+) Value CHASSIS_ID (.+?) Value MANUFACTURER_NAME (.*?) -Value MODEL_NAME (.*?) +Value PLATFORM (.*?) Value NEIGHBOR_PORT_ID (.*?) Value NEIGHBOR_INTERFACE (.*?) Value NEIGHBOR_NAME (.+?) @@ -59,7 +59,7 @@ MED ^SoftwareRev ^SerialNum\s+:${SERIAL} ^Manufacturer\s+name\s+:${MANUFACTURER_NAME}\s*$$ - ^Model\s+name\s+:${MODEL_NAME}\s*$$ + ^Model\s+name\s+:${PLATFORM}\s*$$ ^Asset\s+tracking ^Media\s+policy\s+type ^Unknown\s+Policy diff --git a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail1.yml b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail1.yml index d50ff2471f..b49ede7565 100644 --- a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail1.yml +++ b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail1.yml @@ -8,12 +8,12 @@ parsed_sample: mac_address: "" management_ip: "" manufacturer: "" - model: "" neighbor_description: "Juniper Networks, Inc. ex2200-24t-4g , version 12.3R9.4\ \ Build date: 2015-02-12 11:25:30 UTC" neighbor_interface: "ge-0/0/0.0" neighbor_name: "" neighbor_port_id: "502" + platform: "" power_class: "" power_device_type: "" power_pair: "" @@ -31,12 +31,12 @@ parsed_sample: mac_address: "" management_ip: "192.168.1.81" manufacturer: "" - model: "" neighbor_description: "HPE OfficeConnect Switch 1820 48G J9981A, PT.02.01, Linux\ \ 3.6.5-79c95a77, U-Boot 2012.10-00116-g3ab515c (Jul 30 2014 - 10:52:01)" neighbor_interface: "13" neighbor_name: "HpSwitch" neighbor_port_id: "94f1.2879.5555" + platform: "" power_class: "" power_device_type: "" power_pair: "" @@ -54,11 +54,11 @@ parsed_sample: mac_address: "" management_ip: "192.168.1.40" manufacturer: "" - model: "" neighbor_description: "ArubaOS (MODEL: 225), Version 6.4.2.6-4.1.1.6 (50009)" neighbor_interface: "eth0" neighbor_name: "44:48:c1:c4:dd:dd" neighbor_port_id: "4448.c1c4.dddd" + platform: "" power_class: "" power_device_type: "" power_pair: "" diff --git a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail2.yml b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail2.yml index fff977828f..e4ab5e0999 100644 --- a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail2.yml +++ b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail2.yml @@ -8,13 +8,13 @@ parsed_sample: mac_address: "" management_ip: "11.11.11.11" manufacturer: "" - model: "" neighbor_description: "Cisco NX-OS(tm) n7700, Software (n7700-s2-dk9), Version\ \ 6.2(10), RELEASE SOFTWARE Copyright (c) 2002-2013 by Cisco Systems, Inc. Compiled\ \ 10/9/2014 12:00:00" neighbor_interface: "PO2631-10Gx2-R261R5" neighbor_name: "USSC-CAMPUS-CORE-GW2" neighbor_port_id: "Eth1/6" + platform: "" power_class: "" power_device_type: "" power_pair: "" @@ -32,13 +32,13 @@ parsed_sample: mac_address: "" management_ip: "33.33.33.3" manufacturer: "" - model: "" neighbor_description: "Cisco NX-OS(tm) n7700, Software (n7700-s2-dk9), Version\ \ 6.2(10), RELEASE SOFTWARE Copyright (c) 2002-2013 by Cisco Systems, Inc. Compiled\ \ 10/9/2014 12:00:00" neighbor_interface: "PO2631-10Gx2-R261R5" neighbor_name: "USSC-CAMPUS-CORE-GW1.acme123.com" neighbor_port_id: "Eth1/6" + platform: "" power_class: "" power_device_type: "" power_pair: "" @@ -56,12 +56,12 @@ parsed_sample: mac_address: "" management_ip: "55.55.55.55" manufacturer: "" - model: "" neighbor_description: "Cisco IOS Software, C3750 Software (C3750-IPSERVICESK9-M),\ \ Version 12.2(53)SE2, RELEASE SOFTWARE (fc3)" neighbor_interface: "GigabitEthernet2/0/24" neighbor_name: "DMZ-SW1" neighbor_port_id: "Gi2/0/24" + platform: "" power_class: "" power_device_type: "" power_pair: "" @@ -79,11 +79,11 @@ parsed_sample: mac_address: "" management_ip: "" manufacturer: "" - model: "" neighbor_description: "" neighbor_interface: "" neighbor_name: "" neighbor_port_id: "g2" + platform: "" power_class: "" power_device_type: "" power_pair: "" diff --git a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail3.yml b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail3.yml index 525c974c4b..9ccb534a83 100644 --- a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail3.yml +++ b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail3.yml @@ -8,11 +8,11 @@ parsed_sample: mac_address: "" management_ip: "10.10.0.1" manufacturer: "Cisco Systems, Inc." - model: "CP-7962G" neighbor_description: "Cisco IP Phone 7962G,V12, SCCP42.9-3-1ES27S" neighbor_interface: "SW PORT" neighbor_name: "SEPC8F9F9D61BC2" neighbor_port_id: "C8F9F9D61BC2:P1" + platform: "CP-7962G" power_class: "" power_device_type: "" power_pair: "" diff --git a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail4.yml b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail4.yml index 5e8f432895..0c6e42ea53 100644 --- a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail4.yml +++ b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail4.yml @@ -8,11 +8,11 @@ parsed_sample: mac_address: "" management_ip: "" manufacturer: "ZULTYS" - model: "ZIP 33G" neighbor_description: "ZULTYS IP Phone" neighbor_interface: "WAN PORT" neighbor_name: "ZULTYS IP Phone" neighbor_port_id: "000b.ea00.16e0" + platform: "ZIP 33G" power_class: "" power_device_type: "" power_pair: "" @@ -30,12 +30,12 @@ parsed_sample: mac_address: "" management_ip: "172.16.0.10" manufacturer: "" - model: "" neighbor_description: "Cisco IOS Software, s6t64 Software (s6t64-ADVENTERPRISEK9-M),\ \ Version 15.4(1)SY3, RELEASE SOFTWARE (fc4)" neighbor_interface: "asw22" neighbor_name: "dsw01" neighbor_port_id: "Te1/2/13" + platform: "" power_class: "" power_device_type: "" power_pair: "" diff --git a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail5.yml b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail5.yml index 0be63dd7e9..a54d9d245f 100644 --- a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail5.yml +++ b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail5.yml @@ -8,11 +8,11 @@ parsed_sample: mac_address: "" management_ip: "172.31.176.154" manufacturer: "" - model: "" neighbor_description: "Cisco AP Software, ap3g3-k9w8 Version: 8.10.162.0" neighbor_interface: "eth0" neighbor_name: "system1" neighbor_port_id: "0" + platform: "" power_class: "" power_device_type: "" power_pair: "" @@ -30,11 +30,11 @@ parsed_sample: mac_address: "" management_ip: "10.132.14.52" manufacturer: "" - model: "" neighbor_description: "Dragonfly" neighbor_interface: "eth0" neighbor_name: "system2" neighbor_port_id: "0004.7a2a.bbbb" + platform: "" power_class: "4" power_device_type: "2" power_pair: "Spare" @@ -52,11 +52,11 @@ parsed_sample: mac_address: "" management_ip: "10.132.14.53" manufacturer: "" - model: "" neighbor_description: "Dragonfly" neighbor_interface: "eth0" neighbor_name: "system3" neighbor_port_id: "0004.7a2a.cccc" + platform: "" power_class: "4" power_device_type: "2" power_pair: "Spare" @@ -75,12 +75,12 @@ parsed_sample: mac_address: "" management_ip: "10.176.0.245" manufacturer: "" - model: "" neighbor_description: "Siemens, SIMATIC S7, CPU-1200, 6ES7 211-1CC40-0XB0, HW:\ \ 10, FW: V.4.3.1, S V-LDCE8620" neighbor_interface: "Siemens, SIMATIC S7, Ethernet Port, X1 P1" neighbor_name: "" neighbor_port_id: "port-001.ploobdfad" + platform: "" power_class: "" power_device_type: "" power_pair: "" diff --git a/tests/hp_procurve/show_cdp_neighbors_detail/hp_procurve_show_cdp_neighbors_detail.yml b/tests/hp_procurve/show_cdp_neighbors_detail/hp_procurve_show_cdp_neighbors_detail.yml index 50c803886e..cf54a23603 100644 --- a/tests/hp_procurve/show_cdp_neighbors_detail/hp_procurve_show_cdp_neighbors_detail.yml +++ b/tests/hp_procurve/show_cdp_neighbors_detail/hp_procurve_show_cdp_neighbors_detail.yml @@ -6,25 +6,25 @@ parsed_sample: neighbor_address: "10.11.11.16" neighbor_description: "5.9.1.5-001RAP-6521-60020-WR" neighbor_interface: "ge1" - neighbor_platform: "5.9.1.5-001RAP-6521-60020-WR" + platform: "5.9.1.5-001RAP-6521-60020-WR" - capabilities: "Router" chassis_id: "5c 0e 8b 11 11 11" local_interface: "1" neighbor_address: "10.11.11.16" neighbor_description: "AP-6521-60020-WR, Version 5.9.1.5-001R" neighbor_interface: "ge1" - neighbor_platform: "AP-6521-60020-WR, Version 5.9.1.5-001R" + platform: "AP-6521-60020-WR, Version 5.9.1.5-001R" - capabilities: "Router" chassis_id: "5c 0e 8b 12 22 22" local_interface: "2" neighbor_address: "Unsupported format" neighbor_description: "AP-6521-60020-WR, Version 5.9.1.5-001R" neighbor_interface: "ge1" - neighbor_platform: "AP-6521-60020-WR, Version 5.9.1.5-001R" + platform: "AP-6521-60020-WR, Version 5.9.1.5-001R" - capabilities: "Router" chassis_id: "AP02-Site" local_interface: "2" neighbor_address: "10.11.11.17" neighbor_description: "5.9.1.5-001RAP-6521-60020-WR" neighbor_interface: "ge1" - neighbor_platform: "5.9.1.5-001RAP-6521-60020-WR" + platform: "5.9.1.5-001RAP-6521-60020-WR" diff --git a/tests/huawei_vrp/display_lldp_neighbor/huawei_vrp_display_lldp_neighbor.yml b/tests/huawei_vrp/display_lldp_neighbor/huawei_vrp_display_lldp_neighbor.yml index 9d74544e89..b5ddfdd9f0 100644 --- a/tests/huawei_vrp/display_lldp_neighbor/huawei_vrp_display_lldp_neighbor.yml +++ b/tests/huawei_vrp/display_lldp_neighbor/huawei_vrp_display_lldp_neighbor.yml @@ -5,7 +5,6 @@ parsed_sample: local_interface: "GigabitEthernet0/0/1" management_ip: "192.168.0.240" manufacturer_name: "Cisco Systems, Inc." - model_name: "WS-C2960S-48LPS-L" neighbor_description: - "Cisco IOS Software, C2960S Software (C2960S-UNIVERSALK9-M), Version 12.2(55)SE7,\ \ RELEASE SOFTWARE (fc1)" @@ -15,6 +14,7 @@ parsed_sample: neighbor_interface: "GigabitEthernet1/0/1" neighbor_name: "tsa-2960-sw01" neighbor_port_id: "Gi1/0/1" + platform: "WS-C2960S-48LPS-L" serial: "NA" vlan_id: "1" - capabilities: "bridge" @@ -22,7 +22,6 @@ parsed_sample: local_interface: "GigabitEthernet0/0/8" management_ip: "192.168.0.241" manufacturer_name: "Cisco Systems, Inc." - model_name: "WS-C2960S-48LPS-L" neighbor_description: - "Cisco IOS Software, C2960S Software (C2960S-UNIVERSALK9-M), Version 12.2(55)SE7,\ \ RELEASE SOFTWARE (fc1)" @@ -32,5 +31,6 @@ parsed_sample: neighbor_interface: "GigabitEthernet1/0/2" neighbor_name: "tsa-2960-sw01" neighbor_port_id: "Gi1/0/2" + platform: "WS-C2960S-48LPS-L" serial: "NA" vlan_id: "1" From e0eaf30fcc6e76e7b1a1ed555c55e79d16863d31 Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sun, 3 Sep 2023 19:38:42 -0400 Subject: [PATCH 35/41] replace MANUFACTURER_NAME with MANUFACTURER in huawei_vrp_display_lldp_neighbor to normalize --- .../templates/huawei_vrp_display_lldp_neighbor.textfsm | 4 ++-- .../huawei_vrp_display_lldp_neighbor.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ntc_templates/templates/huawei_vrp_display_lldp_neighbor.textfsm b/ntc_templates/templates/huawei_vrp_display_lldp_neighbor.textfsm index 176823a9f3..03cc197299 100644 --- a/ntc_templates/templates/huawei_vrp_display_lldp_neighbor.textfsm +++ b/ntc_templates/templates/huawei_vrp_display_lldp_neighbor.textfsm @@ -1,6 +1,6 @@ Value Required LOCAL_INTERFACE (\S+) Value CHASSIS_ID (.+?) -Value MANUFACTURER_NAME (.*?) +Value MANUFACTURER (.*?) Value PLATFORM (.*?) Value NEIGHBOR_PORT_ID (.*?) Value NEIGHBOR_INTERFACE (.*?) @@ -58,7 +58,7 @@ MED ^FirmwareRev ^SoftwareRev ^SerialNum\s+:${SERIAL} - ^Manufacturer\s+name\s+:${MANUFACTURER_NAME}\s*$$ + ^Manufacturer\s+name\s+:${MANUFACTURER}\s*$$ ^Model\s+name\s+:${PLATFORM}\s*$$ ^Asset\s+tracking ^Media\s+policy\s+type diff --git a/tests/huawei_vrp/display_lldp_neighbor/huawei_vrp_display_lldp_neighbor.yml b/tests/huawei_vrp/display_lldp_neighbor/huawei_vrp_display_lldp_neighbor.yml index b5ddfdd9f0..68e2d3ba1d 100644 --- a/tests/huawei_vrp/display_lldp_neighbor/huawei_vrp_display_lldp_neighbor.yml +++ b/tests/huawei_vrp/display_lldp_neighbor/huawei_vrp_display_lldp_neighbor.yml @@ -4,7 +4,7 @@ parsed_sample: chassis_id: "f55f-c2c5-e180" local_interface: "GigabitEthernet0/0/1" management_ip: "192.168.0.240" - manufacturer_name: "Cisco Systems, Inc." + manufacturer: "Cisco Systems, Inc." neighbor_description: - "Cisco IOS Software, C2960S Software (C2960S-UNIVERSALK9-M), Version 12.2(55)SE7,\ \ RELEASE SOFTWARE (fc1)" @@ -21,7 +21,7 @@ parsed_sample: chassis_id: "f41f-c2c5-e180" local_interface: "GigabitEthernet0/0/8" management_ip: "192.168.0.241" - manufacturer_name: "Cisco Systems, Inc." + manufacturer: "Cisco Systems, Inc." neighbor_description: - "Cisco IOS Software, C2960S Software (C2960S-UNIVERSALK9-M), Version 12.2(55)SE7,\ \ RELEASE SOFTWARE (fc1)" From 582c9f65949cbd8a931048267b820239490b38a4 Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sun, 3 Sep 2023 20:42:27 -0400 Subject: [PATCH 36/41] normalize management address capture groups in CDP/LLDP templates - 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 --- ...cx_show_lldp_neighbors-info_detail.textfsm | 4 +- ...isco_ios_show_cdp_neighbors_detail.textfsm | 4 +- ...sco_ios_show_lldp_neighbors_detail.textfsm | 4 +- ...sco_nxos_show_cdp_neighbors_detail.textfsm | 4 +- ..._wlc_ssh_show_cdp_neighbors_detail.textfsm | 4 +- ...cisco_xr_show_cdp_neighbors_detail.textfsm | 4 +- ..._lldp_neighbor-information_verbose.textfsm | 4 +- ...how_lldp_info_remote-device_detail.textfsm | 4 +- .../huawei_vrp_display_lldp_neighbor.textfsm | 4 +- .../show_lldp_neighbors-info_detail.yml | 12 ++--- .../cisco_ios_show_cdp_neighbors_detail.yml | 8 ++-- .../cisco_ios_show_cdp_neighbors_detail2.yml | 2 +- .../cisco_ios_show_lldp_neighbors_detail1.yml | 6 +-- .../cisco_ios_show_lldp_neighbors_detail2.yml | 8 ++-- .../cisco_ios_show_lldp_neighbors_detail3.yml | 2 +- .../cisco_ios_show_lldp_neighbors_detail4.yml | 4 +- .../cisco_ios_show_lldp_neighbors_detail5.yml | 8 ++-- ...isco_ios_show_lldp_neighbors_detail_01.yml | 18 +++---- .../cisco_nxos_show_cdp_neighbors_detail.yml | 10 ++-- .../cisco_nxos_show_cdp_neighbors_detail1.yml | 8 ++-- .../cisco_nxos_show_cdp_neighbors_detail2.yml | 2 +- ..._show_cdp_neighbors_detail_move_record.yml | 4 +- ...isco_wlc_ssh_show_cdp_neighbors_detail.yml | 6 +-- .../cisco_xr_show_cdp_neighbors_detail.yml | 48 +++++++++---------- ...play_lldp_neighbor-information_verbose.yml | 8 ++-- ...ve_show_lldp_info_remote-device_detail.yml | 16 +++---- .../huawei_vrp_display_lldp_neighbor.yml | 4 +- 27 files changed, 105 insertions(+), 105 deletions(-) diff --git a/ntc_templates/templates/aruba_aoscx_show_lldp_neighbors-info_detail.textfsm b/ntc_templates/templates/aruba_aoscx_show_lldp_neighbors-info_detail.textfsm index 0308cf2db4..2200351ae7 100644 --- a/ntc_templates/templates/aruba_aoscx_show_lldp_neighbors-info_detail.textfsm +++ b/ntc_templates/templates/aruba_aoscx_show_lldp_neighbors-info_detail.textfsm @@ -4,7 +4,7 @@ Value NEIGHBOR_NAME (\S+) Value NEIGHBOR_DESCRIPTION (.+) Value CAPABILITIES_SUPPORTED (.+) Value CAPABILITIES (.+) -Value MGMT_ADDR (\S+) +Value MGMT_ADDRESS (\S+) Value NEIGHBOR_PORT_ID (\S+) Value NEIGHBOR_INTERFACE (\S+) @@ -16,7 +16,7 @@ Start ^Neighbor\s*Chassis-Description\s*:\s*${NEIGHBOR_DESCRIPTION} ^Neighbor\s+System-Description\s*:\s*${NEIGHBOR_DESCRIPTION} ^Neighbor\s*Chassis-ID\s*:\s*${CHASSIS_ID} - ^Neighbor\s*Management-Address\s*:\s*${MGMT_ADDR} + ^Neighbor\s*Management-Address\s*:\s*${MGMT_ADDRESS} ^Chassis\s*Capabilities\s*Available\s*:\s*${CAPABILITIES_SUPPORTED} ^Chassis\s*Capabilities\s*Enabled\s*:\s*${CAPABILITIES} ^Neighbor\s*Port-ID\s*:\s*${NEIGHBOR_PORT_ID} diff --git a/ntc_templates/templates/cisco_ios_show_cdp_neighbors_detail.textfsm b/ntc_templates/templates/cisco_ios_show_cdp_neighbors_detail.textfsm index 4d55e8888b..44eb21adc0 100644 --- a/ntc_templates/templates/cisco_ios_show_cdp_neighbors_detail.textfsm +++ b/ntc_templates/templates/cisco_ios_show_cdp_neighbors_detail.textfsm @@ -1,5 +1,5 @@ Value Required NEIGHBOR_NAME (\S+) -Value MANAGEMENT_IP (\d+\.\d+\.\d+\.\d+|\w+\.\w+\.\w+) +Value MGMT_ADDRESS (\d+\.\d+\.\d+\.\d+|\w+\.\w+\.\w+) Value PLATFORM (.*) Value NEIGHBOR_INTERFACE (.*) Value LOCAL_INTERFACE (.*) @@ -18,7 +18,7 @@ Start ^Time\s+source\s+is ParseIP - ^.*IP address: ${MANAGEMENT_IP} -> Start + ^.*IP address: ${MGMT_ADDRESS} -> Start ^Platform\s*:\s*${PLATFORM}\s*,\s*Capabilities\s*:\s*${CAPABILITIES}\s+$$ -> Start ^Platform\s*:\s*${PLATFORM}\s*,\s*Capabilities\s*:\s*${CAPABILITIES}$$ -> Start ^.* -> Start diff --git a/ntc_templates/templates/cisco_ios_show_lldp_neighbors_detail.textfsm b/ntc_templates/templates/cisco_ios_show_lldp_neighbors_detail.textfsm index ee154a3e16..ed032f6737 100644 --- a/ntc_templates/templates/cisco_ios_show_lldp_neighbors_detail.textfsm +++ b/ntc_templates/templates/cisco_ios_show_lldp_neighbors_detail.textfsm @@ -5,7 +5,7 @@ Value NEIGHBOR_INTERFACE (.*) Value NEIGHBOR_NAME (.+?) Value NEIGHBOR_DESCRIPTION (.*) Value CAPABILITIES (.*) -Value MANAGEMENT_IP (\S+) +Value MGMT_ADDRESS (\S+) Value VLAN_ID (\d+) Value MAC_ADDRESS ([0-9a-fA-F]{4}\.[0-9a-fA-F]{4}\.[0-9a-fA-F]{4}) Value SERIAL (\S+) @@ -39,7 +39,7 @@ Start ^Management\s+Addresses ^\s+OID ^\s+[\d+\.]{8,} - ^.*IP:\s+${MANAGEMENT_IP}\s*$$ + ^.*IP:\s+${MGMT_ADDRESS}\s*$$ ^Auto\s+Negotiation ^Physical\s+media # Removed \(\s+\) from the template - The line 'Other/unknown' would not be captured diff --git a/ntc_templates/templates/cisco_nxos_show_cdp_neighbors_detail.textfsm b/ntc_templates/templates/cisco_nxos_show_cdp_neighbors_detail.textfsm index 8fa14b2033..09b8150915 100644 --- a/ntc_templates/templates/cisco_nxos_show_cdp_neighbors_detail.textfsm +++ b/ntc_templates/templates/cisco_nxos_show_cdp_neighbors_detail.textfsm @@ -1,6 +1,6 @@ Value Required CHASSIS_ID (.*) Value NEIGHBOR_NAME (.*) -Value MGMT_IP (.*) +Value MGMT_ADDRESS (.*) Value PLATFORM (.*) Value NEIGHBOR_INTERFACE (.*) Value LOCAL_INTERFACE (.*) @@ -19,7 +19,7 @@ Start ^Version: -> GetVersion GetIP - ^.*IP.+Address: ${MGMT_IP} -> Start + ^.*IP.+Address: ${MGMT_ADDRESS} -> Start GetInterfaceIP ^.*IP.+Address: ${INTERFACE_IP} -> Start diff --git a/ntc_templates/templates/cisco_wlc_ssh_show_cdp_neighbors_detail.textfsm b/ntc_templates/templates/cisco_wlc_ssh_show_cdp_neighbors_detail.textfsm index 269f449067..1ddf9c411a 100644 --- a/ntc_templates/templates/cisco_wlc_ssh_show_cdp_neighbors_detail.textfsm +++ b/ntc_templates/templates/cisco_wlc_ssh_show_cdp_neighbors_detail.textfsm @@ -1,5 +1,5 @@ Value Required CHASSIS_ID (\S+) -Value MANAGEMENT_IP (\d+\.\d+\.\d+\.\d+|\w+\.\w+\.\w+) +Value MGMT_ADDRESS (\d+\.\d+\.\d+\.\d+|\w+\.\w+\.\w+) Value PLATFORM (.*) Value NEIGHBOR_INTERFACE (.*) Value LOCAL_INTERFACE (.*) @@ -14,7 +14,7 @@ Start ^Version : -> GetVersion ParseIP - ^.*IP address: ${MANAGEMENT_IP} -> Start + ^.*IP address: ${MGMT_ADDRESS} -> Start ^Platform\s*:\s*${PLATFORM}\s*,\s*Capabilities\s*:\s*${CAPABILITIES} -> Start ^.* -> Start diff --git a/ntc_templates/templates/cisco_xr_show_cdp_neighbors_detail.textfsm b/ntc_templates/templates/cisco_xr_show_cdp_neighbors_detail.textfsm index aba393de53..5ffab0b636 100644 --- a/ntc_templates/templates/cisco_xr_show_cdp_neighbors_detail.textfsm +++ b/ntc_templates/templates/cisco_xr_show_cdp_neighbors_detail.textfsm @@ -1,6 +1,6 @@ Value Required CHASSIS_ID (\S+) Value NEIGHBOR_NAME (.*) -Value MGMT_IP (.*) +Value MGMT_ADDRESS (.*) Value PLATFORM (.*) Value NEIGHBOR_INTERFACE (.*) Value LOCAL_INTERFACE (.*) @@ -17,7 +17,7 @@ Start ^Version : -> GetVersion GetIP - ^.*IP.+address: ${MGMT_IP} -> Start + ^.*IP.+address: ${MGMT_ADDRESS} -> Start GetVersion ^${VERSION} -> Record Start diff --git a/ntc_templates/templates/hp_comware_display_lldp_neighbor-information_verbose.textfsm b/ntc_templates/templates/hp_comware_display_lldp_neighbor-information_verbose.textfsm index 43e3c7f8fe..00330c0141 100644 --- a/ntc_templates/templates/hp_comware_display_lldp_neighbor-information_verbose.textfsm +++ b/ntc_templates/templates/hp_comware_display_lldp_neighbor-information_verbose.textfsm @@ -3,7 +3,7 @@ Value CHASSIS_ID (\S+) Value NEIGHBOR_INTERFACE (.*) Value NEIGHBOR_INTERFACE_DESCRIPTION (.*) Value NEIGHBOR_NAME (\S+) -Value MANAGEMENT_IP (\S+) +Value MGMT_ADDRESS (\S+) Value VLAN_ID (\d+) Start @@ -19,7 +19,7 @@ Start ^\s+Time\s+to\s+live\d+:.* ^\s+Port\s+description\s+:\s+${NEIGHBOR_INTERFACE_DESCRIPTION} ^\s+System\s+name\s+:\s+${NEIGHBOR_NAME} - ^\s+Management\s+address\s+:\s+${MANAGEMENT_IP} + ^\s+Management\s+address\s+:\s+${MGMT_ADDRESS} ^\s+Management\s+address\s+interface\s+type ^\s+Management\s+address\s+interface\s+ID ^\s+Management\s+address\s+OID diff --git a/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device_detail.textfsm b/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device_detail.textfsm index 6a95ad1098..46ececcc4f 100644 --- a/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device_detail.textfsm +++ b/ntc_templates/templates/hp_procurve_show_lldp_info_remote-device_detail.textfsm @@ -9,7 +9,7 @@ Value NEIGHBOR_INTERFACE_DESCRIPTION (\S+|.*?) Value VLAN_ID (\d+|.*?) Value CAPABILITIES_SUPPORTED (.*?) Value CAPABILITIES (.*?) -Value REMOTE_MANAGEMENT_ADDRESS (\S+|.*?) +Value MGMT_ADDRESS (\S+|.*?) Start ^\s*$$ @@ -31,7 +31,7 @@ LLDP ^\s+System\s+Capabilities\s+Enabled\s+:\s${CAPABILITIES}\s*$$ ^\s+Remote\s+Management\s+Address\s*$$ ^\s+Type.*$$ - ^\s+Address\s:\s${REMOTE_MANAGEMENT_ADDRESS} + ^\s+Address\s:\s${MGMT_ADDRESS} ^\s+Poe\s+Plus\s+Information\s+Detail\s*$$ ^\s+Poe\s+Device\s+Type.* ^\s+Power\s+Source.* diff --git a/ntc_templates/templates/huawei_vrp_display_lldp_neighbor.textfsm b/ntc_templates/templates/huawei_vrp_display_lldp_neighbor.textfsm index 03cc197299..0afe3bf4e2 100644 --- a/ntc_templates/templates/huawei_vrp_display_lldp_neighbor.textfsm +++ b/ntc_templates/templates/huawei_vrp_display_lldp_neighbor.textfsm @@ -7,7 +7,7 @@ Value NEIGHBOR_INTERFACE (.*?) Value NEIGHBOR_NAME (.+?) Value List NEIGHBOR_DESCRIPTION (.*) Value CAPABILITIES (.*?) -Value MANAGEMENT_IP (\S+) +Value MGMT_ADDRESS (\S+) Value VLAN_ID (\d+) Value SERIAL (\S+) @@ -25,7 +25,7 @@ Start ^System\s+capabilities\s+supported ^System\s+capabilities\s+enabled\s+:${CAPABILITIES}\s*$$ ^Management\s+address\s+type - ^Management\s+address\s*(value\s*)?:\s*${MANAGEMENT_IP} + ^Management\s+address\s*:\s*${MGMT_ADDRESS} ^Expired\s+time ^Port\s+VLAN\s+ID\(PVID\)\s+:${VLAN_ID} ^VLAN\s+name\s+of\s+VLAN diff --git a/tests/aruba_aoscx/show_lldp_neighbors-info_detail/show_lldp_neighbors-info_detail.yml b/tests/aruba_aoscx/show_lldp_neighbors-info_detail/show_lldp_neighbors-info_detail.yml index 3884307776..9378a22edd 100644 --- a/tests/aruba_aoscx/show_lldp_neighbors-info_detail/show_lldp_neighbors-info_detail.yml +++ b/tests/aruba_aoscx/show_lldp_neighbors-info_detail/show_lldp_neighbors-info_detail.yml @@ -4,7 +4,7 @@ parsed_sample: capabilities_supported: "Bridge, WLAN" chassis_id: "70:3a:0e:cd:41:fe" local_interface: "1/1/1" - mgmt_addr: "10.252.99.12" + mgmt_address: "10.252.99.12" neighbor_description: "ArubaOS (MODEL: 335), Version Aruba AP" neighbor_interface: "eth0" neighbor_name: "ap-9999-335-fe" @@ -13,7 +13,7 @@ parsed_sample: capabilities_supported: "Bridge, WLAN" chassis_id: "00:4e:35:c5:d2:2e" local_interface: "1/1/2" - mgmt_addr: "10.252.99.11" + mgmt_address: "10.252.99.11" neighbor_description: "ArubaOS (MODEL: 535), Version Aruba AP" neighbor_interface: "eth0" neighbor_name: "ap-9999-535-fe" @@ -22,7 +22,7 @@ parsed_sample: capabilities_supported: "Bridge, Router" chassis_id: "90:20:c2:bf:ae:00" local_interface: "1/1/52" - mgmt_addr: "10.252.15.17" + mgmt_address: "10.252.15.17" neighbor_description: "Aruba JL635A GL.10.05.0021" neighbor_interface: "1/1/1" neighbor_name: "rtr-agg-0620-a" @@ -31,7 +31,7 @@ parsed_sample: capabilities_supported: "Bridge, WLAN" chassis_id: "70:3a:0e:cd:41:fe" local_interface: "2/1/1" - mgmt_addr: "10.252.99.12" + mgmt_address: "10.252.99.12" neighbor_description: "ArubaOS (MODEL: 335), Version Aruba AP" neighbor_interface: "eth1" neighbor_name: "ap-9999-335-fe" @@ -40,7 +40,7 @@ parsed_sample: capabilities_supported: "Bridge, WLAN" chassis_id: "00:4e:35:c5:d2:2e" local_interface: "2/1/2" - mgmt_addr: "10.252.99.11" + mgmt_address: "10.252.99.11" neighbor_description: "ArubaOS (MODEL: 535), Version Aruba AP" neighbor_interface: "eth1" neighbor_name: "ap-9999-535-fe" @@ -49,7 +49,7 @@ parsed_sample: capabilities_supported: "Bridge, Router" chassis_id: "90:20:c2:bf:ed:00" local_interface: "2/1/52" - mgmt_addr: "10.252.15.18" + mgmt_address: "10.252.15.18" neighbor_description: "Aruba JL635A GL.10.05.0021" neighbor_interface: "1/1/1" neighbor_name: "rtr-agg-0620-b" diff --git a/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail.yml b/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail.yml index 065d06975f..6157e3b909 100644 --- a/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail.yml +++ b/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail.yml @@ -2,7 +2,7 @@ parsed_sample: - capabilities: "Switch IGMP" local_interface: "GigabitEthernet1/0/16" - management_ip: "10.1.1.2" + mgmt_address: "10.1.1.2" neighbor_description: "Cisco IOS Software, C2960 Software (C2960-LANBASEK9-M),\ \ Version 12.2(55)SE9, RELEASE SOFTWARE (fc1)" neighbor_interface: "GigabitEthernet0/1" @@ -10,7 +10,7 @@ parsed_sample: platform: "cisco WS-C2960-8TC-L" - capabilities: "Router Switch IGMP" local_interface: "GigabitEthernet1/0/22" - management_ip: "10.1.1.1" + mgmt_address: "10.1.1.1" neighbor_description: "Cisco IOS Software, 3800 Software (C3825-ADVENTERPRISEK9-M),\ \ Version 12.4(24)T1, RELEASE SOFTWARE (fc3)" neighbor_interface: "GigabitEthernet0/0" @@ -18,7 +18,7 @@ parsed_sample: platform: "Cisco 3825" - capabilities: "Host" local_interface: "GigabitEthernet1/0/19" - management_ip: "10.1.1.232" + mgmt_address: "10.1.1.232" neighbor_description: "Linux 2.6.32-431.20.3.el6.x86_64 #1 SMP Fri Jun 6 18:30:54\ \ EDT 2014 CCM:10.5.2.10000-5.i386" neighbor_interface: "eth0" @@ -26,7 +26,7 @@ parsed_sample: platform: "VMware" - capabilities: "Router Switch IGMP" local_interface: "GigabitEthernet0/3" - management_ip: "" + mgmt_address: "" neighbor_description: "Cisco IOS Software, vios_l2 Software (vios_l2-ADVENTERPRISEK9-M),\ \ Version 15.2(CML_NIGHTLY_20150414)FLO_DSGS7, EARLY DEPLOYMENT DEVELOPMENT\ \ BUILD, synced to DSGS_PI5_POSTCOLLAPSE_TEAM_TRACK_CLONE" diff --git a/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail2.yml b/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail2.yml index abff96e1e7..9414b680f1 100644 --- a/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail2.yml +++ b/tests/cisco_ios/show_cdp_neighbors_detail/cisco_ios_show_cdp_neighbors_detail2.yml @@ -2,7 +2,7 @@ parsed_sample: - capabilities: "Switch IGMP" local_interface: "GigabitEthernet0/3" - management_ip: "1.1.1.1" + mgmt_address: "1.1.1.1" neighbor_description: "Cisco IOS Software, C3560E Software (C3560E-UNIVERSALK9-M),\ \ Version 12.2(55)SE10, RELEASE SOFTWARE (fc2)" neighbor_interface: "GigabitEthernet0/8" diff --git a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail1.yml b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail1.yml index b49ede7565..a43ec69927 100644 --- a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail1.yml +++ b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail1.yml @@ -6,8 +6,8 @@ parsed_sample: hw_revision: "" local_interface: "Gi1/0/2" mac_address: "" - management_ip: "" manufacturer: "" + mgmt_address: "" neighbor_description: "Juniper Networks, Inc. ex2200-24t-4g , version 12.3R9.4\ \ Build date: 2015-02-12 11:25:30 UTC" neighbor_interface: "ge-0/0/0.0" @@ -29,8 +29,8 @@ parsed_sample: hw_revision: "" local_interface: "Gi1/0/1" mac_address: "" - management_ip: "192.168.1.81" manufacturer: "" + mgmt_address: "192.168.1.81" neighbor_description: "HPE OfficeConnect Switch 1820 48G J9981A, PT.02.01, Linux\ \ 3.6.5-79c95a77, U-Boot 2012.10-00116-g3ab515c (Jul 30 2014 - 10:52:01)" neighbor_interface: "13" @@ -52,8 +52,8 @@ parsed_sample: hw_revision: "" local_interface: "Gi1/0/9" mac_address: "" - management_ip: "192.168.1.40" manufacturer: "" + mgmt_address: "192.168.1.40" neighbor_description: "ArubaOS (MODEL: 225), Version 6.4.2.6-4.1.1.6 (50009)" neighbor_interface: "eth0" neighbor_name: "44:48:c1:c4:dd:dd" diff --git a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail2.yml b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail2.yml index e4ab5e0999..303cb60f9f 100644 --- a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail2.yml +++ b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail2.yml @@ -6,8 +6,8 @@ parsed_sample: hw_revision: "" local_interface: "" mac_address: "" - management_ip: "11.11.11.11" manufacturer: "" + mgmt_address: "11.11.11.11" neighbor_description: "Cisco NX-OS(tm) n7700, Software (n7700-s2-dk9), Version\ \ 6.2(10), RELEASE SOFTWARE Copyright (c) 2002-2013 by Cisco Systems, Inc. Compiled\ \ 10/9/2014 12:00:00" @@ -30,8 +30,8 @@ parsed_sample: hw_revision: "" local_interface: "" mac_address: "" - management_ip: "33.33.33.3" manufacturer: "" + mgmt_address: "33.33.33.3" neighbor_description: "Cisco NX-OS(tm) n7700, Software (n7700-s2-dk9), Version\ \ 6.2(10), RELEASE SOFTWARE Copyright (c) 2002-2013 by Cisco Systems, Inc. Compiled\ \ 10/9/2014 12:00:00" @@ -54,8 +54,8 @@ parsed_sample: hw_revision: "" local_interface: "" mac_address: "" - management_ip: "55.55.55.55" manufacturer: "" + mgmt_address: "55.55.55.55" neighbor_description: "Cisco IOS Software, C3750 Software (C3750-IPSERVICESK9-M),\ \ Version 12.2(53)SE2, RELEASE SOFTWARE (fc3)" neighbor_interface: "GigabitEthernet2/0/24" @@ -77,8 +77,8 @@ parsed_sample: hw_revision: "" local_interface: "" mac_address: "" - management_ip: "" manufacturer: "" + mgmt_address: "" neighbor_description: "" neighbor_interface: "" neighbor_name: "" diff --git a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail3.yml b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail3.yml index 9ccb534a83..14c2dd0b9f 100644 --- a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail3.yml +++ b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail3.yml @@ -6,8 +6,8 @@ parsed_sample: hw_revision: "12" local_interface: "Gi0/1/7" mac_address: "" - management_ip: "10.10.0.1" manufacturer: "Cisco Systems, Inc." + mgmt_address: "10.10.0.1" neighbor_description: "Cisco IP Phone 7962G,V12, SCCP42.9-3-1ES27S" neighbor_interface: "SW PORT" neighbor_name: "SEPC8F9F9D61BC2" diff --git a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail4.yml b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail4.yml index 0c6e42ea53..26c20380bc 100644 --- a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail4.yml +++ b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail4.yml @@ -6,8 +6,8 @@ parsed_sample: hw_revision: "47.0.0.80.0.0.0" local_interface: "Gi2/0/13" mac_address: "" - management_ip: "" manufacturer: "ZULTYS" + mgmt_address: "" neighbor_description: "ZULTYS IP Phone" neighbor_interface: "WAN PORT" neighbor_name: "ZULTYS IP Phone" @@ -28,8 +28,8 @@ parsed_sample: hw_revision: "" local_interface: "Te1/1/1" mac_address: "" - management_ip: "172.16.0.10" manufacturer: "" + mgmt_address: "172.16.0.10" neighbor_description: "Cisco IOS Software, s6t64 Software (s6t64-ADVENTERPRISEK9-M),\ \ Version 15.4(1)SY3, RELEASE SOFTWARE (fc4)" neighbor_interface: "asw22" diff --git a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail5.yml b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail5.yml index a54d9d245f..979c0f6e0d 100644 --- a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail5.yml +++ b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail5.yml @@ -6,8 +6,8 @@ parsed_sample: hw_revision: "" local_interface: "" mac_address: "" - management_ip: "172.31.176.154" manufacturer: "" + mgmt_address: "172.31.176.154" neighbor_description: "Cisco AP Software, ap3g3-k9w8 Version: 8.10.162.0" neighbor_interface: "eth0" neighbor_name: "system1" @@ -28,8 +28,8 @@ parsed_sample: hw_revision: "" local_interface: "" mac_address: "" - management_ip: "10.132.14.52" manufacturer: "" + mgmt_address: "10.132.14.52" neighbor_description: "Dragonfly" neighbor_interface: "eth0" neighbor_name: "system2" @@ -50,8 +50,8 @@ parsed_sample: hw_revision: "" local_interface: "" mac_address: "" - management_ip: "10.132.14.53" manufacturer: "" + mgmt_address: "10.132.14.53" neighbor_description: "Dragonfly" neighbor_interface: "eth0" neighbor_name: "system3" @@ -73,8 +73,8 @@ parsed_sample: hw_revision: "" local_interface: "" mac_address: "" - management_ip: "10.176.0.245" manufacturer: "" + mgmt_address: "10.176.0.245" neighbor_description: "Siemens, SIMATIC S7, CPU-1200, 6ES7 211-1CC40-0XB0, HW:\ \ 10, FW: V.4.3.1, S V-LDCE8620" neighbor_interface: "Siemens, SIMATIC S7, Ethernet Port, X1 P1" diff --git a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail_01.yml b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail_01.yml index 15d5c22340..ab3affc0dd 100644 --- a/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail_01.yml +++ b/tests/cisco_ios/show_lldp_neighbors_detail/cisco_ios_show_lldp_neighbors_detail_01.yml @@ -6,12 +6,14 @@ parsed_sample: hw_revision: "" local_interface: "Gi1/1/2" mac_address: "2416.abcd.ab12" - management_ip: "172.16.1.1" manufacturer: "" - model: "" - neighbor: "sdalab-bldg1-as01.devices.example.com" + mgmt_address: "172.16.1.1" + neighbor_description: "Cisco IOS Software [Bengaluru], Catalyst L3 Switch Software\ + \ (CAT9K_IOSXE), Version 17.6.5, RELEASE SOFTWARE (fc2)" neighbor_interface: "GigabitEthernet1/0/16" + neighbor_name: "sdalab-bldg1-as01.devices.example.com" neighbor_port_id: "Gi1/0/16" + platform: "" power_class: "" power_device_type: "" power_pair: "" @@ -20,8 +22,6 @@ parsed_sample: power_source: "" serial: "" sw_revision: "" - system_description: "Cisco IOS Software [Bengaluru], Catalyst L3 Switch Software - (CAT9K_IOSXE), Version 17.6.5, RELEASE SOFTWARE (fc2)" vlan_id: "1" - capabilities: "B,T" chassis_id: "10.65.1.11" @@ -29,12 +29,13 @@ parsed_sample: hw_revision: "9.1.3.3" local_interface: "Gi1/0/1" mac_address: "0060.abbc.adde" - management_ip: "" manufacturer: "NEC" - model: "DT730" - neighbor: "NEC IP Phone" + mgmt_address: "" + neighbor_description: "DT700 Series" neighbor_interface: "LAN Port" + neighbor_name: "NEC IP Phone" neighbor_port_id: "0060.abbc.abbc" + platform: "DT730" power_class: "" power_device_type: "" power_pair: "" @@ -43,5 +44,4 @@ parsed_sample: power_source: "" serial: "-" sw_revision: "-" - system_description: "DT700 Series" vlan_id: "" diff --git a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail.yml b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail.yml index fde9a10413..4149630bc5 100644 --- a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail.yml +++ b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail.yml @@ -4,7 +4,7 @@ parsed_sample: chassis_id: "PERIMETER" interface_ip: "10.1.100.1" local_interface: "mgmt0" - mgmt_ip: "10.1.100.1" + mgmt_address: "10.1.100.1" neighbor_interface: "FastEthernet1/0/32" neighbor_name: "" platform: "cisco WS-C3750-48TS" @@ -14,7 +14,7 @@ parsed_sample: chassis_id: "dc-lf03(SAL19069XXX)" interface_ip: "10.1.100.226" local_interface: "Ethernet1/1" - mgmt_ip: "10.1.100.226" + mgmt_address: "10.1.100.226" neighbor_interface: "Ethernet1/1" neighbor_name: "dc-lf03" platform: "N9K-C9372TX" @@ -23,7 +23,7 @@ parsed_sample: chassis_id: "dc-lf03(SAL1906XXXX)" interface_ip: "10.1.100.226" local_interface: "Ethernet1/3" - mgmt_ip: "10.1.100.226" + mgmt_address: "10.1.100.226" neighbor_interface: "Ethernet1/3" neighbor_name: "dc-lf03" platform: "N9K-C9372TX" @@ -32,7 +32,7 @@ parsed_sample: chassis_id: "dc-sp01(SAL19069XXX)" interface_ip: "10.1.1.1" local_interface: "Ethernet1/49" - mgmt_ip: "10.1.100.222" + mgmt_address: "10.1.100.222" neighbor_interface: "Ethernet1/52" neighbor_name: "dc-sp01" platform: "N9K-C9372TX" @@ -41,7 +41,7 @@ parsed_sample: chassis_id: "dc-sp02(SAL19069XXX)" interface_ip: "10.1.1.9" local_interface: "Ethernet1/50" - mgmt_ip: "10.1.100.223" + mgmt_address: "10.1.100.223" neighbor_interface: "Ethernet1/52" neighbor_name: "dc-sp02" platform: "N9K-C9372TX" diff --git a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail1.yml b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail1.yml index d51bb6f163..41d33d182d 100644 --- a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail1.yml +++ b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail1.yml @@ -4,7 +4,7 @@ parsed_sample: chassis_id: "DC3P01SW01.test.co.nz" interface_ip: "10.115.143.251" local_interface: "mgmt0" - mgmt_ip: "10.115.143.251" + mgmt_address: "10.115.143.251" neighbor_interface: "GigabitEthernet0/20" neighbor_name: "" platform: "WS-C3560X-24" @@ -14,7 +14,7 @@ parsed_sample: chassis_id: "DC3TESTW01-55.test.co.nz(SSI3707070J)" interface_ip: "10.115.17.253" local_interface: "Ethernet1/1" - mgmt_ip: "10.115.143.120" + mgmt_address: "10.115.143.120" neighbor_interface: "Ethernet1/31" neighbor_name: "DC3TESTW01-55" platform: "N5K-C5548UP" @@ -23,7 +23,7 @@ parsed_sample: chassis_id: "DC3TESTW02.test.co.nz(SSI11111D2M)" interface_ip: "10.115.143.21" local_interface: "Ethernet1/21" - mgmt_ip: "10.115.143.21" + mgmt_address: "10.115.143.21" neighbor_interface: "Ethernet1/21" neighbor_name: "DC3TESTW02" platform: "N5K-C5020P-BF" @@ -32,7 +32,7 @@ parsed_sample: chassis_id: "DC3TESTW02.test.co.nz(SSI44444D2M)" interface_ip: "10.115.143.21" local_interface: "Ethernet1/22" - mgmt_ip: "10.115.143.21" + mgmt_address: "10.115.143.21" neighbor_interface: "Ethernet1/22" neighbor_name: "DC3TESTW02" platform: "N5K-C5020P-BF" diff --git a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail2.yml b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail2.yml index b6752e2376..5fcf25bad3 100644 --- a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail2.yml +++ b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail2.yml @@ -4,7 +4,7 @@ parsed_sample: chassis_id: "MKT1" interface_ip: "" local_interface: "Ethernet1/1" - mgmt_ip: "" + mgmt_address: "" neighbor_interface: "ether1" neighbor_name: "" platform: "MikroTik" diff --git a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail_move_record.yml b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail_move_record.yml index 0897fd5df7..6879028bb0 100644 --- a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail_move_record.yml +++ b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail_move_record.yml @@ -4,7 +4,7 @@ parsed_sample: chassis_id: "redacted.test.com" interface_ip: "10.0.0.1" local_interface: "Ethernet7/14" - mgmt_ip: "10.0.0.1" + mgmt_address: "10.0.0.1" neighbor_interface: "TenGigabitEthernet1/1/7" neighbor_name: "" platform: "C9300-48UXM" @@ -14,7 +14,7 @@ parsed_sample: chassis_id: "redacted.test.com" interface_ip: "10.0.0.3" local_interface: "Ethernet7/15" - mgmt_ip: "10.0.0.4" + mgmt_address: "10.0.0.4" neighbor_interface: "TenGigabitEthernet1/1/8" neighbor_name: "" platform: "C9300-48UXM" diff --git a/tests/cisco_wlc_ssh/show_cdp_neighbors_detail/cisco_wlc_ssh_show_cdp_neighbors_detail.yml b/tests/cisco_wlc_ssh/show_cdp_neighbors_detail/cisco_wlc_ssh_show_cdp_neighbors_detail.yml index 63b50e20f4..c8435df526 100644 --- a/tests/cisco_wlc_ssh/show_cdp_neighbors_detail/cisco_wlc_ssh_show_cdp_neighbors_detail.yml +++ b/tests/cisco_wlc_ssh/show_cdp_neighbors_detail/cisco_wlc_ssh_show_cdp_neighbors_detail.yml @@ -3,7 +3,7 @@ parsed_sample: - capabilities: "Router Switch IGMP" chassis_id: "AAA.pizza.com(FXS1828Q2JH)" local_interface: "GigabitEthernet0/0/2" - management_ip: "1.2.3.4" + mgmt_address: "1.2.3.4" neighbor_description: "Cisco Nexus Operating System (NX-OS) Software, Version\ \ 6.2(10)" neighbor_interface: "Ethernet1/15" @@ -11,7 +11,7 @@ parsed_sample: - capabilities: "Router Switch IGMP" chassis_id: "BBB.beer.com" local_interface: "GigabitEthernet0/0/7" - management_ip: "172.5.6.7" + mgmt_address: "172.5.6.7" neighbor_description: "Cisco IOS Software, C3750 Software (C3750-IPSERVICESK9-M),\ \ Version 12.2(55)SE11, RELEASE SOFTWARE (fc3) Technical Support: http://www.cisco.com/techsupport\ \ Copyright (c) 1986-2016 by Cisco Systems, Inc. Compiled Wed 17-Aug-16 13:28\ @@ -21,7 +21,7 @@ parsed_sample: - capabilities: "Router Switch IGMP" chassis_id: "CCC.cake.com" local_interface: "GigabitEthernet0/0/8" - management_ip: "172.9.10.11" + mgmt_address: "172.9.10.11" neighbor_description: "Cisco IOS Software, C3750 Software (C3750-IPSERVICESK9-M),\ \ Version 12.2(55)SE11, RELEASE SOFTWARE (fc3) Technical Support: http://www.cisco.com/techsupport\ \ Copyright (c) 1986-2016 by Cisco Systems, Inc. Compiled Wed 17-Aug-16 13:28\ diff --git a/tests/cisco_xr/show_cdp_neighbors_detail/cisco_xr_show_cdp_neighbors_detail.yml b/tests/cisco_xr/show_cdp_neighbors_detail/cisco_xr_show_cdp_neighbors_detail.yml index 3f1005b36a..c2332a1bef 100644 --- a/tests/cisco_xr/show_cdp_neighbors_detail/cisco_xr_show_cdp_neighbors_detail.yml +++ b/tests/cisco_xr/show_cdp_neighbors_detail/cisco_xr_show_cdp_neighbors_detail.yml @@ -3,7 +3,7 @@ parsed_sample: - capabilities: "Router Switch IGMP" chassis_id: "nyc-dc-dcm005.ntc.com" local_interface: "MgmtEth0/RSP0/CPU0/0" - mgmt_ip: "10.100.1.54" + mgmt_address: "10.100.1.54" neighbor_interface: "GigabitEthernet1/9" neighbor_name: "" platform: "cisco WS-C4948E" @@ -12,7 +12,7 @@ parsed_sample: - capabilities: "Router Switch IGMP" chassis_id: "nyc-dc-dcm006.ntc.com" local_interface: "MgmtEth0/RSP1/CPU0/0" - mgmt_ip: "10.100.1.55" + mgmt_address: "10.100.1.55" neighbor_interface: "GigabitEthernet1/9" neighbor_name: "" platform: "cisco WS-C4948E" @@ -21,7 +21,7 @@ parsed_sample: - capabilities: "Router Switch IGMP" chassis_id: "nyc-dc-c90.ntc.com" local_interface: "FortyGigE0/0/1/0" - mgmt_ip: "10.100.100.141" + mgmt_address: "10.100.100.141" neighbor_interface: "FortyGigE0/0/0/2" neighbor_name: "nyc-dc-c90.ntc.com" platform: "cisco CRS" @@ -29,7 +29,7 @@ parsed_sample: - capabilities: "Router Switch" chassis_id: "nyc-dc-d02.ntc.com(FXS182XXXXX)" local_interface: "FortyGigE0/0/1/1" - mgmt_ip: "10.100.100.162" + mgmt_address: "10.100.100.162" neighbor_interface: "Ethernet6/1" neighbor_name: "nyc-dc-d02" platform: "N77-C7706" @@ -37,7 +37,7 @@ parsed_sample: - capabilities: "Router" chassis_id: "nyc-dc-c97" local_interface: "FortyGigE0/0/0/0" - mgmt_ip: "10.100.100.19" + mgmt_address: "10.100.100.19" neighbor_interface: "FortyGigE0/0/0/0" neighbor_name: "nyc-dc-c97" platform: "cisco ASR9K Series" @@ -45,7 +45,7 @@ parsed_sample: - capabilities: "Router" chassis_id: "nyc-dc-c91.ntc.com" local_interface: "FortyGigE0/0/0/1" - mgmt_ip: "10.100.100.125" + mgmt_address: "10.100.100.125" neighbor_interface: "FortyGigE0/0/0/2" neighbor_name: "nyc-dc-c91.ntc.com" platform: "cisco CRS" @@ -53,7 +53,7 @@ parsed_sample: - capabilities: "Router" chassis_id: "nyc-dc-c97" local_interface: "FortyGigE0/1/0/0" - mgmt_ip: "10.100.100.113" + mgmt_address: "10.100.100.113" neighbor_interface: "FortyGigE0/1/0/0" neighbor_name: "nyc-dc-c97" platform: "cisco ASR9K Series" @@ -61,7 +61,7 @@ parsed_sample: - capabilities: "Router Switch" chassis_id: "nyc-dc-d03.ntc.com(FXS182XXXXX)" local_interface: "FortyGigE0/1/0/1" - mgmt_ip: "10.100.100.190" + mgmt_address: "10.100.100.190" neighbor_interface: "Ethernet6/1" neighbor_name: "nyc-dc-d03" platform: "N77-C7706" @@ -69,7 +69,7 @@ parsed_sample: - capabilities: "Router" chassis_id: "nyc-dc-c90.ntc.com" local_interface: "FortyGigE0/1/1/0" - mgmt_ip: "10.100.100.145" + mgmt_address: "10.100.100.145" neighbor_interface: "FortyGigE0/4/0/2" neighbor_name: "nyc-dc-c90.ntc.com" platform: "cisco CRS" @@ -77,7 +77,7 @@ parsed_sample: - capabilities: "Router Switch" chassis_id: "nyc-dc-z50a.ntc.com(JAF18XXXXX)" local_interface: "FortyGigE0/1/1/1" - mgmt_ip: "10.100.100.116" + mgmt_address: "10.100.100.116" neighbor_interface: "Ethernet4/3" neighbor_name: "nyc-dc-z50a" platform: "N77-C7710" @@ -85,7 +85,7 @@ parsed_sample: - capabilities: "Router Switch" chassis_id: "nyc-dc-d04.ntc.com(FXS18XXXXXX)" local_interface: "FortyGigE0/2/1/0" - mgmt_ip: "10.100.100.194" + mgmt_address: "10.100.100.194" neighbor_interface: "Ethernet6/1" neighbor_name: "nyc-dc-d04" platform: "N77-C7706" @@ -93,7 +93,7 @@ parsed_sample: - capabilities: "Router" chassis_id: "nyc-dc-c91.ntc.com" local_interface: "FortyGigE0/2/1/1" - mgmt_ip: "10.100.100.129" + mgmt_address: "10.100.100.129" neighbor_interface: "FortyGigE0/4/0/2" neighbor_name: "nyc-dc-c91.ntc.com" platform: "cisco CRS" @@ -101,7 +101,7 @@ parsed_sample: - capabilities: "Router Switch" chassis_id: "nyc-dc-d01.ntc.com(FXS182XXXXX)" local_interface: "FortyGigE0/2/0/0" - mgmt_ip: "10.100.100.158" + mgmt_address: "10.100.100.158" neighbor_interface: "Ethernet6/1" neighbor_name: "nyc-dc-d01" platform: "N77-C7706" @@ -109,7 +109,7 @@ parsed_sample: - capabilities: "Router Switch" chassis_id: "nyc-dc-z50b.ntc.com(JAF181XXXXX)" local_interface: "FortyGigE0/2/0/1" - mgmt_ip: "10.100.100.111" + mgmt_address: "10.100.100.111" neighbor_interface: "Ethernet4/3" neighbor_name: "nyc-dc-z50b" platform: "N77-C7710" @@ -117,7 +117,7 @@ parsed_sample: - capabilities: "Router Switch IGMP" chassis_id: "nyc-dc-dcc001.ntc.com" local_interface: "TenGigE0/3/0/0" - mgmt_ip: "10.100.100.174" + mgmt_address: "10.100.100.174" neighbor_interface: "TenGigabitEthernet6/1" neighbor_name: "" platform: "cisco WS-C4510R+E" @@ -126,7 +126,7 @@ parsed_sample: - capabilities: "Router" chassis_id: "nyc-dc-d57" local_interface: "TenGigE0/3/0/1" - mgmt_ip: "10.100.100.115" + mgmt_address: "10.100.100.115" neighbor_interface: "TenGigE0/2/0/0" neighbor_name: "nyc-dc-d57" platform: "cisco ASR9K Series" @@ -134,7 +134,7 @@ parsed_sample: - capabilities: "Router Switch" chassis_id: "nyc-dc-d40b.ntc.com(JAF182XXXXX)" local_interface: "TenGigE0/3/0/2" - mgmt_ip: "10.100.100.114" + mgmt_address: "10.100.100.114" neighbor_interface: "Ethernet4/1" neighbor_name: "nyc-dc-d40b" platform: "N77-C7710" @@ -142,7 +142,7 @@ parsed_sample: - capabilities: "Router Switch IGMP" chassis_id: "nyc-dc-d80.ntc.com(FOC184XXXXX)" local_interface: "TenGigE0/3/0/3" - mgmt_ip: "10.100.100.117" + mgmt_address: "10.100.100.117" neighbor_interface: "Ethernet2/1" neighbor_name: "nyc-dc-d80" platform: "N5K-C56128P" @@ -150,7 +150,7 @@ parsed_sample: - capabilities: "Router Switch IGMP" chassis_id: "nyc-dc-dcc002.ntc.com" local_interface: "TenGigE0/4/0/0" - mgmt_ip: "10.100.100.178" + mgmt_address: "10.100.100.178" neighbor_interface: "TenGigabitEthernet6/1" neighbor_name: "" platform: "cisco WS-C4510R+E" @@ -159,7 +159,7 @@ parsed_sample: - capabilities: "Router" chassis_id: "nyc-dc-d57" local_interface: "TenGigE0/4/0/1" - mgmt_ip: "10.100.100.115" + mgmt_address: "10.100.100.115" neighbor_interface: "TenGigE1/2/0/0" neighbor_name: "nyc-dc-d57" platform: "cisco ASR9K Series" @@ -167,7 +167,7 @@ parsed_sample: - capabilities: "Router Switch" chassis_id: "nyc-dc-d40a.ntc.com(JAF182XXXXX)" local_interface: "TenGigE0/4/0/2" - mgmt_ip: "10.100.100.113" + mgmt_address: "10.100.100.113" neighbor_interface: "Ethernet4/1" neighbor_name: "nyc-dc-d40a" platform: "N77-C7710" @@ -175,7 +175,7 @@ parsed_sample: - capabilities: "Router Switch IGMP" chassis_id: "nyc-dc-d81.ntc.com(FOC182XXXXX)" local_interface: "TenGigE0/4/0/3" - mgmt_ip: "10.100.100.118" + mgmt_address: "10.100.100.118" neighbor_interface: "Ethernet1/1" neighbor_name: "nyc-dc-d81" platform: "N5K-C56128P" @@ -183,7 +183,7 @@ parsed_sample: - capabilities: "Router" chassis_id: "nyc-dc-c97" local_interface: "FortyGigE0/6/0/0" - mgmt_ip: "192.168.169.21" + mgmt_address: "192.168.169.21" neighbor_interface: "FortyGigE0/6/0/0" neighbor_name: "nyc-dc-c97" platform: "cisco ASR9K Series" @@ -191,7 +191,7 @@ parsed_sample: - capabilities: "Router" chassis_id: "nyc-dc-c97" local_interface: "FortyGigE0/6/0/0" - mgmt_ip: "192.168.169.21" + mgmt_address: "192.168.169.21" neighbor_interface: "FortyGigE0/7/0/0" neighbor_name: "nyc-dc-c97" platform: "cisco ASR9K Series" diff --git a/tests/hp_comware/display_lldp_neighbor-information_verbose/hp_comware_display_lldp_neighbor-information_verbose.yml b/tests/hp_comware/display_lldp_neighbor-information_verbose/hp_comware_display_lldp_neighbor-information_verbose.yml index c7ef7de5f0..a516a615b2 100644 --- a/tests/hp_comware/display_lldp_neighbor-information_verbose/hp_comware_display_lldp_neighbor-information_verbose.yml +++ b/tests/hp_comware/display_lldp_neighbor-information_verbose/hp_comware_display_lldp_neighbor-information_verbose.yml @@ -2,28 +2,28 @@ parsed_sample: - chassis_id: "70f9-6d6b-1234" local_interface: "Ten-GigabitEthernet1/0/0/1" - management_ip: "" + mgmt_address: "" neighbor_interface: "GigabitEthernet0/0/1" neighbor_interface_description: "TO_CORE_1" neighbor_name: "SW1" vlan_id: "" - chassis_id: "70f9-6d17-1235" local_interface: "Ten-GigabitEthernet1/0/0/2" - management_ip: "10.6.5.4" + mgmt_address: "10.6.5.4" neighbor_interface: "Ten-GigabitEthernet1/0/0/5" neighbor_interface_description: "TO_CORE_2" neighbor_name: "SW2" vlan_id: "10" - chassis_id: "70f9-6d17-1236" local_interface: "Ten-GigabitEthernet1/0/0/3" - management_ip: "10.6.5.3" + mgmt_address: "10.6.5.3" neighbor_interface: "Ten-GigabitEthernet2/0/0/5" neighbor_interface_description: "TO_SPINE" neighbor_name: "SW3" vlan_id: "10" - chassis_id: "4c1c-503a-1234" local_interface: "GigabitEthernet0/0" - management_ip: "10.1.1.2" + mgmt_address: "10.1.1.2" neighbor_interface: "GigabitEthernet0/0" neighbor_interface_description: "GigabitEthernet0/0 Interface" neighbor_name: "Test-Router" diff --git a/tests/hp_procurve/show_lldp_info_remote-device_detail/hp_procurve_show_lldp_info_remote-device_detail.yml b/tests/hp_procurve/show_lldp_info_remote-device_detail/hp_procurve_show_lldp_info_remote-device_detail.yml index bd4cf8ed31..0575c6fb37 100644 --- a/tests/hp_procurve/show_lldp_info_remote-device_detail/hp_procurve_show_lldp_info_remote-device_detail.yml +++ b/tests/hp_procurve/show_lldp_info_remote-device_detail/hp_procurve_show_lldp_info_remote-device_detail.yml @@ -4,95 +4,95 @@ parsed_sample: capabilities_supported: "bridge, router" chassis_id: "3821c7-c1cd00" local_interface: "1" + mgmt_address: "192.168.130.100" neighbor_chassis_type: "mac-address" neighbor_description: "Aruba JL357A 2540-48G-PoE+-4SFP+ Switch, revision YC.16.0..." neighbor_interface: "1" neighbor_interface_description: "1" neighbor_name: "65432p-swi006-abcd-srvroom-4asd" port_type: "local" - remote_management_address: "192.168.130.100" vlan_id: "0" - capabilities: "" capabilities_supported: "" chassis_id: "3ce1a1-2218f0" local_interface: "3" + mgmt_address: "" neighbor_chassis_type: "mac-address" neighbor_description: "" neighbor_interface: "3c e1 a1 22 18 f0" neighbor_interface_description: "" neighbor_name: "" port_type: "mac-address" - remote_management_address: "" vlan_id: "" - capabilities: "bridge, wlan-access-point" capabilities_supported: "bridge, wlan-access-point" chassis_id: "bcf310-1f8b40" local_interface: "7" + mgmt_address: "192.168.100.55" neighbor_chassis_type: "mac-address" neighbor_description: "" neighbor_interface: "mgt0" neighbor_interface_description: "" neighbor_name: "AH-cust-AP21" port_type: "interface-name" - remote_management_address: "192.168.100.55" vlan_id: "" - capabilities: "" capabilities_supported: "" chassis_id: "d8cb8a-6d303c" local_interface: "25" + mgmt_address: "" neighbor_chassis_type: "mac-address" neighbor_description: "" neighbor_interface: "d8 cb 8a 6d 30 3c" neighbor_interface_description: "" neighbor_name: "" port_type: "mac-address" - remote_management_address: "" vlan_id: "" - capabilities: "" capabilities_supported: "" chassis_id: "484d7e-e66c42" local_interface: "29" + mgmt_address: "" neighbor_chassis_type: "mac-address" neighbor_description: "" neighbor_interface: "48 4d 7e e6 6c 42" neighbor_interface_description: "" neighbor_name: "" port_type: "mac-address" - remote_management_address: "" vlan_id: "" - capabilities: "bridge, wlan-access-point, router" capabilities_supported: "bridge, wlan-access-point, router" chassis_id: "603197-7aa548" local_interface: "36" + mgmt_address: "192.168.100.50" neighbor_chassis_type: "mac-address" neighbor_description: "ZLD 6.00(###.8)B1 (cannon)" neighbor_interface: "1" neighbor_interface_description: "UPLINK" neighbor_name: "NAP203" port_type: "local" - remote_management_address: "192.168.100.50" vlan_id: "" - capabilities: "" capabilities_supported: "" chassis_id: "b00cd1-359a98" local_interface: "37" + mgmt_address: "" neighbor_chassis_type: "mac-address" neighbor_description: "" neighbor_interface: "b0 0c d1 35 9a 98" neighbor_interface_description: "" neighbor_name: "" port_type: "mac-address" - remote_management_address: "" vlan_id: "" - capabilities: "" capabilities_supported: "" chassis_id: "d8cb8a-894644" local_interface: "42" + mgmt_address: "" neighbor_chassis_type: "mac-address" neighbor_description: "" neighbor_interface: "d8 cb 8a 89 46 44" neighbor_interface_description: "" neighbor_name: "" port_type: "mac-address" - remote_management_address: "" vlan_id: "" diff --git a/tests/huawei_vrp/display_lldp_neighbor/huawei_vrp_display_lldp_neighbor.yml b/tests/huawei_vrp/display_lldp_neighbor/huawei_vrp_display_lldp_neighbor.yml index 68e2d3ba1d..93240bf1ba 100644 --- a/tests/huawei_vrp/display_lldp_neighbor/huawei_vrp_display_lldp_neighbor.yml +++ b/tests/huawei_vrp/display_lldp_neighbor/huawei_vrp_display_lldp_neighbor.yml @@ -3,8 +3,8 @@ parsed_sample: - capabilities: "bridge" chassis_id: "f55f-c2c5-e180" local_interface: "GigabitEthernet0/0/1" - management_ip: "192.168.0.240" manufacturer: "Cisco Systems, Inc." + mgmt_address: "192.168.0.240" neighbor_description: - "Cisco IOS Software, C2960S Software (C2960S-UNIVERSALK9-M), Version 12.2(55)SE7,\ \ RELEASE SOFTWARE (fc1)" @@ -20,8 +20,8 @@ parsed_sample: - capabilities: "bridge" chassis_id: "f41f-c2c5-e180" local_interface: "GigabitEthernet0/0/8" - management_ip: "192.168.0.241" manufacturer: "Cisco Systems, Inc." + mgmt_address: "192.168.0.241" neighbor_description: - "Cisco IOS Software, C2960S Software (C2960S-UNIVERSALK9-M), Version 12.2(55)SE7,\ \ RELEASE SOFTWARE (fc1)" From 84c78ee464647f39941c8f9c468603249a982154 Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sun, 3 Sep 2023 20:45:53 -0400 Subject: [PATCH 37/41] replace NEIGHBOR_ADDRESS with MGMT_ADDRESS in hp_procurve_show_cdp_neighbors_detail add mgmt_address to data_model.md --- docs/dev/data_model.md | 1 + .../hp_procurve_show_cdp_neighbors_detail.textfsm | 4 ++-- .../hp_procurve_show_cdp_neighbors_detail.yml | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/docs/dev/data_model.md b/docs/dev/data_model.md index 457adae524..9732ab41f2 100644 --- a/docs/dev/data_model.md +++ b/docs/dev/data_model.md @@ -43,6 +43,7 @@ Example: Imagine the extra programming logic needed to consume structured data w | `MAC_ADDRESS` | instead of MAC or MACADDR | | `MEMBER_INTERFACE` | list of physical member interface names that are bundled to make an etherchannel, LACP, LAG, or port-channel interface | | `MEMBER_INTERFACE_STATUS` | list of member interface statuses for an etherchannel, LACP, LAG, or port-channel interface | +| `MGMT_ADDRESS` | management address, used when data could be an Ethernet MAC address or an IP address (ex: CDP or LLDP templates) | | `MGMT_IP_ADDRESS` | instead of MGMT_IP or MGMT_ADDRESS or MANAGEMENT_IP or REMOTE_MANAGEMENT_ADDRESS | | `NEIGHBOR_DESCRIPTION` | often represents CDP or LLDP neighbor or system name description | | `NEIGHBOR_ID` | for router IDs remote to the system being parsed | diff --git a/ntc_templates/templates/hp_procurve_show_cdp_neighbors_detail.textfsm b/ntc_templates/templates/hp_procurve_show_cdp_neighbors_detail.textfsm index c594e09aad..44047db369 100644 --- a/ntc_templates/templates/hp_procurve_show_cdp_neighbors_detail.textfsm +++ b/ntc_templates/templates/hp_procurve_show_cdp_neighbors_detail.textfsm @@ -1,6 +1,6 @@ Value Required LOCAL_INTERFACE (.+?) Value CHASSIS_ID (.+?) -Value NEIGHBOR_ADDRESS (.+?) +Value MGMT_ADDRESS (.+?) Value PLATFORM (.+?) Value CAPABILITIES (.+?) Value NEIGHBOR_INTERFACE (.+?) @@ -11,7 +11,7 @@ Start ^\s*Port\s*:\s*${LOCAL_INTERFACE}\s*$$ ^\s*Device\s+ID\s*:\s*${CHASSIS_ID}\s*$$ ^\s*Address\s+Type - ^\s*Address\s*:\s*${NEIGHBOR_ADDRESS}\s*$$ + ^\s*Address\s*:\s*${MGMT_ADDRESS}\s*$$ ^\s*Platform\s*:\s*${PLATFORM}\s*$$ ^\s*Capability\s*:\s*${CAPABILITIES}\s*$$ ^\s*Device\s+Port\s*:\s*${NEIGHBOR_INTERFACE}\s*$$ diff --git a/tests/hp_procurve/show_cdp_neighbors_detail/hp_procurve_show_cdp_neighbors_detail.yml b/tests/hp_procurve/show_cdp_neighbors_detail/hp_procurve_show_cdp_neighbors_detail.yml index cf54a23603..07bc62b9d9 100644 --- a/tests/hp_procurve/show_cdp_neighbors_detail/hp_procurve_show_cdp_neighbors_detail.yml +++ b/tests/hp_procurve/show_cdp_neighbors_detail/hp_procurve_show_cdp_neighbors_detail.yml @@ -3,28 +3,28 @@ parsed_sample: - capabilities: "Router" chassis_id: "AP01-Site" local_interface: "1" - neighbor_address: "10.11.11.16" + mgmt_address: "10.11.11.16" neighbor_description: "5.9.1.5-001RAP-6521-60020-WR" neighbor_interface: "ge1" platform: "5.9.1.5-001RAP-6521-60020-WR" - capabilities: "Router" chassis_id: "5c 0e 8b 11 11 11" local_interface: "1" - neighbor_address: "10.11.11.16" + mgmt_address: "10.11.11.16" neighbor_description: "AP-6521-60020-WR, Version 5.9.1.5-001R" neighbor_interface: "ge1" platform: "AP-6521-60020-WR, Version 5.9.1.5-001R" - capabilities: "Router" chassis_id: "5c 0e 8b 12 22 22" local_interface: "2" - neighbor_address: "Unsupported format" + mgmt_address: "Unsupported format" neighbor_description: "AP-6521-60020-WR, Version 5.9.1.5-001R" neighbor_interface: "ge1" platform: "AP-6521-60020-WR, Version 5.9.1.5-001R" - capabilities: "Router" chassis_id: "AP02-Site" local_interface: "2" - neighbor_address: "10.11.11.17" + mgmt_address: "10.11.11.17" neighbor_description: "5.9.1.5-001RAP-6521-60020-WR" neighbor_interface: "ge1" platform: "5.9.1.5-001RAP-6521-60020-WR" From cacafd06d17b1ce5b6402ebde2908b3eb93a35fd Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sun, 3 Sep 2023 20:54:21 -0400 Subject: [PATCH 38/41] replace PORT_ID with NEIGHBOR_INTERFACE in broadcom_icos_show_lldp_remote-device_all to normalize --- ...m_icos_show_lldp_remote-device_all.textfsm | 6 +- ...adcom_icos_show_lldp_remote-device_all.yml | 62 +++++++++---------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/ntc_templates/templates/broadcom_icos_show_lldp_remote-device_all.textfsm b/ntc_templates/templates/broadcom_icos_show_lldp_remote-device_all.textfsm index 6d080e90af..07736aa581 100644 --- a/ntc_templates/templates/broadcom_icos_show_lldp_remote-device_all.textfsm +++ b/ntc_templates/templates/broadcom_icos_show_lldp_remote-device_all.textfsm @@ -1,7 +1,7 @@ Value LOCAL_INTERFACE (\S+) Value REMOTE_ID (\S+) Value CHASSIS_ID (\S+) -Value PORT_ID (\S+) +Value NEIGHBOR_INTERFACE (\S+) Value NEIGHBOR_NAME (\S+) Start @@ -12,8 +12,8 @@ Start ^Local ^\s*Interface\s+RemID\s+Chassis\s+ID\s+Port\s+ID\s+System\s+Name$$ ^-+ - ^\s*${LOCAL_INTERFACE}\s+${REMOTE_ID}\s+${CHASSIS_ID}\s+${PORT_ID}\s+${NEIGHBOR_NAME} -> Record + ^\s*${LOCAL_INTERFACE}\s+${REMOTE_ID}\s+${CHASSIS_ID}\s+${NEIGHBOR_INTERFACE}\s+${NEIGHBOR_NAME} -> Record # Match records that only include the interface value ^\s*${LOCAL_INTERFACE} -> Record ^\s*$$ - ^. -> Error \ No newline at end of file + ^. -> Error diff --git a/tests/broadcom_icos/show_lldp_remote-device_all/broadcom_icos_show_lldp_remote-device_all.yml b/tests/broadcom_icos/show_lldp_remote-device_all/broadcom_icos_show_lldp_remote-device_all.yml index 69dba816ed..cea5deccff 100644 --- a/tests/broadcom_icos/show_lldp_remote-device_all/broadcom_icos_show_lldp_remote-device_all.yml +++ b/tests/broadcom_icos/show_lldp_remote-device_all/broadcom_icos_show_lldp_remote-device_all.yml @@ -2,156 +2,156 @@ parsed_sample: - chassis_id: "84:3D:C6:00:12:E0" local_interface: "0/1" + neighbor_interface: "Gi0" neighbor_name: "abc-1-00001.y" - port_id: "Gi0" remote_id: "17" - chassis_id: "00:A6:CA:00:53:C0" local_interface: "0/2" + neighbor_interface: "Gi0" neighbor_name: "abc-1-00002.y" - port_id: "Gi0" remote_id: "16" - chassis_id: "F4:DB:E6:00:9F:46" local_interface: "0/3" + neighbor_interface: "0" neighbor_name: "abc-1-00003M" - port_id: "0" remote_id: "18" - chassis_id: "F4:DB:E6:00:44:9E" local_interface: "0/4" + neighbor_interface: "0" neighbor_name: "abc-1-00004M" - port_id: "0" remote_id: "19" - chassis_id: "F4:DB:E6:00:AC:FE" local_interface: "0/5" + neighbor_interface: "Te2/1" neighbor_name: "abc-1-00005M" - port_id: "Te2/1" remote_id: "20" - chassis_id: "" local_interface: "0/25" + neighbor_interface: "" neighbor_name: "" - port_id: "" remote_id: "" - chassis_id: "" local_interface: "0/26" + neighbor_interface: "" neighbor_name: "" - port_id: "" remote_id: "" - chassis_id: "" local_interface: "0/27" + neighbor_interface: "" neighbor_name: "" - port_id: "" remote_id: "" - chassis_id: "" local_interface: "0/28" + neighbor_interface: "" neighbor_name: "" - port_id: "" remote_id: "" - chassis_id: "" local_interface: "0/29" + neighbor_interface: "" neighbor_name: "" - port_id: "" remote_id: "" - chassis_id: "" local_interface: "0/30" + neighbor_interface: "" neighbor_name: "" - port_id: "" remote_id: "" - chassis_id: "" local_interface: "0/31" + neighbor_interface: "" neighbor_name: "" - port_id: "" remote_id: "" - chassis_id: "" local_interface: "0/32" + neighbor_interface: "" neighbor_name: "" - port_id: "" remote_id: "" - chassis_id: "" local_interface: "0/33" + neighbor_interface: "" neighbor_name: "" - port_id: "" remote_id: "" - chassis_id: "" local_interface: "0/34" + neighbor_interface: "" neighbor_name: "" - port_id: "" remote_id: "" - chassis_id: "6C:00:C5:4D:86:3A" local_interface: "0/35" + neighbor_interface: "6C:00:C5:4D:86:3B" neighbor_name: "abc-aa-acc-sw" - port_id: "6C:00:C5:4D:86:3B" remote_id: "8" - chassis_id: "" local_interface: "0/36" + neighbor_interface: "" neighbor_name: "" - port_id: "" remote_id: "" - chassis_id: "6C:00:C5:49:E7:40" local_interface: "0/37" + neighbor_interface: "6C:00:C5:49:E7:41" neighbor_name: "abc-bb-acc-sw" - port_id: "6C:00:C5:49:E7:41" remote_id: "7" - chassis_id: "" local_interface: "0/38" + neighbor_interface: "" neighbor_name: "" - port_id: "" remote_id: "" - chassis_id: "6C:00:C5:49:08:8A" local_interface: "0/39" + neighbor_interface: "6C:00:C5:49:08:8B" neighbor_name: "abc-cc-acc-sw" - port_id: "6C:00:C5:49:08:8B" remote_id: "29" - chassis_id: "" local_interface: "0/40" + neighbor_interface: "" neighbor_name: "" - port_id: "" remote_id: "" - chassis_id: "" local_interface: "0/41" + neighbor_interface: "" neighbor_name: "" - port_id: "" remote_id: "" - chassis_id: "00:00:64:4D:00:68" local_interface: "0/42" + neighbor_interface: "00:00:64:4D:6E:68" neighbor_name: "u0030644d6e685" - port_id: "00:00:64:4D:6E:68" remote_id: "26" - chassis_id: "6C:00:C5:49:8D:DE" local_interface: "0/43" + neighbor_interface: "6C:00:C5:49:8D:DF" neighbor_name: "abc-dd-acc-sw" - port_id: "6C:00:C5:49:8D:DF" remote_id: "9" - chassis_id: "" local_interface: "0/44" + neighbor_interface: "" neighbor_name: "" - port_id: "" remote_id: "" - chassis_id: "00:00:64:4D:D7:F0" local_interface: "0/45" + neighbor_interface: "00:00:64:4D:D7:F0" neighbor_name: "u0030644dd7f05" - port_id: "00:00:64:4D:D7:F0" remote_id: "24" - chassis_id: "" local_interface: "0/46" + neighbor_interface: "" neighbor_name: "" - port_id: "" remote_id: "" - chassis_id: "00:00:64:4D:72:8A" local_interface: "0/47" + neighbor_interface: "00:00:64:4D:72:8A" neighbor_name: "u0030644d728a5" - port_id: "00:00:64:4D:72:8A" remote_id: "4" - chassis_id: "" local_interface: "0/48" + neighbor_interface: "" neighbor_name: "" - port_id: "" remote_id: "" - chassis_id: "A8:00:B5:57:CC:8D" local_interface: "0/49" + neighbor_interface: "A8:00:B5:57:CC:8E" neighbor_name: "abc-ee-abc-sw0101" - port_id: "A8:00:B5:57:CC:8E" remote_id: "1" - chassis_id: "A8:00:B5:57:CB:01" local_interface: "0/50" + neighbor_interface: "A8:00:B5:57:CB:02" neighbor_name: "abc-ff-abc-sw0102" - port_id: "A8:00:B5:57:CB:02" remote_id: "2" From e46532a144a8bbd0c08ae5c1845dfdc3b89b8a3c Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sun, 3 Sep 2023 21:17:52 -0400 Subject: [PATCH 39/41] normalize and capitalize capture groups in brocade_fastiron and brocade_netiron show_lldp_neighbors_detail templates --- ...astiron_show_lldp_neighbors_detail.textfsm | 42 ++--- ...netiron_show_lldp_neighbors_detail.textfsm | 42 ++--- ...de_fastiron_show_lldp_neighbors_detail.yml | 66 ++++---- ...e_fastiron_show_lldp_neighbors_detail1.yml | 154 +++++++++--------- ...ade_netiron_show_lldp_neighbors_detail.yml | 110 ++++++------- 5 files changed, 207 insertions(+), 207 deletions(-) diff --git a/ntc_templates/templates/brocade_fastiron_show_lldp_neighbors_detail.textfsm b/ntc_templates/templates/brocade_fastiron_show_lldp_neighbors_detail.textfsm index ae6c3da7d9..50027dd641 100644 --- a/ntc_templates/templates/brocade_fastiron_show_lldp_neighbors_detail.textfsm +++ b/ntc_templates/templates/brocade_fastiron_show_lldp_neighbors_detail.textfsm @@ -1,24 +1,24 @@ -Value Filldown interface ([0-9\/]+) -Value Required neimac (\w+\.\w+\.\w+) -Value ttlsecs (\d+) -Value neihostnametid (.+) -Value neiinterface ([a-zA-Z0-9\/\s]+) -Value neipvid (\d+|none) -Value neimgmtip (\d+\.\d+\.\d+\.\d+) -Value neilacpindex (\d+) -Value neimaxframesize (\d+) -Value neiopmau ([a-zA-Z0-9\-]+) -Value neicapabilities (.+) +Value Filldown LOCAL_INTERFACE ([0-9\/]+) +Value Required NEIGHBOR_PORT_ID (\w+\.\w+\.\w+) +Value HOLDTIME (\d+) +Value NEIGHBOR_NAME (.+) +Value NEIGHBOR_INTERFACE ([a-zA-Z0-9\/\s]+) +Value VLAN_ID (\d+|none) +Value MGMT_ADDRESS (\d+\.\d+\.\d+\.\d+) +Value NEIGHBOR_LACP_INDEX (\d+) +Value NEIGHBOR_MAX_FRAME_SIZE (\d+) +Value NEIGHBOR_MAU ([a-zA-Z0-9\-]+) +Value CAPABILITIES (.+) Start ^\w -> Continue.Record - ^Local\s+port:\s+${interface} - ^\s+\+\s+System\s+name\s+:\s+"${neihostnametid}" - ^\s+\+\s+Port\s+description\s+:\s+"${neiinterface}" - ^\s+Enabled\s+capabilities\s*:\s+${neicapabilities} - ^\s+\+\s+Port\s+VLAN\s+ID:\s+${neipvid} - ^\s+\+\s+Management\s+address\s+\(IPv4\):\s+${neimgmtip} - ^\s+\+\s+Link\s+aggregation:\s+aggregated\s+\(aggregated\s+port\s+ifIndex:\s+${neilacpindex}\) - ^\s+\+\s+Maximum\s+frame\s+size:\s+${neimaxframesize} - ^\s+Operational\s+MAU\s+type\s+:\s+${neiopmau} - ^\s+Neighbor:\s+${neimac},\s+TTL\s+${ttlsecs} + ^Local\s+port:\s+${LOCAL_INTERFACE} + ^\s+\+\s+System\s+name\s+:\s+"${NEIGHBOR_NAME}" + ^\s+\+\s+Port\s+description\s+:\s+"${NEIGHBOR_INTERFACE}" + ^\s+Enabled\s+capabilities\s*:\s+${CAPABILITIES} + ^\s+\+\s+Port\s+VLAN\s+ID:\s+${VLAN_ID} + ^\s+\+\s+Management\s+address\s+\(IPv4\):\s+${MGMT_ADDRESS} + ^\s+\+\s+Link\s+aggregation:\s+aggregated\s+\(aggregated\s+port\s+ifIndex:\s+${NEIGHBOR_LACP_INDEX}\) + ^\s+\+\s+Maximum\s+frame\s+size:\s+${NEIGHBOR_MAX_FRAME_SIZE} + ^\s+Operational\s+MAU\s+type\s+:\s+${NEIGHBOR_MAU} + ^\s+Neighbor:\s+${NEIGHBOR_PORT_ID},\s+TTL\s+${HOLDTIME} diff --git a/ntc_templates/templates/brocade_netiron_show_lldp_neighbors_detail.textfsm b/ntc_templates/templates/brocade_netiron_show_lldp_neighbors_detail.textfsm index ae6c3da7d9..50027dd641 100644 --- a/ntc_templates/templates/brocade_netiron_show_lldp_neighbors_detail.textfsm +++ b/ntc_templates/templates/brocade_netiron_show_lldp_neighbors_detail.textfsm @@ -1,24 +1,24 @@ -Value Filldown interface ([0-9\/]+) -Value Required neimac (\w+\.\w+\.\w+) -Value ttlsecs (\d+) -Value neihostnametid (.+) -Value neiinterface ([a-zA-Z0-9\/\s]+) -Value neipvid (\d+|none) -Value neimgmtip (\d+\.\d+\.\d+\.\d+) -Value neilacpindex (\d+) -Value neimaxframesize (\d+) -Value neiopmau ([a-zA-Z0-9\-]+) -Value neicapabilities (.+) +Value Filldown LOCAL_INTERFACE ([0-9\/]+) +Value Required NEIGHBOR_PORT_ID (\w+\.\w+\.\w+) +Value HOLDTIME (\d+) +Value NEIGHBOR_NAME (.+) +Value NEIGHBOR_INTERFACE ([a-zA-Z0-9\/\s]+) +Value VLAN_ID (\d+|none) +Value MGMT_ADDRESS (\d+\.\d+\.\d+\.\d+) +Value NEIGHBOR_LACP_INDEX (\d+) +Value NEIGHBOR_MAX_FRAME_SIZE (\d+) +Value NEIGHBOR_MAU ([a-zA-Z0-9\-]+) +Value CAPABILITIES (.+) Start ^\w -> Continue.Record - ^Local\s+port:\s+${interface} - ^\s+\+\s+System\s+name\s+:\s+"${neihostnametid}" - ^\s+\+\s+Port\s+description\s+:\s+"${neiinterface}" - ^\s+Enabled\s+capabilities\s*:\s+${neicapabilities} - ^\s+\+\s+Port\s+VLAN\s+ID:\s+${neipvid} - ^\s+\+\s+Management\s+address\s+\(IPv4\):\s+${neimgmtip} - ^\s+\+\s+Link\s+aggregation:\s+aggregated\s+\(aggregated\s+port\s+ifIndex:\s+${neilacpindex}\) - ^\s+\+\s+Maximum\s+frame\s+size:\s+${neimaxframesize} - ^\s+Operational\s+MAU\s+type\s+:\s+${neiopmau} - ^\s+Neighbor:\s+${neimac},\s+TTL\s+${ttlsecs} + ^Local\s+port:\s+${LOCAL_INTERFACE} + ^\s+\+\s+System\s+name\s+:\s+"${NEIGHBOR_NAME}" + ^\s+\+\s+Port\s+description\s+:\s+"${NEIGHBOR_INTERFACE}" + ^\s+Enabled\s+capabilities\s*:\s+${CAPABILITIES} + ^\s+\+\s+Port\s+VLAN\s+ID:\s+${VLAN_ID} + ^\s+\+\s+Management\s+address\s+\(IPv4\):\s+${MGMT_ADDRESS} + ^\s+\+\s+Link\s+aggregation:\s+aggregated\s+\(aggregated\s+port\s+ifIndex:\s+${NEIGHBOR_LACP_INDEX}\) + ^\s+\+\s+Maximum\s+frame\s+size:\s+${NEIGHBOR_MAX_FRAME_SIZE} + ^\s+Operational\s+MAU\s+type\s+:\s+${NEIGHBOR_MAU} + ^\s+Neighbor:\s+${NEIGHBOR_PORT_ID},\s+TTL\s+${HOLDTIME} diff --git a/tests/brocade_fastiron/show_lldp_neighbors_detail/brocade_fastiron_show_lldp_neighbors_detail.yml b/tests/brocade_fastiron/show_lldp_neighbors_detail/brocade_fastiron_show_lldp_neighbors_detail.yml index f073a1ac1e..8906beb3ad 100644 --- a/tests/brocade_fastiron/show_lldp_neighbors_detail/brocade_fastiron_show_lldp_neighbors_detail.yml +++ b/tests/brocade_fastiron/show_lldp_neighbors_detail/brocade_fastiron_show_lldp_neighbors_detail.yml @@ -1,35 +1,35 @@ --- parsed_sample: - - interface: "1" - neimac: "0024.38a5.5f31" - ttlsecs: "101" - neihostnametid: "mlx1.clmamofw" - neiinterface: "GigabitEthernet2/2" - neipvid: "none" - neimgmtip: "216.106.44.48" - neilacpindex: "66" - neimaxframesize: "9216" - neiopmau: "1000BaseT-FD" - neicapabilities: "bridge, router" - - interface: "2" - neimac: "001b.ed6b.3102" - ttlsecs: "98" - neihostnametid: "switch1b.clmamofw" - neiinterface: "GigabitEthernet3" - neipvid: "1" - neimgmtip: "10.255.1.47" - neilacpindex: "0" - neimaxframesize: "10240" - neiopmau: "1000BaseLX-FD" - neicapabilities: "bridge" - - interface: "11" - neimac: "609c.9f46.6e34" - ttlsecs: "96" - neihostnametid: "switch2.clmamoxo" - neiinterface: "GigabitEthernet2/1/1" - neipvid: "none" - neimgmtip: "10.255.13.30" - neilacpindex: "257" - neimaxframesize: "10200" - neiopmau: "1000BaseT-FD" - neicapabilities: "bridge" + - capabilities: "bridge, router" + holdtime: "101" + local_interface: "1" + mgmt_address: "216.106.44.48" + neighbor_interface: "GigabitEthernet2/2" + neighbor_lacp_index: "66" + neighbor_mau: "1000BaseT-FD" + neighbor_max_frame_size: "9216" + neighbor_name: "mlx1.clmamofw" + neighbor_port_id: "0024.38a5.5f31" + vlan_id: "none" + - capabilities: "bridge" + holdtime: "98" + local_interface: "2" + mgmt_address: "10.255.1.47" + neighbor_interface: "GigabitEthernet3" + neighbor_lacp_index: "0" + neighbor_mau: "1000BaseLX-FD" + neighbor_max_frame_size: "10240" + neighbor_name: "switch1b.clmamofw" + neighbor_port_id: "001b.ed6b.3102" + vlan_id: "1" + - capabilities: "bridge" + holdtime: "96" + local_interface: "11" + mgmt_address: "10.255.13.30" + neighbor_interface: "GigabitEthernet2/1/1" + neighbor_lacp_index: "257" + neighbor_mau: "1000BaseT-FD" + neighbor_max_frame_size: "10200" + neighbor_name: "switch2.clmamoxo" + neighbor_port_id: "609c.9f46.6e34" + vlan_id: "none" diff --git a/tests/brocade_fastiron/show_lldp_neighbors_detail/brocade_fastiron_show_lldp_neighbors_detail1.yml b/tests/brocade_fastiron/show_lldp_neighbors_detail/brocade_fastiron_show_lldp_neighbors_detail1.yml index e3a30a5d86..236fac9504 100644 --- a/tests/brocade_fastiron/show_lldp_neighbors_detail/brocade_fastiron_show_lldp_neighbors_detail1.yml +++ b/tests/brocade_fastiron/show_lldp_neighbors_detail/brocade_fastiron_show_lldp_neighbors_detail1.yml @@ -1,79 +1,79 @@ --- parsed_sample: - - interface: "1/1/2" - neimac: "00a0.c85a.a3dd" - ttlsecs: "118" - neihostnametid: "CLMAMOXR-TA5000B" - neiinterface: "" - neipvid: "" - neimgmtip: "10.255.5.98" - neilacpindex: "" - neimaxframesize: "" - neiopmau: "" - neicapabilities: "bridge" - - interface: "1/1/24" - neimac: "609c.9f44.bbf0" - ttlsecs: "97" - neihostnametid: "switch2.clmamoxi" - neiinterface: "GigabitEthernet2/1/1" - neipvid: "none" - neimgmtip: "10.255.13.22" - neilacpindex: "257" - neimaxframesize: "10200" - neiopmau: "1000BaseT-FD" - neicapabilities: "bridge" - - interface: "1/3/1" - neimac: "609c.9f44.bc13" - ttlsecs: "113" - neihostnametid: "switch2.clmamoxi" - neiinterface: "10GigabitEthernet2/3/1" - neipvid: "none" - neimgmtip: "10.255.13.22" - neilacpindex: "385" - neimaxframesize: "10200" - neiopmau: "10GigBaseER" - neicapabilities: "bridge" - - interface: "1/3/2" - neimac: "609c.9f44.bc14" - ttlsecs: "113" - neihostnametid: "switch2.clmamoxi" - neiinterface: "10GigabitEthernet2/3/2" - neipvid: "none" - neimgmtip: "10.255.13.22" - neilacpindex: "385" - neimaxframesize: "10200" - neiopmau: "10GigBaseER" - neicapabilities: "bridge" - - interface: "2/1/1" - neimac: "cc4e.24c7.ccd4" - ttlsecs: "107" - neihostnametid: "Switch2.CLMAMOXH" - neiinterface: "GigabitEthernet1/1/1" - neipvid: "none" - neimgmtip: "10.255.13.2" - neilacpindex: "1" - neimaxframesize: "10200" - neiopmau: "1000BaseT-FD" - neicapabilities: "bridge" - - interface: "2/3/1" - neimac: "cc4e.24c7.af6f" - ttlsecs: "112" - neihostnametid: "Switch2.CLMAMOXH" - neiinterface: "10GigabitEthernet2/3/1" - neipvid: "none" - neimgmtip: "10.255.13.2" - neilacpindex: "385" - neimaxframesize: "10200" - neiopmau: "10GigBaseER" - neicapabilities: "bridge" - - interface: "2/3/2" - neimac: "cc4e.24c7.af71" - ttlsecs: "112" - neihostnametid: "Switch2.CLMAMOXH" - neiinterface: "10GigabitEthernet2/3/3" - neipvid: "none" - neimgmtip: "10.255.13.2" - neilacpindex: "385" - neimaxframesize: "10200" - neiopmau: "10GigBaseER" - neicapabilities: "bridge" + - capabilities: "bridge" + holdtime: "118" + local_interface: "1/1/2" + mgmt_address: "10.255.5.98" + neighbor_interface: "" + neighbor_lacp_index: "" + neighbor_mau: "" + neighbor_max_frame_size: "" + neighbor_name: "CLMAMOXR-TA5000B" + neighbor_port_id: "00a0.c85a.a3dd" + vlan_id: "" + - capabilities: "bridge" + holdtime: "97" + local_interface: "1/1/24" + mgmt_address: "10.255.13.22" + neighbor_interface: "GigabitEthernet2/1/1" + neighbor_lacp_index: "257" + neighbor_mau: "1000BaseT-FD" + neighbor_max_frame_size: "10200" + neighbor_name: "switch2.clmamoxi" + neighbor_port_id: "609c.9f44.bbf0" + vlan_id: "none" + - capabilities: "bridge" + holdtime: "113" + local_interface: "1/3/1" + mgmt_address: "10.255.13.22" + neighbor_interface: "10GigabitEthernet2/3/1" + neighbor_lacp_index: "385" + neighbor_mau: "10GigBaseER" + neighbor_max_frame_size: "10200" + neighbor_name: "switch2.clmamoxi" + neighbor_port_id: "609c.9f44.bc13" + vlan_id: "none" + - capabilities: "bridge" + holdtime: "113" + local_interface: "1/3/2" + mgmt_address: "10.255.13.22" + neighbor_interface: "10GigabitEthernet2/3/2" + neighbor_lacp_index: "385" + neighbor_mau: "10GigBaseER" + neighbor_max_frame_size: "10200" + neighbor_name: "switch2.clmamoxi" + neighbor_port_id: "609c.9f44.bc14" + vlan_id: "none" + - capabilities: "bridge" + holdtime: "107" + local_interface: "2/1/1" + mgmt_address: "10.255.13.2" + neighbor_interface: "GigabitEthernet1/1/1" + neighbor_lacp_index: "1" + neighbor_mau: "1000BaseT-FD" + neighbor_max_frame_size: "10200" + neighbor_name: "Switch2.CLMAMOXH" + neighbor_port_id: "cc4e.24c7.ccd4" + vlan_id: "none" + - capabilities: "bridge" + holdtime: "112" + local_interface: "2/3/1" + mgmt_address: "10.255.13.2" + neighbor_interface: "10GigabitEthernet2/3/1" + neighbor_lacp_index: "385" + neighbor_mau: "10GigBaseER" + neighbor_max_frame_size: "10200" + neighbor_name: "Switch2.CLMAMOXH" + neighbor_port_id: "cc4e.24c7.af6f" + vlan_id: "none" + - capabilities: "bridge" + holdtime: "112" + local_interface: "2/3/2" + mgmt_address: "10.255.13.2" + neighbor_interface: "10GigabitEthernet2/3/3" + neighbor_lacp_index: "385" + neighbor_mau: "10GigBaseER" + neighbor_max_frame_size: "10200" + neighbor_name: "Switch2.CLMAMOXH" + neighbor_port_id: "cc4e.24c7.af71" + vlan_id: "none" diff --git a/tests/brocade_netiron/show_lldp_neighbors_detail/brocade_netiron_show_lldp_neighbors_detail.yml b/tests/brocade_netiron/show_lldp_neighbors_detail/brocade_netiron_show_lldp_neighbors_detail.yml index bdc652e745..da9d95069b 100644 --- a/tests/brocade_netiron/show_lldp_neighbors_detail/brocade_netiron_show_lldp_neighbors_detail.yml +++ b/tests/brocade_netiron/show_lldp_neighbors_detail/brocade_netiron_show_lldp_neighbors_detail.yml @@ -1,57 +1,57 @@ --- parsed_sample: - - interface: "1/1" - neimac: "0012.f2f0.2377" - ttlsecs: "101" - neihostnametid: "switch1d.clmamofw" - neiinterface: "GigabitEthernet24" - neipvid: "1" - neimgmtip: "10.255.1.49" - neilacpindex: "0" - neimaxframesize: "10240" - neiopmau: "1000BaseT-FD" - neicapabilities: "bridge" - - interface: "1/5" - neimac: "001b.ed6b.6304" - ttlsecs: "97" - neihostnametid: "switch1e.clmamofw" - neiinterface: "GigabitEthernet5" - neipvid: "none" - neimgmtip: "10.255.5.32" - neilacpindex: "5" - neimaxframesize: "10240" - neiopmau: "1000BaseT-FD" - neicapabilities: "bridge" - - interface: "1/6" - neimac: "e8e7.32cd.b14e" - ttlsecs: "114" - neihostnametid: "" - neiinterface: "" - neipvid: "" - neimgmtip: "" - neilacpindex: "" - neimaxframesize: "" - neiopmau: "" - neicapabilities: "" - - interface: "1/10" - neimac: "001b.edae.fe09" - ttlsecs: "106" - neihostnametid: "fw1.clmamofw" - neiinterface: "GigabitEthernet1/10" - neipvid: "none" - neimgmtip: "216.106.21.252" - neilacpindex: "10" - neimaxframesize: "9216" - neiopmau: "1000BaseT-FD" - neicapabilities: "bridge, router" - - interface: "1/13" - neimac: "0026.f13c.85a9" - ttlsecs: "102" - neihostnametid: "FEBE1.SOCKET-COU" - neiinterface: "23" - neipvid: "" - neimgmtip: "192.168.11.1" - neilacpindex: "" - neimaxframesize: "" - neiopmau: "1000BaseT-FD" - neicapabilities: "bridge" + - capabilities: "bridge" + holdtime: "101" + local_interface: "1/1" + mgmt_address: "10.255.1.49" + neighbor_interface: "GigabitEthernet24" + neighbor_lacp_index: "0" + neighbor_mau: "1000BaseT-FD" + neighbor_max_frame_size: "10240" + neighbor_name: "switch1d.clmamofw" + neighbor_port_id: "0012.f2f0.2377" + vlan_id: "1" + - capabilities: "bridge" + holdtime: "97" + local_interface: "1/5" + mgmt_address: "10.255.5.32" + neighbor_interface: "GigabitEthernet5" + neighbor_lacp_index: "5" + neighbor_mau: "1000BaseT-FD" + neighbor_max_frame_size: "10240" + neighbor_name: "switch1e.clmamofw" + neighbor_port_id: "001b.ed6b.6304" + vlan_id: "none" + - capabilities: "" + holdtime: "114" + local_interface: "1/6" + mgmt_address: "" + neighbor_interface: "" + neighbor_lacp_index: "" + neighbor_mau: "" + neighbor_max_frame_size: "" + neighbor_name: "" + neighbor_port_id: "e8e7.32cd.b14e" + vlan_id: "" + - capabilities: "bridge, router" + holdtime: "106" + local_interface: "1/10" + mgmt_address: "216.106.21.252" + neighbor_interface: "GigabitEthernet1/10" + neighbor_lacp_index: "10" + neighbor_mau: "1000BaseT-FD" + neighbor_max_frame_size: "9216" + neighbor_name: "fw1.clmamofw" + neighbor_port_id: "001b.edae.fe09" + vlan_id: "none" + - capabilities: "bridge" + holdtime: "102" + local_interface: "1/13" + mgmt_address: "192.168.11.1" + neighbor_interface: "23" + neighbor_lacp_index: "" + neighbor_mau: "1000BaseT-FD" + neighbor_max_frame_size: "" + neighbor_name: "FEBE1.SOCKET-COU" + neighbor_port_id: "0026.f13c.85a9" + vlan_id: "" From bd68a8d5e8964b97ab93b0382e848859bf42fd87 Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Mon, 4 Sep 2023 13:45:07 -0400 Subject: [PATCH 40/41] couple more fixes to normalize - 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 --- ...ocade_fastiron_show_lldp_neighbors.textfsm | 4 +- ...sco_nxos_show_cdp_neighbors_detail.textfsm | 4 +- ...cisco_xr_show_cdp_neighbors_detail.textfsm | 4 +- .../brocade_fastiron_show_lldp_neighbors.yml | 2 +- .../cisco_nxos_show_cdp_neighbors_detail.yml | 16 +++-- .../cisco_nxos_show_cdp_neighbors_detail1.yml | 13 ++-- .../cisco_nxos_show_cdp_neighbors_detail2.yml | 2 +- ..._show_cdp_neighbors_detail_move_record.yml | 8 +-- .../cisco_xr_show_cdp_neighbors_detail.yml | 66 +++++++++++-------- 9 files changed, 68 insertions(+), 51 deletions(-) diff --git a/ntc_templates/templates/brocade_fastiron_show_lldp_neighbors.textfsm b/ntc_templates/templates/brocade_fastiron_show_lldp_neighbors.textfsm index 3d802b6a65..7808fbc51d 100644 --- a/ntc_templates/templates/brocade_fastiron_show_lldp_neighbors.textfsm +++ b/ntc_templates/templates/brocade_fastiron_show_lldp_neighbors.textfsm @@ -1,6 +1,6 @@ Value Required NEIGHBOR_NAME (\S+) Value Required LOCAL_INTERFACE (\S+) -Value Required HOLD_TIME (\d+) +Value Required HOLDTIME (\d+) Value Required CAPABILITIES (\S+) Value Required NEIGHBOR_INTERFACE (\S+) @@ -8,7 +8,7 @@ Start ^Capability.* ^\s+\(.* ^Device\s+ID\s+Local\s+Intf\s+Hold-time\s+Capability\s+Port\s+ID\s*$$ - ^${NEIGHBOR_NAME}\s+${LOCAL_INTERFACE}\s+${HOLD_TIME}\s+${CAPABILITIES}\s+${NEIGHBOR_INTERFACE} -> Record + ^${NEIGHBOR_NAME}\s+${LOCAL_INTERFACE}\s+${HOLDTIME}\s+${CAPABILITIES}\s+${NEIGHBOR_INTERFACE} -> Record ^Total.* ^\s*$$ ^. -> Error diff --git a/ntc_templates/templates/cisco_nxos_show_cdp_neighbors_detail.textfsm b/ntc_templates/templates/cisco_nxos_show_cdp_neighbors_detail.textfsm index 09b8150915..a8d605bde1 100644 --- a/ntc_templates/templates/cisco_nxos_show_cdp_neighbors_detail.textfsm +++ b/ntc_templates/templates/cisco_nxos_show_cdp_neighbors_detail.textfsm @@ -4,7 +4,7 @@ Value MGMT_ADDRESS (.*) Value PLATFORM (.*) Value NEIGHBOR_INTERFACE (.*) Value LOCAL_INTERFACE (.*) -Value VERSION (.*) +Value NEIGHBOR_DESCRIPTION (.*) Value INTERFACE_IP (.*) Value CAPABILITIES (.*[^\s]) @@ -25,4 +25,4 @@ GetInterfaceIP ^.*IP.+Address: ${INTERFACE_IP} -> Start GetVersion - ^${VERSION} -> Start + ^${NEIGHBOR_DESCRIPTION} -> Start diff --git a/ntc_templates/templates/cisco_xr_show_cdp_neighbors_detail.textfsm b/ntc_templates/templates/cisco_xr_show_cdp_neighbors_detail.textfsm index 5ffab0b636..e7b57118f0 100644 --- a/ntc_templates/templates/cisco_xr_show_cdp_neighbors_detail.textfsm +++ b/ntc_templates/templates/cisco_xr_show_cdp_neighbors_detail.textfsm @@ -4,7 +4,7 @@ Value MGMT_ADDRESS (.*) Value PLATFORM (.*) Value NEIGHBOR_INTERFACE (.*) Value LOCAL_INTERFACE (.*) -Value VERSION (.*) +Value NEIGHBOR_DESCRIPTION (.*) Value CAPABILITIES (.*) Start @@ -20,5 +20,5 @@ GetIP ^.*IP.+address: ${MGMT_ADDRESS} -> Start GetVersion - ^${VERSION} -> Record Start + ^${NEIGHBOR_DESCRIPTION} -> Record Start diff --git a/tests/brocade_fastiron/show_lldp_neighbors/brocade_fastiron_show_lldp_neighbors.yml b/tests/brocade_fastiron/show_lldp_neighbors/brocade_fastiron_show_lldp_neighbors.yml index 7e2c44a834..70886696e0 100644 --- a/tests/brocade_fastiron/show_lldp_neighbors/brocade_fastiron_show_lldp_neighbors.yml +++ b/tests/brocade_fastiron/show_lldp_neighbors/brocade_fastiron_show_lldp_neighbors.yml @@ -1,7 +1,7 @@ --- parsed_sample: - capabilities: "B,R" - hold_time: "120" + holdtime: "120" local_interface: "Gi1/3" neighbor_interface: "Gi0/3" neighbor_name: "core-sw01" diff --git a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail.yml b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail.yml index 4149630bc5..709935bbc5 100644 --- a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail.yml +++ b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail.yml @@ -5,44 +5,48 @@ parsed_sample: interface_ip: "10.1.100.1" local_interface: "mgmt0" mgmt_address: "10.1.100.1" + neighbor_description: "Cisco IOS Software, C3750 Software (C3750-IPBASEK9-M),\ + \ Version 12.2(44)SE2, RELEASE SOFTWARE (fc2)" neighbor_interface: "FastEthernet1/0/32" neighbor_name: "" platform: "cisco WS-C3750-48TS" - version: "Cisco IOS Software, C3750 Software (C3750-IPBASEK9-M), Version 12.2(44)SE2,\ - \ RELEASE SOFTWARE (fc2)" - capabilities: "Router Switch IGMP Filtering Supports-STP-Dispute" chassis_id: "dc-lf03(SAL19069XXX)" interface_ip: "10.1.100.226" local_interface: "Ethernet1/1" mgmt_address: "10.1.100.226" + neighbor_description: "Cisco Nexus Operating System (NX-OS) Software, Version\ + \ 7.0(3)I5(1)" neighbor_interface: "Ethernet1/1" neighbor_name: "dc-lf03" platform: "N9K-C9372TX" - version: "Cisco Nexus Operating System (NX-OS) Software, Version 7.0(3)I5(1)" - capabilities: "Router Switch IGMP Filtering Supports-STP-Dispute" chassis_id: "dc-lf03(SAL1906XXXX)" interface_ip: "10.1.100.226" local_interface: "Ethernet1/3" mgmt_address: "10.1.100.226" + neighbor_description: "Cisco Nexus Operating System (NX-OS) Software, Version\ + \ 7.0(3)I5(1)" neighbor_interface: "Ethernet1/3" neighbor_name: "dc-lf03" platform: "N9K-C9372TX" - version: "Cisco Nexus Operating System (NX-OS) Software, Version 7.0(3)I5(1)" - capabilities: "Router Switch IGMP Filtering Supports-STP-Dispute" chassis_id: "dc-sp01(SAL19069XXX)" interface_ip: "10.1.1.1" local_interface: "Ethernet1/49" mgmt_address: "10.1.100.222" + neighbor_description: "Cisco Nexus Operating System (NX-OS) Software, Version\ + \ 7.0(3)I2(2d)" neighbor_interface: "Ethernet1/52" neighbor_name: "dc-sp01" platform: "N9K-C9372TX" - version: "Cisco Nexus Operating System (NX-OS) Software, Version 7.0(3)I2(2d)" - capabilities: "Router Switch IGMP Filtering Supports-STP-Dispute" chassis_id: "dc-sp02(SAL19069XXX)" interface_ip: "10.1.1.9" local_interface: "Ethernet1/50" mgmt_address: "10.1.100.223" + neighbor_description: "Cisco Nexus Operating System (NX-OS) Software, Version\ + \ 7.0(3)I2(2d)" neighbor_interface: "Ethernet1/52" neighbor_name: "dc-sp02" platform: "N9K-C9372TX" - version: "Cisco Nexus Operating System (NX-OS) Software, Version 7.0(3)I2(2d)" diff --git a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail1.yml b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail1.yml index 41d33d182d..7ba1eddb5a 100644 --- a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail1.yml +++ b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail1.yml @@ -5,35 +5,38 @@ parsed_sample: interface_ip: "10.115.143.251" local_interface: "mgmt0" mgmt_address: "10.115.143.251" + neighbor_description: "Cisco IOS Software, C3560E Software (C3560E-UNIVERSALK9-M),\ + \ Version 12.2(55)SE5, RELEASE SOFTWARE (fc1)" neighbor_interface: "GigabitEthernet0/20" neighbor_name: "" platform: "WS-C3560X-24" - version: "Cisco IOS Software, C3560E Software (C3560E-UNIVERSALK9-M), Version\ - \ 12.2(55)SE5, RELEASE SOFTWARE (fc1)" - capabilities: "Router Switch IGMP Filtering Supports-STP-Dispute" chassis_id: "DC3TESTW01-55.test.co.nz(SSI3707070J)" interface_ip: "10.115.17.253" local_interface: "Ethernet1/1" mgmt_address: "10.115.143.120" + neighbor_description: "Cisco Nexus Operating System (NX-OS) Software, Version\ + \ 5.2(1)N1(4)" neighbor_interface: "Ethernet1/31" neighbor_name: "DC3TESTW01-55" platform: "N5K-C5548UP" - version: "Cisco Nexus Operating System (NX-OS) Software, Version 5.2(1)N1(4)" - capabilities: "Switch IGMP Filtering Supports-STP-Dispute" chassis_id: "DC3TESTW02.test.co.nz(SSI11111D2M)" interface_ip: "10.115.143.21" local_interface: "Ethernet1/21" mgmt_address: "10.115.143.21" + neighbor_description: "Cisco Nexus Operating System (NX-OS) Software, Version\ + \ 5.2(1)N1(4)" neighbor_interface: "Ethernet1/21" neighbor_name: "DC3TESTW02" platform: "N5K-C5020P-BF" - version: "Cisco Nexus Operating System (NX-OS) Software, Version 5.2(1)N1(4)" - capabilities: "Switch IGMP Filtering Supports-STP-Dispute" chassis_id: "DC3TESTW02.test.co.nz(SSI44444D2M)" interface_ip: "10.115.143.21" local_interface: "Ethernet1/22" mgmt_address: "10.115.143.21" + neighbor_description: "Cisco Nexus Operating System (NX-OS) Software, Version\ + \ 5.2(1)N1(4)" neighbor_interface: "Ethernet1/22" neighbor_name: "DC3TESTW02" platform: "N5K-C5020P-BF" - version: "Cisco Nexus Operating System (NX-OS) Software, Version 5.2(1)N1(4)" diff --git a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail2.yml b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail2.yml index 5fcf25bad3..c1f0a73fa8 100644 --- a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail2.yml +++ b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail2.yml @@ -5,7 +5,7 @@ parsed_sample: interface_ip: "" local_interface: "Ethernet1/1" mgmt_address: "" + neighbor_description: "6.47.10 (long-term)" neighbor_interface: "ether1" neighbor_name: "" platform: "MikroTik" - version: "6.47.10 (long-term)" diff --git a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail_move_record.yml b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail_move_record.yml index 6879028bb0..f00ad1b3ea 100644 --- a/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail_move_record.yml +++ b/tests/cisco_nxos/show_cdp_neighbors_detail/cisco_nxos_show_cdp_neighbors_detail_move_record.yml @@ -5,18 +5,18 @@ parsed_sample: interface_ip: "10.0.0.1" local_interface: "Ethernet7/14" mgmt_address: "10.0.0.1" + neighbor_description: "Cisco IOS Software [Everest], Catalyst L3 Switch Software\ + \ (CAT9K_IOSXE), Version 16.6.6, RELEASE SOFTWARE (fc1)" neighbor_interface: "TenGigabitEthernet1/1/7" neighbor_name: "" platform: "C9300-48UXM" - version: "Cisco IOS Software [Everest], Catalyst L3 Switch Software (CAT9K_IOSXE),\ - \ Version 16.6.6, RELEASE SOFTWARE (fc1)" - capabilities: "Switch IGMP Filtering" chassis_id: "redacted.test.com" interface_ip: "10.0.0.3" local_interface: "Ethernet7/15" mgmt_address: "10.0.0.4" + neighbor_description: "Cisco IOS Software [Everest], Catalyst L3 Switch Software\ + \ (CAT9K_IOSXE), Version 16.6.6, RELEASE SOFTWARE (fc1)" neighbor_interface: "TenGigabitEthernet1/1/8" neighbor_name: "" platform: "C9300-48UXM" - version: "Cisco IOS Software [Everest], Catalyst L3 Switch Software (CAT9K_IOSXE),\ - \ Version 16.6.6, RELEASE SOFTWARE (fc1)" diff --git a/tests/cisco_xr/show_cdp_neighbors_detail/cisco_xr_show_cdp_neighbors_detail.yml b/tests/cisco_xr/show_cdp_neighbors_detail/cisco_xr_show_cdp_neighbors_detail.yml index c2332a1bef..b06f904e7f 100644 --- a/tests/cisco_xr/show_cdp_neighbors_detail/cisco_xr_show_cdp_neighbors_detail.yml +++ b/tests/cisco_xr/show_cdp_neighbors_detail/cisco_xr_show_cdp_neighbors_detail.yml @@ -4,195 +4,205 @@ parsed_sample: chassis_id: "nyc-dc-dcm005.ntc.com" local_interface: "MgmtEth0/RSP0/CPU0/0" mgmt_address: "10.100.1.54" + neighbor_description: "Cisco IOS Software, Catalyst 4500 L3 Switch Software (cat4500e-ENTSERVICESK9-M),\ + \ Version 15.0(2)SG10, RELEASE SOFTWARE (fc1)" neighbor_interface: "GigabitEthernet1/9" neighbor_name: "" platform: "cisco WS-C4948E" - version: "Cisco IOS Software, Catalyst 4500 L3 Switch Software (cat4500e-ENTSERVICESK9-M),\ - \ Version 15.0(2)SG10, RELEASE SOFTWARE (fc1)" - capabilities: "Router Switch IGMP" chassis_id: "nyc-dc-dcm006.ntc.com" local_interface: "MgmtEth0/RSP1/CPU0/0" mgmt_address: "10.100.1.55" + neighbor_description: "Cisco IOS Software, Catalyst 4500 L3 Switch Software (cat4500e-ENTSERVICESK9-M),\ + \ Version 15.0(2)SG10, RELEASE SOFTWARE (fc1)" neighbor_interface: "GigabitEthernet1/9" neighbor_name: "" platform: "cisco WS-C4948E" - version: "Cisco IOS Software, Catalyst 4500 L3 Switch Software (cat4500e-ENTSERVICESK9-M),\ - \ Version 15.0(2)SG10, RELEASE SOFTWARE (fc1)" - capabilities: "Router Switch IGMP" chassis_id: "nyc-dc-c90.ntc.com" local_interface: "FortyGigE0/0/1/0" mgmt_address: "10.100.100.141" + neighbor_description: "Cisco IOS XR Software, Version 5.1.2[Default]" neighbor_interface: "FortyGigE0/0/0/2" neighbor_name: "nyc-dc-c90.ntc.com" platform: "cisco CRS" - version: "Cisco IOS XR Software, Version 5.1.2[Default]" - capabilities: "Router Switch" chassis_id: "nyc-dc-d02.ntc.com(FXS182XXXXX)" local_interface: "FortyGigE0/0/1/1" mgmt_address: "10.100.100.162" + neighbor_description: "Cisco Nexus Operating System (NX-OS) Software, Version\ + \ 6.2(12)" neighbor_interface: "Ethernet6/1" neighbor_name: "nyc-dc-d02" platform: "N77-C7706" - version: "Cisco Nexus Operating System (NX-OS) Software, Version 6.2(12)" - capabilities: "Router" chassis_id: "nyc-dc-c97" local_interface: "FortyGigE0/0/0/0" mgmt_address: "10.100.100.19" + neighbor_description: "Cisco IOS XR Software, Version 5.3.4[Default]" neighbor_interface: "FortyGigE0/0/0/0" neighbor_name: "nyc-dc-c97" platform: "cisco ASR9K Series" - version: "Cisco IOS XR Software, Version 5.3.4[Default]" - capabilities: "Router" chassis_id: "nyc-dc-c91.ntc.com" local_interface: "FortyGigE0/0/0/1" mgmt_address: "10.100.100.125" + neighbor_description: "Cisco IOS XR Software, Version 5.1.2[Default]" neighbor_interface: "FortyGigE0/0/0/2" neighbor_name: "nyc-dc-c91.ntc.com" platform: "cisco CRS" - version: "Cisco IOS XR Software, Version 5.1.2[Default]" - capabilities: "Router" chassis_id: "nyc-dc-c97" local_interface: "FortyGigE0/1/0/0" mgmt_address: "10.100.100.113" + neighbor_description: "Cisco IOS XR Software, Version 5.3.4[Default]" neighbor_interface: "FortyGigE0/1/0/0" neighbor_name: "nyc-dc-c97" platform: "cisco ASR9K Series" - version: "Cisco IOS XR Software, Version 5.3.4[Default]" - capabilities: "Router Switch" chassis_id: "nyc-dc-d03.ntc.com(FXS182XXXXX)" local_interface: "FortyGigE0/1/0/1" mgmt_address: "10.100.100.190" + neighbor_description: "Cisco Nexus Operating System (NX-OS) Software, Version\ + \ 6.2(12)" neighbor_interface: "Ethernet6/1" neighbor_name: "nyc-dc-d03" platform: "N77-C7706" - version: "Cisco Nexus Operating System (NX-OS) Software, Version 6.2(12)" - capabilities: "Router" chassis_id: "nyc-dc-c90.ntc.com" local_interface: "FortyGigE0/1/1/0" mgmt_address: "10.100.100.145" + neighbor_description: "Cisco IOS XR Software, Version 5.1.2[Default]" neighbor_interface: "FortyGigE0/4/0/2" neighbor_name: "nyc-dc-c90.ntc.com" platform: "cisco CRS" - version: "Cisco IOS XR Software, Version 5.1.2[Default]" - capabilities: "Router Switch" chassis_id: "nyc-dc-z50a.ntc.com(JAF18XXXXX)" local_interface: "FortyGigE0/1/1/1" mgmt_address: "10.100.100.116" + neighbor_description: "Cisco Nexus Operating System (NX-OS) Software, Version\ + \ 6.2(12)" neighbor_interface: "Ethernet4/3" neighbor_name: "nyc-dc-z50a" platform: "N77-C7710" - version: "Cisco Nexus Operating System (NX-OS) Software, Version 6.2(12)" - capabilities: "Router Switch" chassis_id: "nyc-dc-d04.ntc.com(FXS18XXXXXX)" local_interface: "FortyGigE0/2/1/0" mgmt_address: "10.100.100.194" + neighbor_description: "Cisco Nexus Operating System (NX-OS) Software, Version\ + \ 6.2(12)" neighbor_interface: "Ethernet6/1" neighbor_name: "nyc-dc-d04" platform: "N77-C7706" - version: "Cisco Nexus Operating System (NX-OS) Software, Version 6.2(12)" - capabilities: "Router" chassis_id: "nyc-dc-c91.ntc.com" local_interface: "FortyGigE0/2/1/1" mgmt_address: "10.100.100.129" + neighbor_description: "Cisco IOS XR Software, Version 5.1.2[Default]" neighbor_interface: "FortyGigE0/4/0/2" neighbor_name: "nyc-dc-c91.ntc.com" platform: "cisco CRS" - version: "Cisco IOS XR Software, Version 5.1.2[Default]" - capabilities: "Router Switch" chassis_id: "nyc-dc-d01.ntc.com(FXS182XXXXX)" local_interface: "FortyGigE0/2/0/0" mgmt_address: "10.100.100.158" + neighbor_description: "Cisco Nexus Operating System (NX-OS) Software, Version\ + \ 6.2(12)" neighbor_interface: "Ethernet6/1" neighbor_name: "nyc-dc-d01" platform: "N77-C7706" - version: "Cisco Nexus Operating System (NX-OS) Software, Version 6.2(12)" - capabilities: "Router Switch" chassis_id: "nyc-dc-z50b.ntc.com(JAF181XXXXX)" local_interface: "FortyGigE0/2/0/1" mgmt_address: "10.100.100.111" + neighbor_description: "Cisco Nexus Operating System (NX-OS) Software, Version\ + \ 6.2(12)" neighbor_interface: "Ethernet4/3" neighbor_name: "nyc-dc-z50b" platform: "N77-C7710" - version: "Cisco Nexus Operating System (NX-OS) Software, Version 6.2(12)" - capabilities: "Router Switch IGMP" chassis_id: "nyc-dc-dcc001.ntc.com" local_interface: "TenGigE0/3/0/0" mgmt_address: "10.100.100.174" + neighbor_description: "Cisco IOS Software, Catalyst 4500 L3 Switch Software (cat4500e-UNIVERSALK9-M),\ + \ Version 15.2(2)E3, RELEASE SOFTWARE (fc3)" neighbor_interface: "TenGigabitEthernet6/1" neighbor_name: "" platform: "cisco WS-C4510R+E" - version: "Cisco IOS Software, Catalyst 4500 L3 Switch Software (cat4500e-UNIVERSALK9-M),\ - \ Version 15.2(2)E3, RELEASE SOFTWARE (fc3)" - capabilities: "Router" chassis_id: "nyc-dc-d57" local_interface: "TenGigE0/3/0/1" mgmt_address: "10.100.100.115" + neighbor_description: "Cisco IOS XR Software, Version 4.3.2[Default]" neighbor_interface: "TenGigE0/2/0/0" neighbor_name: "nyc-dc-d57" platform: "cisco ASR9K Series" - version: "Cisco IOS XR Software, Version 4.3.2[Default]" - capabilities: "Router Switch" chassis_id: "nyc-dc-d40b.ntc.com(JAF182XXXXX)" local_interface: "TenGigE0/3/0/2" mgmt_address: "10.100.100.114" + neighbor_description: "Cisco Nexus Operating System (NX-OS) Software, Version\ + \ 6.2(12)" neighbor_interface: "Ethernet4/1" neighbor_name: "nyc-dc-d40b" platform: "N77-C7710" - version: "Cisco Nexus Operating System (NX-OS) Software, Version 6.2(12)" - capabilities: "Router Switch IGMP" chassis_id: "nyc-dc-d80.ntc.com(FOC184XXXXX)" local_interface: "TenGigE0/3/0/3" mgmt_address: "10.100.100.117" + neighbor_description: "Cisco Nexus Operating System (NX-OS) Software, Version\ + \ 7.0(7)N1(1)" neighbor_interface: "Ethernet2/1" neighbor_name: "nyc-dc-d80" platform: "N5K-C56128P" - version: "Cisco Nexus Operating System (NX-OS) Software, Version 7.0(7)N1(1)" - capabilities: "Router Switch IGMP" chassis_id: "nyc-dc-dcc002.ntc.com" local_interface: "TenGigE0/4/0/0" mgmt_address: "10.100.100.178" + neighbor_description: "Cisco IOS Software, Catalyst 4500 L3 Switch Software (cat4500e-UNIVERSALK9-M),\ + \ Version 15.2(2)E3, RELEASE SOFTWARE (fc3)" neighbor_interface: "TenGigabitEthernet6/1" neighbor_name: "" platform: "cisco WS-C4510R+E" - version: "Cisco IOS Software, Catalyst 4500 L3 Switch Software (cat4500e-UNIVERSALK9-M),\ - \ Version 15.2(2)E3, RELEASE SOFTWARE (fc3)" - capabilities: "Router" chassis_id: "nyc-dc-d57" local_interface: "TenGigE0/4/0/1" mgmt_address: "10.100.100.115" + neighbor_description: "Cisco IOS XR Software, Version 4.3.2[Default]" neighbor_interface: "TenGigE1/2/0/0" neighbor_name: "nyc-dc-d57" platform: "cisco ASR9K Series" - version: "Cisco IOS XR Software, Version 4.3.2[Default]" - capabilities: "Router Switch" chassis_id: "nyc-dc-d40a.ntc.com(JAF182XXXXX)" local_interface: "TenGigE0/4/0/2" mgmt_address: "10.100.100.113" + neighbor_description: "Cisco Nexus Operating System (NX-OS) Software, Version\ + \ 6.2(12)" neighbor_interface: "Ethernet4/1" neighbor_name: "nyc-dc-d40a" platform: "N77-C7710" - version: "Cisco Nexus Operating System (NX-OS) Software, Version 6.2(12)" - capabilities: "Router Switch IGMP" chassis_id: "nyc-dc-d81.ntc.com(FOC182XXXXX)" local_interface: "TenGigE0/4/0/3" mgmt_address: "10.100.100.118" + neighbor_description: "Cisco Nexus Operating System (NX-OS) Software, Version\ + \ 7.0(7)N1(1)" neighbor_interface: "Ethernet1/1" neighbor_name: "nyc-dc-d81" platform: "N5K-C56128P" - version: "Cisco Nexus Operating System (NX-OS) Software, Version 7.0(7)N1(1)" - capabilities: "Router" chassis_id: "nyc-dc-c97" local_interface: "FortyGigE0/6/0/0" mgmt_address: "192.168.169.21" + neighbor_description: "Cisco IOS XR Software, Version 5.3.4[Default]" neighbor_interface: "FortyGigE0/6/0/0" neighbor_name: "nyc-dc-c97" platform: "cisco ASR9K Series" - version: "Cisco IOS XR Software, Version 5.3.4[Default]" - capabilities: "Router" chassis_id: "nyc-dc-c97" local_interface: "FortyGigE0/6/0/0" mgmt_address: "192.168.169.21" + neighbor_description: "Cisco IOS XR Software, Version 5.3.4[Default]" neighbor_interface: "FortyGigE0/7/0/0" neighbor_name: "nyc-dc-c97" platform: "cisco ASR9K Series" - version: "Cisco IOS XR Software, Version 5.3.4[Default]" From fb98a5668f5e30a5ec852f3e09c601bee23be256 Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Sun, 7 Jan 2024 00:09:06 -0500 Subject: [PATCH 41/41] fixing failed local merge in regard to huawei_vrp lldp --- .../huawei_vrp_display_lldp_neighbor.textfsm | 2 +- .../huawei_vrp_display_lldp_neighbor1.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ntc_templates/templates/huawei_vrp_display_lldp_neighbor.textfsm b/ntc_templates/templates/huawei_vrp_display_lldp_neighbor.textfsm index 0afe3bf4e2..5bf9228860 100644 --- a/ntc_templates/templates/huawei_vrp_display_lldp_neighbor.textfsm +++ b/ntc_templates/templates/huawei_vrp_display_lldp_neighbor.textfsm @@ -25,7 +25,7 @@ Start ^System\s+capabilities\s+supported ^System\s+capabilities\s+enabled\s+:${CAPABILITIES}\s*$$ ^Management\s+address\s+type - ^Management\s+address\s*:\s*${MGMT_ADDRESS} + ^Management\s+address\s*(value\s*)?:\s*${MGMT_ADDRESS} ^Expired\s+time ^Port\s+VLAN\s+ID\(PVID\)\s+:${VLAN_ID} ^VLAN\s+name\s+of\s+VLAN diff --git a/tests/huawei_vrp/display_lldp_neighbor/huawei_vrp_display_lldp_neighbor1.yml b/tests/huawei_vrp/display_lldp_neighbor/huawei_vrp_display_lldp_neighbor1.yml index 8667649a18..d66b5e0f64 100644 --- a/tests/huawei_vrp/display_lldp_neighbor/huawei_vrp_display_lldp_neighbor1.yml +++ b/tests/huawei_vrp/display_lldp_neighbor/huawei_vrp_display_lldp_neighbor1.yml @@ -3,16 +3,16 @@ parsed_sample: - capabilities: "bridge router" chassis_id: "b8d6-f6ff-7390" local_interface: "XGigabitEthernet0/0/1" - management_ip: "169.254.1.2" - manufacturer_name: "" - model_name: "" - neighbor: "ROUTER2" - neighbor_interface: "XGigabitEthernet0/0/2" - neighbor_port_id: "XGigabitEthernet0/0/2" - serial: "" - system_description: + manufacturer: "" + mgmt_address: "169.254.1.2" + neighbor_description: - "Huawei Switch S6730-S24X6Q" - "Huawei Versatile Routing Platform Software" - "VRP (R) software, Version 5.170 (S6730 V200R022C00SPC500)" - "Copyright (C) 2000-2022 HUAWEI TECH Co., Ltd." + neighbor_interface: "XGigabitEthernet0/0/2" + neighbor_name: "ROUTER2" + neighbor_port_id: "XGigabitEthernet0/0/2" + platform: "" + serial: "" vlan_id: "10"