From 8cb733a6fa0e0b07d914331e89d806151e41b369 Mon Sep 17 00:00:00 2001 From: aranguito <49682885+aranguito@users.noreply.github.com> Date: Tue, 16 Apr 2019 13:43:18 -0500 Subject: [PATCH 01/21] Create huawei_display_interface_brief.template --- templates/huawei_display_interface_brief.template | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 templates/huawei_display_interface_brief.template diff --git a/templates/huawei_display_interface_brief.template b/templates/huawei_display_interface_brief.template new file mode 100644 index 0000000000..8c757a25b1 --- /dev/null +++ b/templates/huawei_display_interface_brief.template @@ -0,0 +1,12 @@ +Value INTERFACE (\S+) +Value PHY (down|up) +Value PROTOCOL (down|up) +Value INUTI (\d*\.?\d*%) +Value OUTUTI (\d*\.?\d*%) +Value INERRORS (\d+) +Value OUTERRORS (\d+) + + + +Start + ^\s*${INTERFACE}\s+${PHY}\s+${PROTOCOL}\s+${INUTI}\s+${OUTUTI}\s+${INERRORS}\s+${OUTERRORS} -> Record From fd15ae78bc9faec0ad0a65ac54c6f79989824bb6 Mon Sep 17 00:00:00 2001 From: aranguito <49682885+aranguito@users.noreply.github.com> Date: Tue, 16 Apr 2019 13:54:38 -0500 Subject: [PATCH 02/21] Create huawei_display_interface_brief.raw --- .../huawei_display_interface_brief.raw | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 tests/Huawei/display_interface_brief/huawei_display_interface_brief.raw diff --git a/tests/Huawei/display_interface_brief/huawei_display_interface_brief.raw b/tests/Huawei/display_interface_brief/huawei_display_interface_brief.raw new file mode 100644 index 0000000000..64d0898f5a --- /dev/null +++ b/tests/Huawei/display_interface_brief/huawei_display_interface_brief.raw @@ -0,0 +1,30 @@ +PHY: Physical +*down: administratively down +^down: standby +(l): loopback +(s): spoofing +(E): E-Trunk down +(b): BFD down +(B): Bit-error-detection down +(e): ETHOAM down +(d): Dampening Suppressed +InUti/OutUti: input utility/output utility +Interface PHY Protocol InUti OutUti inErrors outErrors +Aux0/0/1 down down 0% 0% 0 0 +Eth-Trunk2 up up 0% 0.38% 0 0 + GigabitEthernet8/1/16 up up 0% 0.04% 0 0 + GigabitEthernet8/1/17 up up 0% 1.66% 0 0 + GigabitEthernet8/1/18 up up 0% 0.01% 0 0 + GigabitEthernet8/1/19 up up 0% 0% 0 0 + GigabitEthernet8/1/20 up up 0% 0.47% 0 0 +Eth-Trunk3 up up 0% 0% 0 0 + GigabitEthernet8/1/21 up up 0% 0% 0 0 + GigabitEthernet8/1/22 up up 0% 0% 0 0 + GigabitEthernet8/1/23 up up 0.01% 0.01% 0 0 +Eth-Trunk4 up down 0.69% 13.57% 4625 0 + GigabitEthernet15/1/0(10G) up up 0.69% 14.30% 0 0 + GigabitEthernet16/0/1(10G) up up 0.71% 12.84% 4625 0 +Eth-Trunk4.10 up up 0.69% 13.57% 0 0 +Eth-Trunk5 up down 0.01% 0% 0 0 + GigabitEthernet4/0/4(10G) up up 0.01% 0% 0 0 +Eth-Trunk5.100 up up 0% 0% 0 0 From 9481245356a67e29ce710a0b367321e60e3bc003 Mon Sep 17 00:00:00 2001 From: aranguito <49682885+aranguito@users.noreply.github.com> Date: Tue, 16 Apr 2019 13:55:26 -0500 Subject: [PATCH 03/21] Create huawei_display_interface_brief.parsed --- .../huawei_display_interface_brief.parsed | 129 ++++++++++++++++++ 1 file changed, 129 insertions(+) create mode 100644 tests/Huawei/display_interface_brief/huawei_display_interface_brief.parsed diff --git a/tests/Huawei/display_interface_brief/huawei_display_interface_brief.parsed b/tests/Huawei/display_interface_brief/huawei_display_interface_brief.parsed new file mode 100644 index 0000000000..6a45cea759 --- /dev/null +++ b/tests/Huawei/display_interface_brief/huawei_display_interface_brief.parsed @@ -0,0 +1,129 @@ +--- +parsed_sample: + +- interface: Aux0/0/1 + phy: down + protocol: down + inuti: 0% + oututi: 0% + inerrors: 0 + outerrors: 0 +- interface: Eth-Trunk2 + phy: up + protocol: up + inuti: 0% + oututi: 0.38% + inerrors: 0 + outerrors: 0 +- interface: GigabitEthernet8/1/16 + phy: up + protocol: up + inuti: 0% + oututi: 0.04% + inerrors: 0 + outerrors: 0 +- interface: GigabitEthernet8/1/17 + phy: up + protocol: up + inuti: 0% + oututi: 1.66% + inerrors: 0 + outerrors: 0 +- interface: GigabitEthernet8/1/18 + phy: up + protocol: up + inuti: 0% + oututi: 0.01% + inerrors: 0 + outerrors: 0 +- interface: GigabitEthernet8/1/19 + phy: up + protocol: up + inuti: 0% + oututi: 0% + inerrors: 0 + outerrors: 0 +- interface: GigabitEthernet8/1/20 + phy: up + protocol: up + inuti: 0% + oututi: 0.47% + inerrors: 0 + outerrors: 0 +- interface: Eth-Trunk3 + phy: up + protocol: up + inuti: 0% + oututi: 0% + inerrors: 0 + outerrors: 0 +- interface: GigabitEthernet8/1/21 + phy: up + protocol: up + inuti: 0% + oututi: 0% + inerrors: 0 + outerrors: 0 +- interface: GigabitEthernet8/1/22 + phy: up + protocol: up + inuti: 0% + oututi: 0% + inerrors: 0 + outerrors: 0 +- interface: GigabitEthernet8/1/23 + phy: up + protocol: up + inuti: 0.01% + oututi: 0.01% + inerrors: 0 + outerrors: 0 +- interface: Eth-Trunk4 + phy: up + protocol: down + inuti: 0.69% + oututi: 13.57% + inerrors: 4625 + outerrors: 0 +- interface: GigabitEthernet15/1/0(10G) + phy: up + protocol: up + inuti: 0.69% + oututi: 14.30% + inerrors: 0 + outerrors: 0 +- interface: GigabitEthernet16/0/1(10G) + phy: up + protocol: up + inuti: 0.71% + oututi: 12.84% + inerrors: 4625 + outerrors: 0 +- interface: Eth-Trunk4.10 + phy: up + protocol: up + inuti: 0.69% + oututi: 13.57% + inerrors: 0 + outerrors: 0 +- interface: Eth-Trunk5 + phy: up + protocol: down + inuti: 0.01% + oututi: 0% + inerrors: 0 + outerrors: 0 +- interface: GigabitEthernet4/0/4(10G) + phy: up + protocol: up + inuti: 0.01% + oututi: 0% + inerrors: 0 + outerrors: 0 +- interface: Eth-Trunk5.100 + phy: up + protocol: up + inuti: 0% + oututi: 0% + inerrors: 0 + outerrors: 0 From 71f710ba46f4da2c644be8b9e641d87dc8544354 Mon Sep 17 00:00:00 2001 From: aranguito <49682885+aranguito@users.noreply.github.com> Date: Tue, 16 Apr 2019 14:02:45 -0500 Subject: [PATCH 04/21] insert first huawei command in the index --- templates/index | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/index b/templates/index index ebfdf090e5..fdd1f8e53e 100644 --- a/templates/index +++ b/templates/index @@ -286,6 +286,8 @@ hp_procurve_show_system.template, .*, hp_procurve, sh[[ow]] syst[[em]] hp_procurve_show_vlans.template, .*, hp_procurve, sh[[ow]] vl[[ans]] hp_procurve_show_arp.template, .*, hp_procurve, sh[[ow]] ar[[p]] +huawei_display_interface_brief.template. .*,vrp, disp[[lay]] inter[[face]] br[[ief]] + juniper_junos_show_chassis_cluster_interfaces.template, .*, juniper_junos, sh[[ow]] ch[[assis]] c[[luster]] i[[nterface]] juniper_junos_show_chassis_cluster_status.template, .*, juniper_junos, sh[[ow]] ch[[assis]] c[[luster]] s[[tatus]] juniper_junos_show_chassis_firmware.template, .*, juniper_junos, sh[[ow]] ch[[assis]] fi[[rmware]] From 2c95fd925f27f69ff6e4e04b8f07746af6f49c37 Mon Sep 17 00:00:00 2001 From: aranguito <49682885+aranguito@users.noreply.github.com> Date: Tue, 23 Apr 2019 09:52:54 -0500 Subject: [PATCH 05/21] Update huawei_display_interface_brief.template added support for vlan interface state --- templates/huawei_display_interface_brief.template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/huawei_display_interface_brief.template b/templates/huawei_display_interface_brief.template index 8c757a25b1..121e14fb14 100644 --- a/templates/huawei_display_interface_brief.template +++ b/templates/huawei_display_interface_brief.template @@ -1,8 +1,8 @@ Value INTERFACE (\S+) -Value PHY (down|up) -Value PROTOCOL (down|up) -Value INUTI (\d*\.?\d*%) -Value OUTUTI (\d*\.?\d*%) +Value PHY (down|\*down|up|up\(s\)) +Value PROTOCOL (down|\*down|up|up\(s\)) +Value INUTI (\d*\.?\d*%|\-\-) +Value OUTUTI (\d*\.?\d*%|\-\-) Value INERRORS (\d+) Value OUTERRORS (\d+) From a12bcc7f934e95660cf5455737e21fbd40e45760 Mon Sep 17 00:00:00 2001 From: aranguito <49682885+aranguito@users.noreply.github.com> Date: Tue, 23 Apr 2019 10:03:57 -0500 Subject: [PATCH 06/21] Update huawei_display_interface_brief.raw additional line with no information removed from the end of the raw file From 73e7d8e293a2ccc96f660b2de47155194bee3026 Mon Sep 17 00:00:00 2001 From: aranguito <49682885+aranguito@users.noreply.github.com> Date: Tue, 23 Apr 2019 10:18:15 -0500 Subject: [PATCH 07/21] Update huawei_display_interface_brief.parsed --- .../huawei_display_interface_brief.parsed | 252 +++++++++--------- 1 file changed, 126 insertions(+), 126 deletions(-) diff --git a/tests/Huawei/display_interface_brief/huawei_display_interface_brief.parsed b/tests/Huawei/display_interface_brief/huawei_display_interface_brief.parsed index 6a45cea759..d69967743e 100644 --- a/tests/Huawei/display_interface_brief/huawei_display_interface_brief.parsed +++ b/tests/Huawei/display_interface_brief/huawei_display_interface_brief.parsed @@ -1,129 +1,129 @@ --- parsed_sample: -- interface: Aux0/0/1 - phy: down - protocol: down - inuti: 0% - oututi: 0% - inerrors: 0 - outerrors: 0 -- interface: Eth-Trunk2 - phy: up - protocol: up - inuti: 0% - oututi: 0.38% - inerrors: 0 - outerrors: 0 -- interface: GigabitEthernet8/1/16 - phy: up - protocol: up - inuti: 0% - oututi: 0.04% - inerrors: 0 - outerrors: 0 -- interface: GigabitEthernet8/1/17 - phy: up - protocol: up - inuti: 0% - oututi: 1.66% - inerrors: 0 - outerrors: 0 -- interface: GigabitEthernet8/1/18 - phy: up - protocol: up - inuti: 0% - oututi: 0.01% - inerrors: 0 - outerrors: 0 -- interface: GigabitEthernet8/1/19 - phy: up - protocol: up - inuti: 0% - oututi: 0% - inerrors: 0 - outerrors: 0 -- interface: GigabitEthernet8/1/20 - phy: up - protocol: up - inuti: 0% - oututi: 0.47% - inerrors: 0 - outerrors: 0 -- interface: Eth-Trunk3 - phy: up - protocol: up - inuti: 0% - oututi: 0% - inerrors: 0 - outerrors: 0 -- interface: GigabitEthernet8/1/21 - phy: up - protocol: up - inuti: 0% - oututi: 0% - inerrors: 0 - outerrors: 0 -- interface: GigabitEthernet8/1/22 - phy: up - protocol: up - inuti: 0% - oututi: 0% - inerrors: 0 - outerrors: 0 -- interface: GigabitEthernet8/1/23 - phy: up - protocol: up - inuti: 0.01% - oututi: 0.01% - inerrors: 0 - outerrors: 0 -- interface: Eth-Trunk4 - phy: up - protocol: down - inuti: 0.69% - oututi: 13.57% - inerrors: 4625 - outerrors: 0 -- interface: GigabitEthernet15/1/0(10G) - phy: up - protocol: up - inuti: 0.69% - oututi: 14.30% - inerrors: 0 - outerrors: 0 -- interface: GigabitEthernet16/0/1(10G) - phy: up - protocol: up - inuti: 0.71% - oututi: 12.84% - inerrors: 4625 - outerrors: 0 -- interface: Eth-Trunk4.10 - phy: up - protocol: up - inuti: 0.69% - oututi: 13.57% - inerrors: 0 - outerrors: 0 -- interface: Eth-Trunk5 - phy: up - protocol: down - inuti: 0.01% - oututi: 0% - inerrors: 0 - outerrors: 0 -- interface: GigabitEthernet4/0/4(10G) - phy: up - protocol: up - inuti: 0.01% - oututi: 0% - inerrors: 0 - outerrors: 0 -- interface: Eth-Trunk5.100 - phy: up - protocol: up - inuti: 0% - oututi: 0% - inerrors: 0 - outerrors: 0 +- interface: Aux0/0/1 + phy: down + protocol: down + inuti: 0% + oututi: 0% + inerrors: 0 + outerrors: 0 +- interface: Eth-Trunk2 + phy: up + protocol: up + inuti: 0% + oututi: 0.38% + inerrors: 0 + outerrors: 0 +- interface: GigabitEthernet8/1/16 + phy: up + protocol: up + inuti: 0% + oututi: 0.04% + inerrors: 0 + outerrors: 0 +- interface: GigabitEthernet8/1/17 + phy: up + protocol: up + inuti: 0% + oututi: 1.66% + inerrors: 0 + outerrors: 0 +- interface: GigabitEthernet8/1/18 + phy: up + protocol: up + inuti: 0% + oututi: 0.01% + inerrors: 0 + outerrors: 0 +- interface: GigabitEthernet8/1/19 + phy: up + protocol: up + inuti: 0% + oututi: 0% + inerrors: 0 + outerrors: 0 +- interface: GigabitEthernet8/1/20 + phy: up + protocol: up + inuti: 0% + oututi: 0.47% + inerrors: 0 + outerrors: 0 +- interface: Eth-Trunk3 + phy: up + protocol: up + inuti: 0% + oututi: 0% + inerrors: 0 + outerrors: 0 +- interface: GigabitEthernet8/1/21 + phy: up + protocol: up + inuti: 0% + oututi: 0% + inerrors: 0 + outerrors: 0 +- interface: GigabitEthernet8/1/22 + phy: up + protocol: up + inuti: 0% + oututi: 0% + inerrors: 0 + outerrors: 0 +- interface: GigabitEthernet8/1/23 + phy: up + protocol: up + inuti: 0.01% + oututi: 0.01% + inerrors: 0 + outerrors: 0 +- interface: Eth-Trunk4 + phy: up + protocol: down + inuti: 0.69% + oututi: 13.57% + inerrors: 4625 + outerrors: 0 +- interface: GigabitEthernet15/1/0(10G) + phy: up + protocol: up + inuti: 0.69% + oututi: 14.30% + inerrors: 0 + outerrors: 0 +- interface: GigabitEthernet16/0/1(10G) + phy: up + protocol: up + inuti: 0.71% + oututi: 12.84% + inerrors: 4625 + outerrors: 0 +- interface: Eth-Trunk4.10 + phy: up + protocol: up + inuti: 0.69% + oututi: 13.57% + inerrors: 0 + outerrors: 0 +- interface: Eth-Trunk5 + phy: up + protocol: down + inuti: 0.01% + oututi: 0% + inerrors: 0 + outerrors: 0 +- interface: GigabitEthernet4/0/4(10G) + phy: up + protocol: up + inuti: 0.01% + oututi: 0% + inerrors: 0 + outerrors: 0 +- interface: Eth-Trunk5.100 + phy: up + protocol: up + inuti: 0% + oututi: 0% + inerrors: 0 + outerrors: 0 From ef829f8d437ea300927ab57434266bf674947077 Mon Sep 17 00:00:00 2001 From: aranguito <49682885+aranguito@users.noreply.github.com> Date: Tue, 23 Apr 2019 10:41:59 -0500 Subject: [PATCH 08/21] Update huawei_display_interface_brief.parsed wrong formating adding ' ' to the corresponding pairs --- .../huawei_display_interface_brief.parsed | 252 +++++++++--------- 1 file changed, 126 insertions(+), 126 deletions(-) diff --git a/tests/Huawei/display_interface_brief/huawei_display_interface_brief.parsed b/tests/Huawei/display_interface_brief/huawei_display_interface_brief.parsed index d69967743e..b6673f2b89 100644 --- a/tests/Huawei/display_interface_brief/huawei_display_interface_brief.parsed +++ b/tests/Huawei/display_interface_brief/huawei_display_interface_brief.parsed @@ -1,129 +1,129 @@ --- parsed_sample: -- interface: Aux0/0/1 - phy: down - protocol: down - inuti: 0% - oututi: 0% - inerrors: 0 - outerrors: 0 -- interface: Eth-Trunk2 - phy: up - protocol: up - inuti: 0% - oututi: 0.38% - inerrors: 0 - outerrors: 0 -- interface: GigabitEthernet8/1/16 - phy: up - protocol: up - inuti: 0% - oututi: 0.04% - inerrors: 0 - outerrors: 0 -- interface: GigabitEthernet8/1/17 - phy: up - protocol: up - inuti: 0% - oututi: 1.66% - inerrors: 0 - outerrors: 0 -- interface: GigabitEthernet8/1/18 - phy: up - protocol: up - inuti: 0% - oututi: 0.01% - inerrors: 0 - outerrors: 0 -- interface: GigabitEthernet8/1/19 - phy: up - protocol: up - inuti: 0% - oututi: 0% - inerrors: 0 - outerrors: 0 -- interface: GigabitEthernet8/1/20 - phy: up - protocol: up - inuti: 0% - oututi: 0.47% - inerrors: 0 - outerrors: 0 -- interface: Eth-Trunk3 - phy: up - protocol: up - inuti: 0% - oututi: 0% - inerrors: 0 - outerrors: 0 -- interface: GigabitEthernet8/1/21 - phy: up - protocol: up - inuti: 0% - oututi: 0% - inerrors: 0 - outerrors: 0 -- interface: GigabitEthernet8/1/22 - phy: up - protocol: up - inuti: 0% - oututi: 0% - inerrors: 0 - outerrors: 0 -- interface: GigabitEthernet8/1/23 - phy: up - protocol: up - inuti: 0.01% - oututi: 0.01% - inerrors: 0 - outerrors: 0 -- interface: Eth-Trunk4 - phy: up - protocol: down - inuti: 0.69% - oututi: 13.57% - inerrors: 4625 - outerrors: 0 -- interface: GigabitEthernet15/1/0(10G) - phy: up - protocol: up - inuti: 0.69% - oututi: 14.30% - inerrors: 0 - outerrors: 0 -- interface: GigabitEthernet16/0/1(10G) - phy: up - protocol: up - inuti: 0.71% - oututi: 12.84% - inerrors: 4625 - outerrors: 0 -- interface: Eth-Trunk4.10 - phy: up - protocol: up - inuti: 0.69% - oututi: 13.57% - inerrors: 0 - outerrors: 0 -- interface: Eth-Trunk5 - phy: up - protocol: down - inuti: 0.01% - oututi: 0% - inerrors: 0 - outerrors: 0 -- interface: GigabitEthernet4/0/4(10G) - phy: up - protocol: up - inuti: 0.01% - oututi: 0% - inerrors: 0 - outerrors: 0 -- interface: Eth-Trunk5.100 - phy: up - protocol: up - inuti: 0% - oututi: 0% - inerrors: 0 - outerrors: 0 +- interface: 'Aux0/0/1' + phy: 'down' + protocol: 'down' + inuti: '0%' + oututi: '0%' + inerrors: '0' + outerrors: '0' +- interface: 'Eth-Trunk2' + phy: 'up' + protocol: 'up' + inuti: '0% + oututi: '0.38%' + inerrors: '0' + outerrors: '0' +- interface: 'GigabitEthernet8/1/16' + phy: 'up' + protocol: 'up' + inuti: '0%' + oututi: '0.04%' + inerrors: '0' + outerrors: '0' +- interface: 'GigabitEthernet8/1/17' + phy: 'up' + protocol: 'up' + inuti: '0%' + oututi: '1.66%' + inerrors: '0' + outerrors: '0' +- interface: 'GigabitEthernet8/1/18' + phy: 'up' + protocol: 'up' + inuti: '0%' + oututi: '0.01%' + inerrors: '0' + outerrors: '0' +- interface: 'GigabitEthernet8/1/19' + phy: 'up' + protocol: 'up' + inuti: '0%' + oututi: '0%' + inerrors: '0' + outerrors: '0' +- interface: 'GigabitEthernet8/1/20' + phy: 'up' + protocol: 'up' + inuti: '0%' + oututi: '0.47%' + inerrors: '0' + outerrors: '0' +- interface: 'Eth-Trunk3' + phy: 'up' + protocol: 'up' + inuti: '0%' + oututi: '0%' + inerrors: '0' + outerrors: '0' +- interface: 'GigabitEthernet8/1/21' + phy: 'up' + protocol: 'up' + inuti: '0%' + oututi: '0%' + inerrors: '0' + outerrors: '0' +- interface: 'GigabitEthernet8/1/22' + phy: 'up' + protocol: 'up' + inuti: '0%' + oututi: '0%' + inerrors: '0' + outerrors: '0' +- interface: 'GigabitEthernet8/1/23' + phy: 'up' + protocol: 'up' + inuti: '0.01%' + oututi: '0.01%' + inerrors: '0' + outerrors: '0' +- interface: 'Eth-Trunk4' + phy: 'up' + protocol: 'down' + inuti: '0.69%' + oututi: '13.57%' + inerrors: '4625' + outerrors: '0' +- interface: 'GigabitEthernet15/1/0(10G)' + phy: 'up' + protocol: 'up' + inuti: '0.69%' + oututi: '14.30%' + inerrors: '0' + outerrors: '0' +- interface: 'GigabitEthernet16/0/1(10G)' + phy: 'up' + protocol: 'up' + inuti: '0.71%' + oututi: '12.84%' + inerrors: '4625' + outerrors: '0' +- interface: 'Eth-Trunk4.10' + phy: 'up' + protocol: 'up' + inuti: '0.69%' + oututi: '13.57%' + inerrors: '0' + outerrors: '0' +- interface: 'Eth-Trunk5' + phy: 'up' + protocol: 'down' + inuti: '0.01%' + oututi: '0%' + inerrors: '0' + outerrors: '0' +- interface: 'GigabitEthernet4/0/4(10G)' + phy: 'up' + protocol: 'up' + inuti: '0.01%' + oututi: '0%' + inerrors: '0' + outerrors: '0' +- interface: 'Eth-Trunk5.100' + phy: 'up' + protocol: 'up' + inuti: '0%' + oututi: '0%' + inerrors: '0' + outerrors: '0' From 22d3c337e798a4ad91abc042b86a915dd9104436 Mon Sep 17 00:00:00 2001 From: aranguito <49682885+aranguito@users.noreply.github.com> Date: Tue, 23 Apr 2019 10:43:00 -0500 Subject: [PATCH 09/21] Update huawei_display_interface_brief.parsed --- .../huawei_display_interface_brief.parsed | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Huawei/display_interface_brief/huawei_display_interface_brief.parsed b/tests/Huawei/display_interface_brief/huawei_display_interface_brief.parsed index b6673f2b89..94e6fb40b4 100644 --- a/tests/Huawei/display_interface_brief/huawei_display_interface_brief.parsed +++ b/tests/Huawei/display_interface_brief/huawei_display_interface_brief.parsed @@ -11,7 +11,7 @@ parsed_sample: - interface: 'Eth-Trunk2' phy: 'up' protocol: 'up' - inuti: '0% + inuti: '0%' oututi: '0.38%' inerrors: '0' outerrors: '0' From a8250dea106ef556b8f7546b8c00781ea76723ce Mon Sep 17 00:00:00 2001 From: aranguito <49682885+aranguito@users.noreply.github.com> Date: Tue, 23 Apr 2019 11:25:13 -0500 Subject: [PATCH 10/21] Update huawei_display_interface_brief.raw From c10bffa7e1a0422a701350e734a5f30b6e42c9dc Mon Sep 17 00:00:00 2001 From: aranguito <49682885+aranguito@users.noreply.github.com> Date: Tue, 23 Apr 2019 11:25:26 -0500 Subject: [PATCH 11/21] Update huawei_display_interface_brief.raw From 0e138783e52969e1179afa4060135f96ac752901 Mon Sep 17 00:00:00 2001 From: aranguito <49682885+aranguito@users.noreply.github.com> Date: Tue, 23 Apr 2019 11:26:14 -0500 Subject: [PATCH 12/21] Update huawei_display_interface_brief.raw From 50bb8a46015b67593478116b29048dca7232f60d Mon Sep 17 00:00:00 2001 From: jmcgill298 Date: Wed, 24 Apr 2019 10:20:00 -0400 Subject: [PATCH 13/21] Update huawei to follow standard naming --- ...ief.template => huawei_vrp_display_interface_brief.template} | 0 templates/index | 2 +- .../huawei_vrp_display_interface_brief.parsed} | 0 .../huawei_vrp_display_interface_brief.raw} | 0 tests/test_index_order.py | 2 +- 5 files changed, 2 insertions(+), 2 deletions(-) rename templates/{huawei_display_interface_brief.template => huawei_vrp_display_interface_brief.template} (100%) rename tests/{Huawei/display_interface_brief/huawei_display_interface_brief.parsed => huawei_vrp/display_interface_brief/huawei_vrp_display_interface_brief.parsed} (100%) rename tests/{Huawei/display_interface_brief/huawei_display_interface_brief.raw => huawei_vrp/display_interface_brief/huawei_vrp_display_interface_brief.raw} (100%) diff --git a/templates/huawei_display_interface_brief.template b/templates/huawei_vrp_display_interface_brief.template similarity index 100% rename from templates/huawei_display_interface_brief.template rename to templates/huawei_vrp_display_interface_brief.template diff --git a/templates/index b/templates/index index fdd1f8e53e..acae67e1b4 100644 --- a/templates/index +++ b/templates/index @@ -286,7 +286,7 @@ hp_procurve_show_system.template, .*, hp_procurve, sh[[ow]] syst[[em]] hp_procurve_show_vlans.template, .*, hp_procurve, sh[[ow]] vl[[ans]] hp_procurve_show_arp.template, .*, hp_procurve, sh[[ow]] ar[[p]] -huawei_display_interface_brief.template. .*,vrp, disp[[lay]] inter[[face]] br[[ief]] +huawei_vrp_display_interface_brief.template, .*, huawei_vrp, disp[[lay]] inter[[face]] br[[ief]] juniper_junos_show_chassis_cluster_interfaces.template, .*, juniper_junos, sh[[ow]] ch[[assis]] c[[luster]] i[[nterface]] juniper_junos_show_chassis_cluster_status.template, .*, juniper_junos, sh[[ow]] ch[[assis]] c[[luster]] s[[tatus]] diff --git a/tests/Huawei/display_interface_brief/huawei_display_interface_brief.parsed b/tests/huawei_vrp/display_interface_brief/huawei_vrp_display_interface_brief.parsed similarity index 100% rename from tests/Huawei/display_interface_brief/huawei_display_interface_brief.parsed rename to tests/huawei_vrp/display_interface_brief/huawei_vrp_display_interface_brief.parsed diff --git a/tests/Huawei/display_interface_brief/huawei_display_interface_brief.raw b/tests/huawei_vrp/display_interface_brief/huawei_vrp_display_interface_brief.raw similarity index 100% rename from tests/Huawei/display_interface_brief/huawei_display_interface_brief.raw rename to tests/huawei_vrp/display_interface_brief/huawei_vrp_display_interface_brief.raw diff --git a/tests/test_index_order.py b/tests/test_index_order.py index 92b83b6425..672919516c 100644 --- a/tests/test_index_order.py +++ b/tests/test_index_order.py @@ -65,7 +65,7 @@ def test_index_ordering(): 'brocade_fastiron', 'brocade_netiron', 'brocade_nos', 'brocade_vdx', 'brocade_vyos', 'checkpoint_gaia', 'cisco_asa', 'cisco_ios', 'cisco_nxos', 'cisco_s300', 'cisco_wlc', 'cisco_xe', 'cisco_xr', 'dell_force10', 'enterasys', 'extreme', 'f5_ltm', 'fortinet', - 'hp_comware', 'hp_procurve', 'huawei', 'juniper', 'juniper_junos', 'juniper_screenos', + 'hp_comware', 'hp_procurve', 'huawei_vrp', 'juniper', 'juniper_junos', 'juniper_screenos', 'alcatel_sros', 'linux', 'ovs_linux', 'paloalto_panos', 'quanta_mesh', 'ubiquiti_edgeswitch', 'vmware_nsxv', 'vyatta_vyos', 'vyos' ] From aa20c012666efdd61b966cbd0880d0d0c772bac2 Mon Sep 17 00:00:00 2001 From: aranguito <49682885+aranguito@users.noreply.github.com> Date: Thu, 25 Apr 2019 16:02:20 -0500 Subject: [PATCH 14/21] Create huawei_vrf_display_temperature.raw --- .../huawei_vrf_display_temperature.raw | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 tests/huawei_vrp/display_temperature/huawei_vrf_display_temperature.raw diff --git a/tests/huawei_vrp/display_temperature/huawei_vrf_display_temperature.raw b/tests/huawei_vrp/display_temperature/huawei_vrf_display_temperature.raw new file mode 100644 index 0000000000..9bce0c1f29 --- /dev/null +++ b/tests/huawei_vrp/display_temperature/huawei_vrf_display_temperature.raw @@ -0,0 +1,28 @@ +SlotID2 : + Base-Board, Unit:C, Slot2 +PCB I2C Addr Chl Status Minor Major Fatal Adj_speed Temp + TMin Tmax (C) +--------------------------------------------------------------- +LPUF41A 0 0 0 NORMAL 68 76 83 55 65 38 +LPUF41A 0 1 0 NORMAL 63 71 78 50 60 36 +LPUF41A 0 2 0 NORMAL 69 77 85 56 66 28 +LPUF41A 7 175 0 NORMAL 89 94 105 76 86 55 +LPUF41A 7 175 1 NORMAL 89 94 105 76 86 37 +LPUF41A 7 175 2 NORMAL 89 94 105 76 86 41 +EFGF 2 73 0 NORMAL 77 83 92 64 74 30 +EFGF 3 73 0 NORMAL 77 83 92 64 74 36 + +SlotID25 : + +SlotID26 : + +SlotID27 : + Base-Board, Unit:C, SlotID27 +PCB I2C Addr Chl Status Minor Major Fatal Adj_speed Temp + TMin Tmax (C) +----------------------------------------------------------------- +FAN 1 0 0 NORMAL 70 80 95 32 45 25 + + + +SlotID31 : No temp sensors. From dff6c269675c43782917a15e4d6af31e996fa20b Mon Sep 17 00:00:00 2001 From: aranguito <49682885+aranguito@users.noreply.github.com> Date: Thu, 25 Apr 2019 16:11:39 -0500 Subject: [PATCH 15/21] Create huawei_vrp_display_temperature.parsed --- .../huawei_vrp_display_temperature.parsed | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 tests/huawei_vrp/display_temperature/huawei_vrp_display_temperature.parsed diff --git a/tests/huawei_vrp/display_temperature/huawei_vrp_display_temperature.parsed b/tests/huawei_vrp/display_temperature/huawei_vrp_display_temperature.parsed new file mode 100644 index 0000000000..7a33495a75 --- /dev/null +++ b/tests/huawei_vrp/display_temperature/huawei_vrp_display_temperature.parsed @@ -0,0 +1,47 @@ +--- +parsed_sample: + +- slotid: "SlotID2" + pcb: "LPUF41A" + status: "NORMAL" + temperature: "38" + +- slotid: "SlotID2" + pcb: "LPUF41A" + status: "NORMAL" + temperature: "36" + +- slotid: "SlotID2" + pcb: "LPUF41A" + status: "NORMAL" + temperature: "28" + +- slotid: "SlotID2" + pcb: "LPUF41A" + status: "NORMAL" + temperature: "55" + +- slotid: "SlotID2" + pcb: "LPUF41A" + status: "NORMAL" + temperature: "37" + +- slotid: "SlotID2" + pcb: "LPUF41A" + status: "NORMAL" + temperature: "41" + +- slotid: "SlotID2" + pcb: "EFGF" + status: "NORMAL" + temperature: "30" + +- slotid: "SlotID2" + pcb: "EFGF" + status: "NORMAL" + temperature: "36" + +- slotid: "SlotID27" + pcb: "FAN" + status: "NORMAL" + temperature: "25" From 258b221b95e448e0f0b3f4d0fcda5907d7a19b3e Mon Sep 17 00:00:00 2001 From: aranguito <49682885+aranguito@users.noreply.github.com> Date: Thu, 25 Apr 2019 16:11:55 -0500 Subject: [PATCH 16/21] Rename huawei_vrf_display_temperature.raw to huawei_vrp_display_temperature.raw --- ...display_temperature.raw => huawei_vrp_display_temperature.raw} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/huawei_vrp/display_temperature/{huawei_vrf_display_temperature.raw => huawei_vrp_display_temperature.raw} (100%) diff --git a/tests/huawei_vrp/display_temperature/huawei_vrf_display_temperature.raw b/tests/huawei_vrp/display_temperature/huawei_vrp_display_temperature.raw similarity index 100% rename from tests/huawei_vrp/display_temperature/huawei_vrf_display_temperature.raw rename to tests/huawei_vrp/display_temperature/huawei_vrp_display_temperature.raw From 8f7fb7755659955943802e9551eec598f011b88c Mon Sep 17 00:00:00 2001 From: aranguito <49682885+aranguito@users.noreply.github.com> Date: Thu, 25 Apr 2019 16:13:28 -0500 Subject: [PATCH 17/21] Create huawei_vrp_display_temperature.template --- templates/huawei_vrp_display_temperature.template | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 templates/huawei_vrp_display_temperature.template diff --git a/templates/huawei_vrp_display_temperature.template b/templates/huawei_vrp_display_temperature.template new file mode 100644 index 0000000000..7fdee8bbd7 --- /dev/null +++ b/templates/huawei_vrp_display_temperature.template @@ -0,0 +1,8 @@ +Value Filldown SLOTID (\S+) +Value Required PCB (\w+) +Value Required STATUS (\w+) +Value TEMPERATURE (\d+) + +Start + ^${SLOTID}\s+\: + ^${PCB}\s+\d+\s+\d+\s+\d+\s+${STATUS}\s+\d+\s+\d+\s+\d+\s+\d+\s+\d+\s+${TEMPERATURE} -> Record From ba2a1ef0ceb0559697cb57f48eb1017629740d02 Mon Sep 17 00:00:00 2001 From: aranguito <49682885+aranguito@users.noreply.github.com> Date: Thu, 25 Apr 2019 16:15:09 -0500 Subject: [PATCH 18/21] Update index --- templates/index | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/index b/templates/index index acae67e1b4..287b862c7a 100644 --- a/templates/index +++ b/templates/index @@ -287,6 +287,7 @@ hp_procurve_show_vlans.template, .*, hp_procurve, sh[[ow]] vl[[ans]] hp_procurve_show_arp.template, .*, hp_procurve, sh[[ow]] ar[[p]] huawei_vrp_display_interface_brief.template, .*, huawei_vrp, disp[[lay]] inter[[face]] br[[ief]] +huawei_vrp_display_temperature.template, .*, huawei_vrp, disp[[lay]] tem[[perature]] juniper_junos_show_chassis_cluster_interfaces.template, .*, juniper_junos, sh[[ow]] ch[[assis]] c[[luster]] i[[nterface]] juniper_junos_show_chassis_cluster_status.template, .*, juniper_junos, sh[[ow]] ch[[assis]] c[[luster]] s[[tatus]] From 5da24878ac1054f2ef0436e757a313de651fe495 Mon Sep 17 00:00:00 2001 From: jmcgill298 Date: Tue, 24 Sep 2019 17:22:42 -0400 Subject: [PATCH 19/21] interface brief: ensure all lines are accounted for --- templates/huawei_vrp_display_interface_brief.template | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/templates/huawei_vrp_display_interface_brief.template b/templates/huawei_vrp_display_interface_brief.template index 121e14fb14..aa298fa834 100644 --- a/templates/huawei_vrp_display_interface_brief.template +++ b/templates/huawei_vrp_display_interface_brief.template @@ -7,6 +7,12 @@ Value INERRORS (\d+) Value OUTERRORS (\d+) - Start ^\s*${INTERFACE}\s+${PHY}\s+${PROTOCOL}\s+${INUTI}\s+${OUTUTI}\s+${INERRORS}\s+${OUTERRORS} -> Record + ^PHY:\s+Physical + ^(?:\*|\^)down: + ^\(\w+\):\s+\S+ + ^InUti/OutUti: + ^Interface\s+PHY\s+Protocol\s+InUti\s+OutUti\s+inErrors\s+outErrors\s*$$ + ^\s*$$ + ^. -> Error From 65f7df3749bfa0858564366ab5c769c2eac3c618 Mon Sep 17 00:00:00 2001 From: jmcgill298 Date: Tue, 24 Sep 2019 18:06:02 -0400 Subject: [PATCH 20/21] temperature: ensure all lines are accounted for --- templates/huawei_vrp_display_temperature.template | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/templates/huawei_vrp_display_temperature.template b/templates/huawei_vrp_display_temperature.template index 7fdee8bbd7..8d7b8ba56c 100644 --- a/templates/huawei_vrp_display_temperature.template +++ b/templates/huawei_vrp_display_temperature.template @@ -4,5 +4,11 @@ Value Required STATUS (\w+) Value TEMPERATURE (\d+) Start - ^${SLOTID}\s+\: + ^${SLOTID}\s+: ^${PCB}\s+\d+\s+\d+\s+\d+\s+${STATUS}\s+\d+\s+\d+\s+\d+\s+\d+\s+\d+\s+${TEMPERATURE} -> Record + ^\s*Base-Board, + ^PCB\s+I2C\s+Addr\s+Chl\s+Status\s+Minor\s+Major\s+Fatal\s+Adj_speed\s+Temp\s*$$ + ^\s+TMin\s+Tmax\s+\(\S+\)\s*$$ + ^-+ + ^\s*$$ + ^. -> Error From 9dd292cc9c33c24bc57ccb353335b7f2be1a320c Mon Sep 17 00:00:00 2001 From: Jacob McGill <9847006+jmcgill298@users.noreply.github.com> Date: Sun, 27 Oct 2019 19:21:43 -0400 Subject: [PATCH 21/21] remove duplicat OS from available os types --- tests/test_index_order.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_index_order.py b/tests/test_index_order.py index 27d27c5713..b3b3156b16 100644 --- a/tests/test_index_order.py +++ b/tests/test_index_order.py @@ -62,7 +62,7 @@ def test_index_ordering(): 'checkpoint_gaia', 'cisco_asa', 'cisco_ios', 'cisco_nxos', 'cisco_s300', 'cisco_wlc', 'cisco_xe', 'cisco_xr', 'dell_force10', 'enterasys', 'extreme', 'f5_ltm', 'fortinet', 'hp_comware', 'hp_procurve', 'huawei_vrp', 'juniper', 'juniper_junos', 'juniper_screenos', - 'alcatel_sros', 'linux', 'ovs_linux', 'paloalto_panos', 'quanta_mesh','ruckus_fastiron', + 'linux', 'ovs_linux', 'paloalto_panos', 'quanta_mesh','ruckus_fastiron', 'ubiquiti_edgeswitch', 'vmware_nsxv', 'vyatta_vyos', 'vyos', 'watchguard_firebox', ]