From 195b26de24beafa02cfb811d38e16c0ce42f3452 Mon Sep 17 00:00:00 2001 From: pnpestov <67155684+pnpestov@users.noreply.github.com> Date: Thu, 10 Oct 2024 21:39:44 +0300 Subject: [PATCH 01/14] Add files via upload New Template: fortinet_diagnose_lldprx_port_neighbor_details_port-name.textfsm --- ...rx_port_neighbor_details_port-name.textfsm | 128 ++++++++++++++++++ 1 file changed, 128 insertions(+) create mode 100644 ntc_templates/templates/fortinet_diagnose_lldprx_port_neighbor_details_port-name.textfsm diff --git a/ntc_templates/templates/fortinet_diagnose_lldprx_port_neighbor_details_port-name.textfsm b/ntc_templates/templates/fortinet_diagnose_lldprx_port_neighbor_details_port-name.textfsm new file mode 100644 index 0000000000..88cff8cf7a --- /dev/null +++ b/ntc_templates/templates/fortinet_diagnose_lldprx_port_neighbor_details_port-name.textfsm @@ -0,0 +1,128 @@ +# +# Pavel Pestov +# +# 2024-10-09: Inital Version +# +# SW Version: 7.0.15 +# HW : FortiGate-40F +# Mode : HA A-P +# VDOMS : DISABLE +# +# Neighbors : Huawei CloudEngine S5735-L Series Switches, HPE Aruba 2530 Series Switches, Cisco Catalyst 3000 Series Switches, Cisco Nexus 3000 Series Switches +# +# The number of parameters may vary depending on the type of neighbor +# +Value PORT (\S+) +Value PORT_TXT (\S+) +Value MAC (\S+) +Value CHASSIS_TYPE (\S+) +Value CHASSIS_TYPE_TXT (\S+) +Value CHASSIS_DATA (\S+) +Value PORT_ID_TYPE (\S+) +Value PORT_ID_TYPE_TXT (\S+) +Value PORT_ID_LEN (\S+) +Value PORT_ID_DATA (\S+) +Value TTL (\S+) +Value PORT_DESC_LEN (\S+) +Value PORT_DESC_DATA ([\S\s]+) +Value SYSTEM_NAME_LEN (\S+) +Value SYSTEM_NAME_DATA (\S+) +Value SYSTEM_DESC_LEN (\S+) +Value List SYSTEM_DESC_DATA ([^1][\S\s]+) +Value SYSTEM_CAPS_AVAILABLE (\S+) +Value SYSTEM_CAPS_AVAILABLE_TXT ([\S\s]+) +Value SYSTEM_CAPS_ENABLED (\S+) +Value SYSTEM_CAPS_ENABLED_TXT ([\S\s]+) +Value ADDRESS_COUNT (\S+) +Value ADDRESS_1_TYPE (\S+) +Value ADDRESS_1_TYPE_TXT (\S+) +Value ADDRESS_1_LEN (\S+) +Value ADDRESS_1_ADDR (\S+) +Value ADDRESS_1_ADDR_INTERFACE_TYPE (\S+) +Value ADDRESS_1_ADDR_INTERFACE_TYPE_TXT (\S+) +Value ADDRESS_1_ADDR_INTERFACE_NUMBER (\S+) +Value VLAN_ID (\S+) +Value VLAN_PROTOCOL_COUNT (\S+) +Value VLAN_PROTOCOL_1_FLAG (\S+) +Value VLAN_PROTOCOL_1_FLAG_TXT ([\S\s]*) +Value VLAN_PROTOCOL_1_ID (\S+) +Value VLAN_NAME_COUNT (\S+) +Value VLAN_NAME_1_ID (\S+) +Value VLAN_NAME_1_LEN (\S+) +Value VLAN_NAME_1_DATA ([\S\s]+) +Value AGGREGATION_STATUS (\S+) +Value AGGREGATION_STATUS_TXT (\S+) +Value AGGREGATION_PORT (\S+) +Value MAC_PHY_AUTO (\S+) +Value MAC_PHY_AUTO_TXT ([\S\s]+) +Value MAC_PHY_PMD (\S+) +Value MAC_PHY_PMD_TXT ([\S\s]+) +Value MAC_PHY_MAU (\S+) +Value MAC_PHY_MAU_TXT (\S+) +Value POWER_STATUS (\S+) +Value POWER_STATUS_TXT (\S+) +Value POWER_PAIR (\S+) +Value POWER_CLASS (\S+) +Value MAX_FRAME_SIZE (\S+) + +Start + ^1\s+port:\s+${PORT} + ^1\s+port\.txt:\s+${PORT_TXT} + ^1\s+mac:\s+${MAC} + ^1\s+chassis\.type:\s+${CHASSIS_TYPE} + ^1\s+chassis\.type\.txt:\s+${CHASSIS_TYPE_TXT} + ^1\s+chassis\.data:\s+${CHASSIS_DATA} + ^1\s+port\.id\.type:\s+${PORT_ID_TYPE} + ^1\s+port\.id\.type\.txt:\s+${PORT_ID_TYPE_TXT} + ^1\s+port\.id\.len:\s+${PORT_ID_LEN} + ^1\s+port\.id\.data:\s+${PORT_ID_DATA} + ^1\s+ttl:\s+${TTL} + ^1\s+port\.desc\.len:\s+${PORT_DESC_LEN} + ^1\s+port\.desc\.data:\s+${PORT_DESC_DATA} + ^1\s+system\.name\.len:\s+${SYSTEM_NAME_LEN} + ^1\s+system\.name\.data:\s+${SYSTEM_NAME_DATA} + ^1\s+system\.desc\.len:\s+${SYSTEM_DESC_LEN} + ^1\s+system\.desc\.data:\s+${SYSTEM_DESC_DATA} -> MultipleLines + ^1\s+system\.caps\.available:\s+${SYSTEM_CAPS_AVAILABLE} + ^1\s+system\.caps\.available\.txt:\s+${SYSTEM_CAPS_AVAILABLE_TXT} + ^1\s+system\.caps\.enabled:\s+${SYSTEM_CAPS_ENABLED} + ^1\s+system\.caps\.enabled\.txt:\s+${SYSTEM_CAPS_ENABLED_TXT} + ^1\s+address\.count:\s+${ADDRESS_COUNT} + ^1\s+address\.1\.type:\s+${ADDRESS_1_TYPE} + ^1\s+address\.1\.type\.txt:\s+${ADDRESS_1_TYPE_TXT} + ^1\s+address\.1\.len:\s+${ADDRESS_1_LEN} + ^1\s+address\.1\.addr:\s+${ADDRESS_1_ADDR} + ^1\s+address\.1\.addr\.interface\.type:\s+${ADDRESS_1_ADDR_INTERFACE_TYPE} + ^1\s+address\.1\.addr\.interface\.type\.txt:\s+${ADDRESS_1_ADDR_INTERFACE_TYPE_TXT} + ^1\s+address\.1\.addr\.interface\.number:\s+${ADDRESS_1_ADDR_INTERFACE_NUMBER} + ^1\s+vlan\.id:\s+${VLAN_ID} + ^1\s+vlan\.protocol\.count:\s+${VLAN_PROTOCOL_COUNT} + ^1\s+vlan\.protocol\.1\.flag:\s+${VLAN_PROTOCOL_1_FLAG} + ^1\s+vlan\.protocol\.1\.flag\.txt:\s*${VLAN_PROTOCOL_1_FLAG_TXT} + ^1\s+vlan\.protocol\.1\.id:\s+${VLAN_PROTOCOL_1_ID} + ^1\s+vlan\.name\.count:\s+${VLAN_NAME_COUNT} + ^1\s+vlan\.name\.1\.id:\s+${VLAN_NAME_1_ID} + ^1\s+vlan\.name\.1\.len:\s+${VLAN_NAME_1_LEN} + ^1\s+vlan\.name\.1\.data:\s+${VLAN_NAME_1_DATA} + ^1\s+aggregation\.status:\s+${AGGREGATION_STATUS} + ^1\s+aggregation\.status\.txt:\s+${AGGREGATION_STATUS_TXT} + ^1\s+aggregation\.port:\s+${AGGREGATION_PORT} + ^1\s+mac_phy\.auto:\s+${MAC_PHY_AUTO} + ^1\s+mac_phy\.auto\.txt:\s+${MAC_PHY_AUTO_TXT} + ^1\s+mac_phy\.pmd:\s+${MAC_PHY_PMD} + ^1\s+mac_phy\.pmd\.txt:\s+${MAC_PHY_PMD_TXT} + ^1\s+mac_phy\.mau:\s+${MAC_PHY_MAU} + ^1\s+mac_phy\.mau\.txt:\s+${MAC_PHY_MAU_TXT} + ^1\s+power\.status:\s+${POWER_STATUS} + ^1\s+power\.status\.txt:\s+${POWER_STATUS_TXT} + ^1\s+power\.pair:\s+${POWER_PAIR} + ^1\s+power\.class:\s+${POWER_CLASS} + ^1\s+max-frame-size:\s+${MAX_FRAME_SIZE} + # Processing possible new information to eliminate errors + ^1\s+[\S\s]+ + ^\s*$$ + ^. -> Error + +MultipleLines + ^${SYSTEM_DESC_DATA} + ^1\s+system\.caps\.available:\s+${SYSTEM_CAPS_AVAILABLE} -> Start From 3c621cd82228a25d596a5671b8270fdf2e2345e0 Mon Sep 17 00:00:00 2001 From: pnpestov <67155684+pnpestov@users.noreply.github.com> Date: Thu, 10 Oct 2024 21:43:12 +0300 Subject: [PATCH 02/14] Update index fortinet_diagnose_lldprx_port_neighbor_details_port-name.textfsm, .*, fortinet, d[[iagnose]] lldpr[[x]] p[[ort]] n[[eighbor]] d[[etails]] (\S+) --- ntc_templates/templates/index | 1 + 1 file changed, 1 insertion(+) diff --git a/ntc_templates/templates/index b/ntc_templates/templates/index index 2298eca7f7..7179a798fe 100644 --- a/ntc_templates/templates/index +++ b/ntc_templates/templates/index @@ -603,6 +603,7 @@ fortinet_get_system_arp.textfsm, .*, fortinet, g[[et]] sy[[stem]] arp fortinet_execute_date.textfsm, .*, fortinet, exec[[ute]] da[[te]] fortinet_execute_ping.textfsm, .*, fortinet, exec[[ute]] ping fortinet_execute_time.textfsm, .*, fortinet, exec[[ute]] ti[[me]] +fortinet_diagnose_lldprx_port_neighbor_details_port-name.textfsm, .*, fortinet, d[[iagnose]] lldpr[[x]] p[[ort]] n[[eighbor]] d[[etails]] (\S+) hp_comware_display_lldp_neighbor-information_verbose.textfsm, .*, hp_comware, di[[splay]] ll[[dp]] n[[eighbor-information]] v[[erbose]] hp_comware_display_lldp_neighbor-information_list.textfsm, .*, hp_comware, di[[splay]] ll[[dp]] n[[eighbor-information]] l[[ist]] From 70650b375ba7b8e5d26196dde32f14ba4132d912 Mon Sep 17 00:00:00 2001 From: pnpestov <67155684+pnpestov@users.noreply.github.com> Date: Thu, 10 Oct 2024 22:02:49 +0300 Subject: [PATCH 03/14] Create fortinet_diagnose_lldprx_port_neighbor_details_port-name.raw --- .../fortinet_diagnose_lldprx_port_neighbor_details_port-name.raw | 1 + 1 file changed, 1 insertion(+) create mode 100644 tests/fortinet/diagnose_lldprx_port_neighbor_details_port-name/fortinet_diagnose_lldprx_port_neighbor_details_port-name.raw diff --git a/tests/fortinet/diagnose_lldprx_port_neighbor_details_port-name/fortinet_diagnose_lldprx_port_neighbor_details_port-name.raw b/tests/fortinet/diagnose_lldprx_port_neighbor_details_port-name/fortinet_diagnose_lldprx_port_neighbor_details_port-name.raw new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/tests/fortinet/diagnose_lldprx_port_neighbor_details_port-name/fortinet_diagnose_lldprx_port_neighbor_details_port-name.raw @@ -0,0 +1 @@ + From bcc35a47a832aba8814d7b4feb9549417511a41a Mon Sep 17 00:00:00 2001 From: pnpestov <67155684+pnpestov@users.noreply.github.com> Date: Thu, 10 Oct 2024 22:04:27 +0300 Subject: [PATCH 04/14] Update fortinet_diagnose_lldprx_port_neighbor_details_port-name.raw --- ...lldprx_port_neighbor_details_port-name.raw | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/tests/fortinet/diagnose_lldprx_port_neighbor_details_port-name/fortinet_diagnose_lldprx_port_neighbor_details_port-name.raw b/tests/fortinet/diagnose_lldprx_port_neighbor_details_port-name/fortinet_diagnose_lldprx_port_neighbor_details_port-name.raw index 8b13789179..b75d7dc820 100644 --- a/tests/fortinet/diagnose_lldprx_port_neighbor_details_port-name/fortinet_diagnose_lldprx_port_neighbor_details_port-name.raw +++ b/tests/fortinet/diagnose_lldprx_port_neighbor_details_port-name/fortinet_diagnose_lldprx_port_neighbor_details_port-name.raw @@ -1 +1,56 @@ +1 port: 6 +1 port.txt: lan1 +1 mac: 00:11:22:33:44:55 +1 chassis.type: 4 +1 chassis.type.txt: interface-mac +1 chassis.data: 00:11:22:33:44:55 +1 port.id.type: 5 +1 port.id.type.txt: interface-name +1 port.id.len: 20 +1 port.id.data: GigabitEthernet1/0/5 +1 ttl: 120 +1 port.desc.len: 10 +1 port.desc.data: Port +1 system.name.len: 15 +1 system.name.data: Switch +1 system.desc.len: 179 +1 system.desc.data: Huawei Switch S5735-L48T4S-A1 +Huawei Versatile Routing Platform Software +VRP (R) software, Version 5.170 (S5735 V200R022C00SPC500) +Copyright (C) 2000-2022 HUAWEI TECH Co., Ltd. +1 system.caps.available: 0014 +1 system.caps.available.txt: bridge router +1 system.caps.enabled: 0014 +1 system.caps.enabled.txt: bridge router +1 address.count: 1 +1 address.1.type: 1 +1 address.1.type.txt: ipv4 +1 address.1.len: 4 +1 address.1.addr: aaa.bbb.ccc.ddd +1 address.1.addr.interface.type: 2 +1 address.1.addr.interface.type.txt: if-index +1 address.1.addr.interface.number: 269 +1 vlan.id: 1 +1 vlan.protocol.count: 1 +1 vlan.protocol.1.flag: 0 +1 vlan.protocol.1.flag.txt: +1 vlan.protocol.1.id: 0 +1 vlan.name.count: 1 +1 vlan.name.1.id: 1 +1 vlan.name.1.len: 9 +1 vlan.name.1.data: VLAN 0001 +1 aggregation.status: 1 +1 aggregation.status.txt: capable +1 aggregation.port: 0 +1 mac_phy.auto: 3 +1 mac_phy.auto.txt: supported enabled +1 mac_phy.pmd: 7c05 +1 mac_phy.pmd.txt: 10BaseT 10BaseTFD 100BaseT4 100BaseTX 100baseTXFD 1000baseXFd +1 mac_phy.mau: 001e +1 mac_phy.mau.txt: 1000baseTFD +1 power.status: 0 +1 power.status.txt: PD +1 power.pair: 0 +1 power.class: 0 +1 max-frame-size: 10240 From b3a9003a6ee1680219355537a1401d71fa40b6c1 Mon Sep 17 00:00:00 2001 From: pnpestov <67155684+pnpestov@users.noreply.github.com> Date: Thu, 10 Oct 2024 22:05:33 +0300 Subject: [PATCH 05/14] Add files via upload Create fortinet_diagnose_lldprx_port_neighbor_details_port-name.yml --- ...lldprx_port_neighbor_details_port-name.yml | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 tests/fortinet/diagnose_lldprx_port_neighbor_details_port-name/fortinet_diagnose_lldprx_port_neighbor_details_port-name.yml diff --git a/tests/fortinet/diagnose_lldprx_port_neighbor_details_port-name/fortinet_diagnose_lldprx_port_neighbor_details_port-name.yml b/tests/fortinet/diagnose_lldprx_port_neighbor_details_port-name/fortinet_diagnose_lldprx_port_neighbor_details_port-name.yml new file mode 100644 index 0000000000..7f08bf0a57 --- /dev/null +++ b/tests/fortinet/diagnose_lldprx_port_neighbor_details_port-name/fortinet_diagnose_lldprx_port_neighbor_details_port-name.yml @@ -0,0 +1,58 @@ +--- +parsed_sample: + - address_1_addr: "aaa.bbb.ccc.ddd" + address_1_addr_interface_number: "269" + address_1_addr_interface_type: "2" + address_1_addr_interface_type_txt: "if-index" + address_1_len: "4" + address_1_type: "1" + address_1_type_txt: "ipv4" + address_count: "1" + aggregation_port: "0" + aggregation_status: "1" + aggregation_status_txt: "capable" + chassis_data: "00:11:22:33:44:55" + chassis_type: "4" + chassis_type_txt: "interface-mac" + mac: "00:11:22:33:44:55" + mac_phy_auto: "3" + mac_phy_auto_txt: "supported enabled" + mac_phy_mau: "001e" + mac_phy_mau_txt: "1000baseTFD" + mac_phy_pmd: "7c05" + mac_phy_pmd_txt: "10BaseT 10BaseTFD 100BaseT4 100BaseTX 100baseTXFD 1000baseXFd" + max_frame_size: "10240" + port: "6" + port_desc_data: "Port" + port_desc_len: "10" + port_id_data: "GigabitEthernet1/0/5" + port_id_len: "20" + port_id_type: "5" + port_id_type_txt: "interface-name" + port_txt: "lan1" + power_class: "0" + power_pair: "0" + power_status: "0" + power_status_txt: "PD" + system_caps_available: "0014" + system_caps_available_txt: "bridge router" + system_caps_enabled: "0014" + system_caps_enabled_txt: "bridge router" + system_desc_data: + - "Huawei Switch S5735-L48T4S-A1" + - "Huawei Versatile Routing Platform Software" + - "VRP (R) software, Version 5.170 (S5735 V200R022C00SPC500)" + - "Copyright (C) 2000-2022 HUAWEI TECH Co., Ltd." + system_desc_len: "179" + system_name_data: "Switch" + system_name_len: "15" + ttl: "120" + vlan_id: "1" + vlan_name_1_data: "VLAN 0001" + vlan_name_1_id: "1" + vlan_name_1_len: "9" + vlan_name_count: "1" + vlan_protocol_1_flag: "0" + vlan_protocol_1_flag_txt: "" + vlan_protocol_1_id: "0" + vlan_protocol_count: "1" From ec07b0647e5c4efbb44c01439adb619f32e9cbd9 Mon Sep 17 00:00:00 2001 From: Pavel Pestov <67155684+pnpestov@users.noreply.github.com> Date: Fri, 11 Oct 2024 08:14:57 +0300 Subject: [PATCH 06/14] Update ntc_templates/templates/fortinet_diagnose_lldprx_port_neighbor_details_port-name.textfsm MAC -> MAC_ADDRESS Co-authored-by: Jacob McGill <9847006+jmcgill298@users.noreply.github.com> --- ...net_diagnose_lldprx_port_neighbor_details_port-name.textfsm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ntc_templates/templates/fortinet_diagnose_lldprx_port_neighbor_details_port-name.textfsm b/ntc_templates/templates/fortinet_diagnose_lldprx_port_neighbor_details_port-name.textfsm index 88cff8cf7a..9ba43a90a1 100644 --- a/ntc_templates/templates/fortinet_diagnose_lldprx_port_neighbor_details_port-name.textfsm +++ b/ntc_templates/templates/fortinet_diagnose_lldprx_port_neighbor_details_port-name.textfsm @@ -14,7 +14,8 @@ # Value PORT (\S+) Value PORT_TXT (\S+) -Value MAC (\S+) +Value MAC_ADDRESS (\S+) + Value CHASSIS_TYPE (\S+) Value CHASSIS_TYPE_TXT (\S+) Value CHASSIS_DATA (\S+) From d6e727223cd788f8c886ee4f062d34b40011e2f6 Mon Sep 17 00:00:00 2001 From: Pavel Pestov <67155684+pnpestov@users.noreply.github.com> Date: Fri, 11 Oct 2024 08:17:38 +0300 Subject: [PATCH 07/14] Update ntc_templates/templates/fortinet_diagnose_lldprx_port_neighbor_details_port-name.textfsm Error Directive Co-authored-by: Jacob McGill <9847006+jmcgill298@users.noreply.github.com> --- ...inet_diagnose_lldprx_port_neighbor_details_port-name.textfsm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ntc_templates/templates/fortinet_diagnose_lldprx_port_neighbor_details_port-name.textfsm b/ntc_templates/templates/fortinet_diagnose_lldprx_port_neighbor_details_port-name.textfsm index 9ba43a90a1..1e144cef0e 100644 --- a/ntc_templates/templates/fortinet_diagnose_lldprx_port_neighbor_details_port-name.textfsm +++ b/ntc_templates/templates/fortinet_diagnose_lldprx_port_neighbor_details_port-name.textfsm @@ -127,3 +127,5 @@ Start MultipleLines ^${SYSTEM_DESC_DATA} ^1\s+system\.caps\.available:\s+${SYSTEM_CAPS_AVAILABLE} -> Start + ^\s*$$ + ^. -> Error From 5e684912fc0472b3581b228f6b116be744dddd71 Mon Sep 17 00:00:00 2001 From: Pavel Pestov <67155684+pnpestov@users.noreply.github.com> Date: Fri, 11 Oct 2024 08:18:44 +0300 Subject: [PATCH 08/14] Update ntc_templates/templates/fortinet_diagnose_lldprx_port_neighbor_details_port-name.textfsm MAC -> MAC_ADDRESS Co-authored-by: Jacob McGill <9847006+jmcgill298@users.noreply.github.com> --- ...net_diagnose_lldprx_port_neighbor_details_port-name.textfsm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ntc_templates/templates/fortinet_diagnose_lldprx_port_neighbor_details_port-name.textfsm b/ntc_templates/templates/fortinet_diagnose_lldprx_port_neighbor_details_port-name.textfsm index 1e144cef0e..33f0b8b354 100644 --- a/ntc_templates/templates/fortinet_diagnose_lldprx_port_neighbor_details_port-name.textfsm +++ b/ntc_templates/templates/fortinet_diagnose_lldprx_port_neighbor_details_port-name.textfsm @@ -69,7 +69,8 @@ Value MAX_FRAME_SIZE (\S+) Start ^1\s+port:\s+${PORT} ^1\s+port\.txt:\s+${PORT_TXT} - ^1\s+mac:\s+${MAC} + ^1\s+mac:\s+${MAC_ADDRESS} + ^1\s+chassis\.type:\s+${CHASSIS_TYPE} ^1\s+chassis\.type\.txt:\s+${CHASSIS_TYPE_TXT} ^1\s+chassis\.data:\s+${CHASSIS_DATA} From d90aca74ad00bb5f46b6f87600c945f7a1e52564 Mon Sep 17 00:00:00 2001 From: Pavel Pestov <67155684+pnpestov@users.noreply.github.com> Date: Fri, 11 Oct 2024 08:19:10 +0300 Subject: [PATCH 09/14] Update tests/fortinet/diagnose_lldprx_port_neighbor_details_port-name/fortinet_diagnose_lldprx_port_neighbor_details_port-name.yml mac -> mac_address Co-authored-by: Jacob McGill <9847006+jmcgill298@users.noreply.github.com> --- ...ortinet_diagnose_lldprx_port_neighbor_details_port-name.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/fortinet/diagnose_lldprx_port_neighbor_details_port-name/fortinet_diagnose_lldprx_port_neighbor_details_port-name.yml b/tests/fortinet/diagnose_lldprx_port_neighbor_details_port-name/fortinet_diagnose_lldprx_port_neighbor_details_port-name.yml index 7f08bf0a57..9f32cf91aa 100644 --- a/tests/fortinet/diagnose_lldprx_port_neighbor_details_port-name/fortinet_diagnose_lldprx_port_neighbor_details_port-name.yml +++ b/tests/fortinet/diagnose_lldprx_port_neighbor_details_port-name/fortinet_diagnose_lldprx_port_neighbor_details_port-name.yml @@ -14,7 +14,8 @@ parsed_sample: chassis_data: "00:11:22:33:44:55" chassis_type: "4" chassis_type_txt: "interface-mac" - mac: "00:11:22:33:44:55" + mac_address: "00:11:22:33:44:55" + mac_phy_auto: "3" mac_phy_auto_txt: "supported enabled" mac_phy_mau: "001e" From 7fc6d736bab728e2ad75b9e1e7791392175bff5a Mon Sep 17 00:00:00 2001 From: Pavel Pestov <67155684+pnpestov@users.noreply.github.com> Date: Fri, 11 Oct 2024 18:14:42 +0300 Subject: [PATCH 10/14] Update fortinet_diagnose_lldprx_port_neighbor_details_port-name.yml Deleting an empty line --- .../fortinet_diagnose_lldprx_port_neighbor_details_port-name.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/fortinet/diagnose_lldprx_port_neighbor_details_port-name/fortinet_diagnose_lldprx_port_neighbor_details_port-name.yml b/tests/fortinet/diagnose_lldprx_port_neighbor_details_port-name/fortinet_diagnose_lldprx_port_neighbor_details_port-name.yml index 9f32cf91aa..86db3b7926 100644 --- a/tests/fortinet/diagnose_lldprx_port_neighbor_details_port-name/fortinet_diagnose_lldprx_port_neighbor_details_port-name.yml +++ b/tests/fortinet/diagnose_lldprx_port_neighbor_details_port-name/fortinet_diagnose_lldprx_port_neighbor_details_port-name.yml @@ -15,7 +15,6 @@ parsed_sample: chassis_type: "4" chassis_type_txt: "interface-mac" mac_address: "00:11:22:33:44:55" - mac_phy_auto: "3" mac_phy_auto_txt: "supported enabled" mac_phy_mau: "001e" From 216adc6d213b75cfe708d48ef347c32fa8d46cf5 Mon Sep 17 00:00:00 2001 From: Jacob Date: Fri, 11 Oct 2024 12:12:54 -0400 Subject: [PATCH 11/14] Fixup yaml file --- ...lldprx_port_neighbor_details_port-name.yml | 116 +++++++++--------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/tests/fortinet/diagnose_lldprx_port_neighbor_details_port-name/fortinet_diagnose_lldprx_port_neighbor_details_port-name.yml b/tests/fortinet/diagnose_lldprx_port_neighbor_details_port-name/fortinet_diagnose_lldprx_port_neighbor_details_port-name.yml index 86db3b7926..a50d16e108 100644 --- a/tests/fortinet/diagnose_lldprx_port_neighbor_details_port-name/fortinet_diagnose_lldprx_port_neighbor_details_port-name.yml +++ b/tests/fortinet/diagnose_lldprx_port_neighbor_details_port-name/fortinet_diagnose_lldprx_port_neighbor_details_port-name.yml @@ -1,58 +1,58 @@ ---- -parsed_sample: - - address_1_addr: "aaa.bbb.ccc.ddd" - address_1_addr_interface_number: "269" - address_1_addr_interface_type: "2" - address_1_addr_interface_type_txt: "if-index" - address_1_len: "4" - address_1_type: "1" - address_1_type_txt: "ipv4" - address_count: "1" - aggregation_port: "0" - aggregation_status: "1" - aggregation_status_txt: "capable" - chassis_data: "00:11:22:33:44:55" - chassis_type: "4" - chassis_type_txt: "interface-mac" - mac_address: "00:11:22:33:44:55" - mac_phy_auto: "3" - mac_phy_auto_txt: "supported enabled" - mac_phy_mau: "001e" - mac_phy_mau_txt: "1000baseTFD" - mac_phy_pmd: "7c05" - mac_phy_pmd_txt: "10BaseT 10BaseTFD 100BaseT4 100BaseTX 100baseTXFD 1000baseXFd" - max_frame_size: "10240" - port: "6" - port_desc_data: "Port" - port_desc_len: "10" - port_id_data: "GigabitEthernet1/0/5" - port_id_len: "20" - port_id_type: "5" - port_id_type_txt: "interface-name" - port_txt: "lan1" - power_class: "0" - power_pair: "0" - power_status: "0" - power_status_txt: "PD" - system_caps_available: "0014" - system_caps_available_txt: "bridge router" - system_caps_enabled: "0014" - system_caps_enabled_txt: "bridge router" - system_desc_data: - - "Huawei Switch S5735-L48T4S-A1" - - "Huawei Versatile Routing Platform Software" - - "VRP (R) software, Version 5.170 (S5735 V200R022C00SPC500)" - - "Copyright (C) 2000-2022 HUAWEI TECH Co., Ltd." - system_desc_len: "179" - system_name_data: "Switch" - system_name_len: "15" - ttl: "120" - vlan_id: "1" - vlan_name_1_data: "VLAN 0001" - vlan_name_1_id: "1" - vlan_name_1_len: "9" - vlan_name_count: "1" - vlan_protocol_1_flag: "0" - vlan_protocol_1_flag_txt: "" - vlan_protocol_1_id: "0" - vlan_protocol_count: "1" +--- +parsed_sample: + - address_1_addr: "aaa.bbb.ccc.ddd" + address_1_addr_interface_number: "269" + address_1_addr_interface_type: "2" + address_1_addr_interface_type_txt: "if-index" + address_1_len: "4" + address_1_type: "1" + address_1_type_txt: "ipv4" + address_count: "1" + aggregation_port: "0" + aggregation_status: "1" + aggregation_status_txt: "capable" + chassis_data: "00:11:22:33:44:55" + chassis_type: "4" + chassis_type_txt: "interface-mac" + mac_address: "00:11:22:33:44:55" + mac_phy_auto: "3" + mac_phy_auto_txt: "supported enabled" + mac_phy_mau: "001e" + mac_phy_mau_txt: "1000baseTFD" + mac_phy_pmd: "7c05" + mac_phy_pmd_txt: "10BaseT 10BaseTFD 100BaseT4 100BaseTX 100baseTXFD 1000baseXFd" + max_frame_size: "10240" + port: "6" + port_desc_data: "Port" + port_desc_len: "10" + port_id_data: "GigabitEthernet1/0/5" + port_id_len: "20" + port_id_type: "5" + port_id_type_txt: "interface-name" + port_txt: "lan1" + power_class: "0" + power_pair: "0" + power_status: "0" + power_status_txt: "PD" + system_caps_available: "0014" + system_caps_available_txt: "bridge router" + system_caps_enabled: "0014" + system_caps_enabled_txt: "bridge router" + system_desc_data: + - "Huawei Switch S5735-L48T4S-A1" + - "Huawei Versatile Routing Platform Software" + - "VRP (R) software, Version 5.170 (S5735 V200R022C00SPC500)" + - "Copyright (C) 2000-2022 HUAWEI TECH Co., Ltd." + system_desc_len: "179" + system_name_data: "Switch" + system_name_len: "15" + ttl: "120" + vlan_id: "1" + vlan_name_1_data: "VLAN 0001" + vlan_name_1_id: "1" + vlan_name_1_len: "9" + vlan_name_count: "1" + vlan_protocol_1_flag: "0" + vlan_protocol_1_flag_txt: "" + vlan_protocol_1_id: "0" + vlan_protocol_count: "1" From e66ff106f098abbff75fee6a87567780810be04a Mon Sep 17 00:00:00 2001 From: Pavel Pestov <67155684+pnpestov@users.noreply.github.com> Date: Mon, 14 Oct 2024 08:23:04 +0300 Subject: [PATCH 12/14] Update index Template name in length order (longest to shortest) --- ntc_templates/templates/index | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntc_templates/templates/index b/ntc_templates/templates/index index 7179a798fe..cccd712f2a 100644 --- a/ntc_templates/templates/index +++ b/ntc_templates/templates/index @@ -584,6 +584,7 @@ extreme_exos_show_ipconfig.textfsm, .*, extreme_exos, show ipconfig extreme_exos_show_sharing.textfsm, .*, extreme_exos, show sharing extreme_exos_show_iparp.textfsm, .*, extreme_exos, show iparp +fortinet_diagnose_lldprx_port_neighbor_details_port-name.textfsm, .*, fortinet, d[[iagnose]] lldpr[[x]] p[[ort]] n[[eighbor]] d[[etails]] (\S+) fortinet_get_router_info_routing-table_all.textfsm, .*, fortinet, g[[et]] r[[outer]] info ro[[uting-table]] a[[ll]] fortinet_get_router_info_bgp_neighbors.textfsm, .*, fortinet, g[[et]] r[[outer]] info bg[[p]] nei[[ghbors]] fortinet_get_system_interface_physical.textfsm, .*, fortinet, g[[et]] sy[[stem]] in[[terface]] p[[hysical]] @@ -603,7 +604,6 @@ fortinet_get_system_arp.textfsm, .*, fortinet, g[[et]] sy[[stem]] arp fortinet_execute_date.textfsm, .*, fortinet, exec[[ute]] da[[te]] fortinet_execute_ping.textfsm, .*, fortinet, exec[[ute]] ping fortinet_execute_time.textfsm, .*, fortinet, exec[[ute]] ti[[me]] -fortinet_diagnose_lldprx_port_neighbor_details_port-name.textfsm, .*, fortinet, d[[iagnose]] lldpr[[x]] p[[ort]] n[[eighbor]] d[[etails]] (\S+) hp_comware_display_lldp_neighbor-information_verbose.textfsm, .*, hp_comware, di[[splay]] ll[[dp]] n[[eighbor-information]] v[[erbose]] hp_comware_display_lldp_neighbor-information_list.textfsm, .*, hp_comware, di[[splay]] ll[[dp]] n[[eighbor-information]] l[[ist]] From 3a50a7308522287919b30b96cdc7f5162a5af1d7 Mon Sep 17 00:00:00 2001 From: Jacob McGill <9847006+jmcgill298@users.noreply.github.com> Date: Tue, 15 Oct 2024 10:19:27 -0400 Subject: [PATCH 13/14] Update ntc_templates/templates/fortinet_diagnose_lldprx_port_neighbor_details_port-name.textfsm --- ...tinet_diagnose_lldprx_port_neighbor_details_port-name.textfsm | 1 - 1 file changed, 1 deletion(-) diff --git a/ntc_templates/templates/fortinet_diagnose_lldprx_port_neighbor_details_port-name.textfsm b/ntc_templates/templates/fortinet_diagnose_lldprx_port_neighbor_details_port-name.textfsm index 33f0b8b354..f547f58bdf 100644 --- a/ntc_templates/templates/fortinet_diagnose_lldprx_port_neighbor_details_port-name.textfsm +++ b/ntc_templates/templates/fortinet_diagnose_lldprx_port_neighbor_details_port-name.textfsm @@ -15,7 +15,6 @@ Value PORT (\S+) Value PORT_TXT (\S+) Value MAC_ADDRESS (\S+) - Value CHASSIS_TYPE (\S+) Value CHASSIS_TYPE_TXT (\S+) Value CHASSIS_DATA (\S+) From e6f80a631fc6f915cd9d8e5520e47917da1c0f5a Mon Sep 17 00:00:00 2001 From: Jacob McGill <9847006+jmcgill298@users.noreply.github.com> Date: Tue, 15 Oct 2024 10:19:59 -0400 Subject: [PATCH 14/14] Update ntc_templates/templates/fortinet_diagnose_lldprx_port_neighbor_details_port-name.textfsm --- ...tinet_diagnose_lldprx_port_neighbor_details_port-name.textfsm | 1 - 1 file changed, 1 deletion(-) diff --git a/ntc_templates/templates/fortinet_diagnose_lldprx_port_neighbor_details_port-name.textfsm b/ntc_templates/templates/fortinet_diagnose_lldprx_port_neighbor_details_port-name.textfsm index f547f58bdf..603bc7e0ee 100644 --- a/ntc_templates/templates/fortinet_diagnose_lldprx_port_neighbor_details_port-name.textfsm +++ b/ntc_templates/templates/fortinet_diagnose_lldprx_port_neighbor_details_port-name.textfsm @@ -69,7 +69,6 @@ Start ^1\s+port:\s+${PORT} ^1\s+port\.txt:\s+${PORT_TXT} ^1\s+mac:\s+${MAC_ADDRESS} - ^1\s+chassis\.type:\s+${CHASSIS_TYPE} ^1\s+chassis\.type\.txt:\s+${CHASSIS_TYPE_TXT} ^1\s+chassis\.data:\s+${CHASSIS_DATA}