From d6fb5b4bf0dcd69e5d6faa649a77dd23fefaa550 Mon Sep 17 00:00:00 2001 From: evilmonkey19 Date: Sun, 23 Feb 2025 20:11:36 +0100 Subject: [PATCH 1/2] New template for Huawei ONT: `display access mode` --- .../templates/huawei_ont_display_access_mode.textfsm | 7 +++++++ ntc_templates/templates/index | 2 ++ .../display_access_mode/huawei_ont_display_access_mode.raw | 3 +++ .../display_access_mode/huawei_ont_display_access_mode.yml | 3 +++ tests/test_index_order.py | 1 + 5 files changed, 16 insertions(+) create mode 100644 ntc_templates/templates/huawei_ont_display_access_mode.textfsm create mode 100644 tests/huawei_ont/display_access_mode/huawei_ont_display_access_mode.raw create mode 100644 tests/huawei_ont/display_access_mode/huawei_ont_display_access_mode.yml diff --git a/ntc_templates/templates/huawei_ont_display_access_mode.textfsm b/ntc_templates/templates/huawei_ont_display_access_mode.textfsm new file mode 100644 index 0000000000..06b1f4279f --- /dev/null +++ b/ntc_templates/templates/huawei_ont_display_access_mode.textfsm @@ -0,0 +1,7 @@ +Value ACCESS_MODE (\S+) + +Start + ^\s*access\s+mode\s+is\s+${ACCESS_MODE}\s*$$ + ^\s*success!\s*$$ + ^\s+$$ + ^. -> Error \ No newline at end of file diff --git a/ntc_templates/templates/index b/ntc_templates/templates/index index e80c4edeb5..45d005ec11 100644 --- a/ntc_templates/templates/index +++ b/ntc_templates/templates/index @@ -672,6 +672,8 @@ hp_procurve_show_vlans.textfsm, .*, (hp|aruba)_procurve, sh[[ow]] vl[[ans]] hp_procurve_show_arp.textfsm, .*, (hp|aruba)_procurve, sh[[ow]] ar[[p]] hp_procurve_show_ip.textfsm, .*, (hp|aruba)_procurve, sh[[ow]] ip +huawei_ont_display_access_mode.textfsm, .*, huawei_ont, di[[splay]] ac[[cess]] m[[ode]] + huawei_smartax_display_ont_info_summary_ont.textfsm:huawei_smartax_display_ont_info_summary_sn.textfsm, .*, huawei_smartax, di[[splay]] ont i[[nfo]] su[[mmary]] \S+ *$ huawei_smartax_display_ont_info_0_1_2.textfsm:huawei_smartax_display_ont_info_description.textfsm, .*, huawei_smartax, di[[splay]] ont i[[nfo]] (\d+\s*|\d+ \d+ \d+\s*)\s*[[all]] *$ huawei_smartax_display_ont_port_vlan_0_1_byport_eth_0.textfsm, .*, huawei_smartax, di[[splay]] ont p[[ort]] vl[[an]] \d+ \d+ byport eth \d+\s* diff --git a/tests/huawei_ont/display_access_mode/huawei_ont_display_access_mode.raw b/tests/huawei_ont/display_access_mode/huawei_ont_display_access_mode.raw new file mode 100644 index 0000000000..6930bc76d0 --- /dev/null +++ b/tests/huawei_ont/display_access_mode/huawei_ont_display_access_mode.raw @@ -0,0 +1,3 @@ +access mode is epon + +success! \ No newline at end of file diff --git a/tests/huawei_ont/display_access_mode/huawei_ont_display_access_mode.yml b/tests/huawei_ont/display_access_mode/huawei_ont_display_access_mode.yml new file mode 100644 index 0000000000..7c23944404 --- /dev/null +++ b/tests/huawei_ont/display_access_mode/huawei_ont_display_access_mode.yml @@ -0,0 +1,3 @@ +--- +parsed_sample: + - access_mode: "epon" diff --git a/tests/test_index_order.py b/tests/test_index_order.py index 2b4aa72f71..1713ee11ee 100755 --- a/tests/test_index_order.py +++ b/tests/test_index_order.py @@ -49,6 +49,7 @@ "fsas_sir", "hp_comware", "hp_procurve", + "huawei_ont", "huawei_smartax", "huawei_vrp", "ipinfusion_ocnos", From 86af525be42aed475f594e960d738412c111a4fb Mon Sep 17 00:00:00 2001 From: evilmonkey19 Date: Sun, 23 Feb 2025 23:51:18 +0100 Subject: [PATCH 2/2] Add template for Huawei ONT: `display port statistics portid` --- ...t_display_port_statistics_portid_0.textfsm | 21 +++++++++++++++++++ ntc_templates/templates/index | 1 + ...i_ont_display_port_statistics_portid_0.raw | 10 +++++++++ ...i_ont_display_port_statistics_portid_0.yml | 10 +++++++++ 4 files changed, 42 insertions(+) create mode 100644 ntc_templates/templates/huawei_ont_display_port_statistics_portid_0.textfsm create mode 100644 tests/huawei_ont/display_port_statistics_portid_0/huawei_ont_display_port_statistics_portid_0.raw create mode 100644 tests/huawei_ont/display_port_statistics_portid_0/huawei_ont_display_port_statistics_portid_0.yml diff --git a/ntc_templates/templates/huawei_ont_display_port_statistics_portid_0.textfsm b/ntc_templates/templates/huawei_ont_display_port_statistics_portid_0.textfsm new file mode 100644 index 0000000000..0c11c74ff7 --- /dev/null +++ b/ntc_templates/templates/huawei_ont_display_port_statistics_portid_0.textfsm @@ -0,0 +1,21 @@ +Value ETHERNET_PORTID (\d+) +Value RX_UNICAST_PACKETS (\d+) +Value TX_UNICAST_PACKETS (\d+) +Value RX_BROADCAST_PACKETS (\d+) +Value TX_BROADCAST_PACKETS (\d+) +Value RX_MULTICAST_PACKETS (\d+) +Value TX_MULTICAST_PACKETS (\d+) +Value DROPPED_PACKETS (\d+) + +Start + ^\s*Ethernet\s+portid\s*=\s*${ETHERNET_PORTID}\s*$$ + ^\s*Rx\s+unicast\s+packets\s*:\s*${RX_UNICAST_PACKETS}\s*$$ + ^\s*Tx\s+unicast\s+packets\s*:\s*${TX_UNICAST_PACKETS}\s*$$ + ^\s*Rx\s+broadcast\s+packets\s*:\s*${RX_BROADCAST_PACKETS}\s*$$ + ^\s*Tx\s+broadcast\s+packets\s*:\s*${TX_BROADCAST_PACKETS}\s*$$ + ^\s*Rx\s+multicast\s+packets\s*:\s*${RX_MULTICAST_PACKETS}\s*$$ + ^\s*Tx\s+multicast\s+packets\s*:\s*${TX_MULTICAST_PACKETS}\s*$$ + ^\s*Dropped\s+packets\s*:\s*${DROPPED_PACKETS}\s*$$ + ^\s+$$ + ^\s*success!\s*$$ + ^. -> Error \ No newline at end of file diff --git a/ntc_templates/templates/index b/ntc_templates/templates/index index 45d005ec11..14ab924dfb 100644 --- a/ntc_templates/templates/index +++ b/ntc_templates/templates/index @@ -672,6 +672,7 @@ hp_procurve_show_vlans.textfsm, .*, (hp|aruba)_procurve, sh[[ow]] vl[[ans]] hp_procurve_show_arp.textfsm, .*, (hp|aruba)_procurve, sh[[ow]] ar[[p]] hp_procurve_show_ip.textfsm, .*, (hp|aruba)_procurve, sh[[ow]] ip +huawei_ont_display_port_statistics_portid_0.textfsm, .*, huawei_ont, di[[splay]] p[[ort]] s[[tatistics]] po[[rtid]] \d+ huawei_ont_display_access_mode.textfsm, .*, huawei_ont, di[[splay]] ac[[cess]] m[[ode]] huawei_smartax_display_ont_info_summary_ont.textfsm:huawei_smartax_display_ont_info_summary_sn.textfsm, .*, huawei_smartax, di[[splay]] ont i[[nfo]] su[[mmary]] \S+ *$ diff --git a/tests/huawei_ont/display_port_statistics_portid_0/huawei_ont_display_port_statistics_portid_0.raw b/tests/huawei_ont/display_port_statistics_portid_0/huawei_ont_display_port_statistics_portid_0.raw new file mode 100644 index 0000000000..303acc587f --- /dev/null +++ b/tests/huawei_ont/display_port_statistics_portid_0/huawei_ont_display_port_statistics_portid_0.raw @@ -0,0 +1,10 @@ +Ethernet portid = 1 +Rx unicast packets : 4477 +Tx unicast packets : 3390 +Rx broadcast packets : 70780 +Tx broadcast packets : 1 +Rx multicast packets : 4011 +Tx multicast packets : 0 +Dropped packets : 0 + +success! \ No newline at end of file diff --git a/tests/huawei_ont/display_port_statistics_portid_0/huawei_ont_display_port_statistics_portid_0.yml b/tests/huawei_ont/display_port_statistics_portid_0/huawei_ont_display_port_statistics_portid_0.yml new file mode 100644 index 0000000000..2e746db99d --- /dev/null +++ b/tests/huawei_ont/display_port_statistics_portid_0/huawei_ont_display_port_statistics_portid_0.yml @@ -0,0 +1,10 @@ +--- +parsed_sample: + - dropped_packets: "0" + ethernet_portid: "1" + rx_broadcast_packets: "70780" + rx_multicast_packets: "4011" + rx_unicast_packets: "4477" + tx_broadcast_packets: "1" + tx_multicast_packets: "0" + tx_unicast_packets: "3390"