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 fe3a11b9b1..a6480ecf9b 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 @@ -12,7 +12,7 @@ Value NEIGHBOR_INTERFACE (\S+) Start ^Port\s*:\s*${LOCAL_INTERFACE} ^Neighbor\s*(Chassis|System)-Name\s*:\s*${NEIGHBOR_NAME} - ^Neighbor\s*(Chassis|System)-Description\s*:\s*${NEIGHBOR_DESCRIPTION} + ^Neighbor\s*(Chassis|System)-Description\s*:\s*${NEIGHBOR_DESCRIPTION} -> NeighborDescription ^Neighbor\s*Chassis-ID\s*:\s*${CHASSIS_ID} ^Neighbor\s*Management-Address\s*:\s*${MGMT_ADDRESS} ^Chassis\s*Capabilities\s*Available\s*:\s*${CAPABILITIES_SUPPORTED} @@ -34,3 +34,10 @@ Start ^=+ ^. -> Error +# multiline neighbor description +NeighborDescription + ^Neighbor\s*Chassis-ID\s*:\s*${CHASSIS_ID} -> Start + # toss away after the first description line captured in Start state + # (avoid breaking change resulting from changing data type to List) + ^.+$$ + ^. -> Error diff --git a/tests/aruba_aoscx/show_lldp_neighbors-info_detail/show_lldp_neighbors-info_detail_issue1453.yml b/tests/aruba_aoscx/show_lldp_neighbors-info_detail/show_lldp_neighbors-info_detail_issue1453.yml index 5975d24c1a..9d944d2871 100644 --- a/tests/aruba_aoscx/show_lldp_neighbors-info_detail/show_lldp_neighbors-info_detail_issue1453.yml +++ b/tests/aruba_aoscx/show_lldp_neighbors-info_detail/show_lldp_neighbors-info_detail_issue1453.yml @@ -23,8 +23,7 @@ parsed_sample: chassis_id: "xx:xx:xx:xx:xx:xx" local_interface: "1/1/12" mgmt_address: "123.123.123.123" - neighbor_description: "HP J9851A Switch 5412Rzl2, revision KB.16.10.0020, ROM\ - \ KB.16.01.0009 (/ws/swbuildm/rel_ajanta_qaoff/code/build/bom(swbuildm_rel_ajanta_qaoff_rel_ajanta))" + neighbor_description: "HP J9851A Switch 5412Rzl2, revision KB.16.10.0020, ROM KB.16.01.0009 (/ws/swbuildm/rel_ajanta_qaoff/code/build/bom(swbuildm_rel_ajanta_qaoff_rel_ajanta))" neighbor_interface: "D10" neighbor_name: "SYSNAME_TEXT" neighbor_port_id: "106" diff --git a/tests/aruba_aoscx/show_lldp_neighbors-info_detail/show_lldp_neighbors-info_detail_multiline.raw b/tests/aruba_aoscx/show_lldp_neighbors-info_detail/show_lldp_neighbors-info_detail_multiline.raw new file mode 100644 index 0000000000..5de307bf03 --- /dev/null +++ b/tests/aruba_aoscx/show_lldp_neighbors-info_detail/show_lldp_neighbors-info_detail_multiline.raw @@ -0,0 +1,88 @@ + +LLDP Neighbor Information +========================= + +Total Neighbor Entries : 27 +Total Neighbor Entries Deleted : 7 +Total Neighbor Entries Dropped : 0 +Total Neighbor Entries Aged-Out : 7 + +-------------------------------------------------------------------------------- + +Port : 1/1/17 +Neighbor Entries : 1 +Neighbor Entries Deleted : 1 +Neighbor Entries Dropped : 0 +Neighbor Entries Aged-Out : 1 +Neighbor System-Name : PAS-IDF17-SW01.internal.domain.tld +Neighbor System-Description : Cisco IOS Software, S5400 Software (S5400-UNIVERSALK9-M), Version 15.2(8)E2, RELEASE SOFTWARE (fc1) +Technical Support: http://www.cisco.com/techsupport +Copyright (c) 1986-2022 by Cisco Systems, Inc. +Compiled Thu 16-Jun-22 07:59 by mcpre +Neighbor Chassis-ID : e4:8e:bb:0c:bb:80 +Neighbor Management-Address : 10.24.94.73 +Chassis Capabilities Available : Bridge, Router +Chassis Capabilities Enabled : Bridge +Neighbor Port-ID : Gi1/1 +Neighbor Port-Desc : Uplink to Core +Neighbor Port VLAN ID : +Neighbor Port VLAN Name : +Neighbor Port MFS : 0 +Link aggregation supported : +Link aggregation enabled : +Aggregation port ID : +TTL : 120 + +Neighbor Mac-Phy details +Neighbor Auto-neg Supported : false +Neighbor Auto-Neg Enabled : true +Neighbor Auto-Neg Advertised : 1000 BASE_XFD +Neighbor MAU type : 1000 BASESXFD + +Neighbor EEE information : DOT3 +Neighbor TX Wake time : 0 us +Neighbor RX Wake time : 0 us +Neighbor Fallback time : 0 us +Neighbor TX Echo time : 0 us +Neighbor RX Echo time : 0 us + +-------------------------------------------------------------------------------- + +Port : 1/1/18 +Neighbor Entries : 1 +Neighbor Entries Deleted : 1 +Neighbor Entries Dropped : 0 +Neighbor Entries Aged-Out : 1 +Neighbor System-Name : PAS-IDF18-SW01.internal.domain.tld +Neighbor System-Description : Cisco IOS Software, S5400 Software (S5400-UNIVERSALK9-M), Version 15.2(8)E1, RELEASE SOFTWARE (fc8) +Technical Support: http://www.cisco.com/techsupport +Copyright (c) 1986-2021 by Cisco Systems, Inc. +Compiled Tue 12-Oct-21 03:50 by mcpre +Neighbor Chassis-ID : e4:8e:bb:0d:e6:00 +Neighbor Management-Address : 10.24.94.74 +Chassis Capabilities Available : Bridge, Router +Chassis Capabilities Enabled : Bridge +Neighbor Port-ID : Gi1/1 +Neighbor Port-Desc : Uplink to IDF05 +Neighbor Port VLAN ID : +Neighbor Port VLAN Name : +Neighbor Port MFS : 0 +Link aggregation supported : +Link aggregation enabled : +Aggregation port ID : +TTL : 120 + +Neighbor Mac-Phy details +Neighbor Auto-neg Supported : false +Neighbor Auto-Neg Enabled : true +Neighbor Auto-Neg Advertised : 1000 BASE_XFD +Neighbor MAU type : 1000 BASESXFD + +Neighbor EEE information : DOT3 +Neighbor TX Wake time : 0 us +Neighbor RX Wake time : 0 us +Neighbor Fallback time : 0 us +Neighbor TX Echo time : 0 us +Neighbor RX Echo time : 0 us + +-------------------------------------------------------------------------------- \ No newline at end of file diff --git a/tests/aruba_aoscx/show_lldp_neighbors-info_detail/show_lldp_neighbors-info_detail_multiline.yml b/tests/aruba_aoscx/show_lldp_neighbors-info_detail/show_lldp_neighbors-info_detail_multiline.yml new file mode 100644 index 0000000000..2f72265304 --- /dev/null +++ b/tests/aruba_aoscx/show_lldp_neighbors-info_detail/show_lldp_neighbors-info_detail_multiline.yml @@ -0,0 +1,20 @@ +--- +parsed_sample: + - capabilities: "Bridge" + capabilities_supported: "Bridge, Router" + chassis_id: "e4:8e:bb:0c:bb:80" + local_interface: "1/1/17" + mgmt_address: "10.24.94.73" + neighbor_description: "Cisco IOS Software, S5400 Software (S5400-UNIVERSALK9-M), Version 15.2(8)E2, RELEASE SOFTWARE (fc1)" + neighbor_interface: "Uplink" + neighbor_name: "PAS-IDF17-SW01.internal.domain.tld" + neighbor_port_id: "Gi1/1" + - capabilities: "Bridge" + capabilities_supported: "Bridge, Router" + chassis_id: "e4:8e:bb:0d:e6:00" + local_interface: "1/1/18" + mgmt_address: "10.24.94.74" + neighbor_description: "Cisco IOS Software, S5400 Software (S5400-UNIVERSALK9-M), Version 15.2(8)E1, RELEASE SOFTWARE (fc8)" + neighbor_interface: "Uplink" + neighbor_name: "PAS-IDF18-SW01.internal.domain.tld" + neighbor_port_id: "Gi1/1"