From 895bbf8c3cf25222b72d8884d4bb79de87a38165 Mon Sep 17 00:00:00 2001 From: Ivan Sinyagovskiy Date: Wed, 19 Dec 2018 12:13:13 +0300 Subject: [PATCH 1/2] XR SHOW CONTROLLERS FIA DROPS INGRESS: Add new template --- ...fabric_fia_drops_ingress_location.template | 63 ++++++++++ templates/index | 1 + ...s_fabric_fia_drops_ingress_location.parsed | 119 ++++++++++++++++++ ...lers_fabric_fia_drops_ingress_location.raw | 119 ++++++++++++++++++ 4 files changed, 302 insertions(+) create mode 100644 templates/cisco_xr_show_controllers_fabric_fia_drops_ingress_location.template create mode 100644 tests/cisco_xr/show_controllers_fabric_fia_drops_ingress_location/cisco_xr_show_controllers_fabric_fia_drops_ingress_location.parsed create mode 100644 tests/cisco_xr/show_controllers_fabric_fia_drops_ingress_location/cisco_xr_show_controllers_fabric_fia_drops_ingress_location.raw diff --git a/templates/cisco_xr_show_controllers_fabric_fia_drops_ingress_location.template b/templates/cisco_xr_show_controllers_fabric_fia_drops_ingress_location.template new file mode 100644 index 0000000000..83c3a8c69e --- /dev/null +++ b/templates/cisco_xr_show_controllers_fabric_fia_drops_ingress_location.template @@ -0,0 +1,63 @@ +Value FIA (\S+) +Value CATEGORY (\S+) +Value FROM_SPAUI_DROP_0 (\d+) +Value ACCPT_TBL_0 (\d+) +Value CTL_LEN_0 (\d+) +Value SHORT_PKT_0 (\d+) +Value MAX_PKT_LEN_0 (\d+) +Value MIN_PKT_LEN_0 (\d+) +Value FROM_SPAUI_DROP_1 (\d+) +Value ACCPT_TBL_1 (\d+) +Value CTL_LEN_1 (\d+) +Value SHORT_PKT_1 (\d+) +Value MAX_PKT_LEN_1 (\d+) +Value MIN_PKT_LEN_1 (\d+) +Value TAIL_DRP (\d+) +Value VQI_DRP (\d+) +Value HEADER_PARSING_DRP (\d+) +Value PW_TO_NI_DRP (\d+) +Value NI_FROM_PW_DRP (\d+) +Value SP0_CRC_ERR (\d+) +Value SP0_BAD_ALIGN (\d+) +Value SP0_BAD_CODE (\d+) +Value SP0_ALIGN_FAIL (\d+) +Value SP0_PROT_ERR (\d+) +Value SP1_CRC_ERR (\d+) +Value SP1_BAD_ALIGN (\d+) +Value SP1_BAD_CODE (\d+) +Value SP1_ALIGN_FAIL (\d+) +Value SP1_PROT_ERR (\d+) + +Start + ^ ?\*+ ${FIA} \*+ + ^Category: ${CATEGORY} + ^ +From Spaui Drop-0 +${FROM_SPAUI_DROP_0} + ^ +accpt tbl-0 +${ACCPT_TBL_0} + ^ +ctl len-0 +${CTL_LEN_0} + ^ +short pkt-0 +${SHORT_PKT_0} + ^ +max pkt len-0 +${MAX_PKT_LEN_0} + ^ +min pkt len-0 +${MIN_PKT_LEN_0} + ^ +From Spaui Drop-1 +${FROM_SPAUI_DROP_1} + ^ +accpt tbl-1 +${ACCPT_TBL_1} + ^ +ctl len-1 +${CTL_LEN_1} + ^ +short pkt-1 +${SHORT_PKT_1} + ^ +max pkt len-1 +${MAX_PKT_LEN_1} + ^ +min pkt len-1 +${MIN_PKT_LEN_1} + ^ + Tail drp +${TAIL_DRP} + ^ +Vqi drp +${VQI_DRP} + ^ +Header parsing drp +${HEADER_PARSING_DRP} + ^ +pw to ni drp +${PW_TO_NI_DRP} + ^ +ni from pw drp +${NI_FROM_PW_DRP} + ^ +sp0 crc err +${SP0_CRC_ERR} + ^ +sp0 bad align +${SP0_BAD_ALIGN} + ^ +sp0 bad code +${SP0_BAD_CODE} + ^ +sp0 align fail +${SP0_ALIGN_FAIL} + ^ +sp0 prot err +${SP0_PROT_ERR} + ^ +sp1 crc err +${SP1_CRC_ERR} + ^ +sp1 bad align +${SP1_BAD_ALIGN} + ^ +sp1 bad code +${SP1_BAD_CODE} + ^ +sp1 align fail +${SP1_ALIGN_FAIL} + ^ +sp1 prot err +${SP1_PROT_ERR} -> Record + ^\s+$$ + ^$$ + ^.* -> Error "LINE NOT FOUND" diff --git a/templates/index b/templates/index index 63fd9cd849..054a2a95b9 100644 --- a/templates/index +++ b/templates/index @@ -231,6 +231,7 @@ cisco_wlc_ssh_show_ap_config_general.template, .*, cisco_wlc_ssh, sh[[ow]] ap co cisco_wlc_ssh_show_ap_summary.template, .*, cisco_wlc_ssh, sh[[ow]] ap sum[[mary]] cisco_wlc_ssh_show_sysinfo.template, .*, cisco_wlc_ssh, sh[[ow]] sysi[[nfo]] +cisco_xr_show_controllers_fabric_fia_drops_ingress_location.template, .*, cisco_xr, sh[[ow]] contr[[ollers]] fabric fia drops ingress loc[[ation]].* cisco_xr_show_controllers_HundredGigabitEthernet.template, .*, cisco_xr, sh[[ow]] contr[[ollers]] Hu[[ndredGigabitEthernet]] cisco_xr_show_bgp_vrf_all_ipv4_unicast_summary.template, .*, cisco_xr, sh[[ow]] bg[[p]] v[[rf]] all ip[[v4]] uni[[cast]] summ[[ary]] cisco_xr_admin_show_controller_fabric_health.template, .*, cisco_xr, adm[[in]] sh[[ow]] controller fab[[ric]] hea[[lth]] diff --git a/tests/cisco_xr/show_controllers_fabric_fia_drops_ingress_location/cisco_xr_show_controllers_fabric_fia_drops_ingress_location.parsed b/tests/cisco_xr/show_controllers_fabric_fia_drops_ingress_location/cisco_xr_show_controllers_fabric_fia_drops_ingress_location.parsed new file mode 100644 index 0000000000..9d68f3d93e --- /dev/null +++ b/tests/cisco_xr/show_controllers_fabric_fia_drops_ingress_location/cisco_xr_show_controllers_fabric_fia_drops_ingress_location.parsed @@ -0,0 +1,119 @@ +--- +parsed_sample: + +- accpt_tbl_0: '22' + accpt_tbl_1: '88' + category: in_drop-0 + ctl_len_0: '33' + ctl_len_1: '99' + fia: FIA-0 + from_spaui_drop_0: '11' + from_spaui_drop_1: '77' + header_parsing_drp: '2' + max_pkt_len_0: '55' + max_pkt_len_1: '12' + min_pkt_len_0: '66' + min_pkt_len_1: '13' + ni_from_pw_drp: '4' + pw_to_ni_drp: '3' + short_pkt_0: '44' + short_pkt_1: '0' + sp0_align_fail: '3' + sp0_bad_align: '5' + sp0_bad_code: '1' + sp0_crc_err: '12' + sp0_prot_err: '1' + sp1_align_fail: '3' + sp1_bad_align: '0' + sp1_bad_code: '0' + sp1_crc_err: '1' + sp1_prot_err: '0' + tail_drp: '4' + vqi_drp: '1' +- accpt_tbl_0: '0' + accpt_tbl_1: '0' + category: in_drop-1 + ctl_len_0: '0' + ctl_len_1: '0' + fia: FIA-1 + from_spaui_drop_0: '0' + from_spaui_drop_1: '0' + header_parsing_drp: '0' + max_pkt_len_0: '0' + max_pkt_len_1: '0' + min_pkt_len_0: '0' + min_pkt_len_1: '0' + ni_from_pw_drp: '0' + pw_to_ni_drp: '0' + short_pkt_0: '0' + short_pkt_1: '0' + sp0_align_fail: '3' + sp0_bad_align: '0' + sp0_bad_code: '5' + sp0_crc_err: '8' + sp0_prot_err: '1' + sp1_align_fail: '3' + sp1_bad_align: '0' + sp1_bad_code: '8' + sp1_crc_err: '12' + sp1_prot_err: '0' + tail_drp: '0' + vqi_drp: '0' +- accpt_tbl_0: '0' + accpt_tbl_1: '0' + category: in_drop-2 + ctl_len_0: '0' + ctl_len_1: '0' + fia: FIA-2 + from_spaui_drop_0: '0' + from_spaui_drop_1: '0' + header_parsing_drp: '0' + max_pkt_len_0: '0' + max_pkt_len_1: '0' + min_pkt_len_0: '0' + min_pkt_len_1: '0' + ni_from_pw_drp: '0' + pw_to_ni_drp: '0' + short_pkt_0: '0' + short_pkt_1: '0' + sp0_align_fail: '3' + sp0_bad_align: '0' + sp0_bad_code: '6' + sp0_crc_err: '12' + sp0_prot_err: '1' + sp1_align_fail: '3' + sp1_bad_align: '0' + sp1_bad_code: '0' + sp1_crc_err: '1' + sp1_prot_err: '0' + tail_drp: '0' + vqi_drp: '0' +- accpt_tbl_0: '0' + accpt_tbl_1: '0' + category: in_drop-3 + ctl_len_0: '0' + ctl_len_1: '0' + fia: FIA-3 + from_spaui_drop_0: '0' + from_spaui_drop_1: '0' + header_parsing_drp: '0' + max_pkt_len_0: '0' + max_pkt_len_1: '0' + min_pkt_len_0: '0' + min_pkt_len_1: '0' + ni_from_pw_drp: '0' + pw_to_ni_drp: '0' + short_pkt_0: '0' + short_pkt_1: '0' + sp0_align_fail: '3' + sp0_bad_align: '0' + sp0_bad_code: '0' + sp0_crc_err: '2' + sp0_prot_err: '0' + sp1_align_fail: '3' + sp1_bad_align: '0' + sp1_bad_code: '0' + sp1_crc_err: '3' + sp1_prot_err: '0' + tail_drp: '0' + vqi_drp: '0' diff --git a/tests/cisco_xr/show_controllers_fabric_fia_drops_ingress_location/cisco_xr_show_controllers_fabric_fia_drops_ingress_location.raw b/tests/cisco_xr/show_controllers_fabric_fia_drops_ingress_location/cisco_xr_show_controllers_fabric_fia_drops_ingress_location.raw new file mode 100644 index 0000000000..377467053e --- /dev/null +++ b/tests/cisco_xr/show_controllers_fabric_fia_drops_ingress_location/cisco_xr_show_controllers_fabric_fia_drops_ingress_location.raw @@ -0,0 +1,119 @@ +********** FIA-0 ********** +Category: in_drop-0 + From Spaui Drop-0 11 + accpt tbl-0 22 + ctl len-0 33 + short pkt-0 44 + max pkt len-0 55 + min pkt len-0 66 + From Spaui Drop-1 77 + accpt tbl-1 88 + ctl len-1 99 + short pkt-1 0 + max pkt len-1 12 + min pkt len-1 13 + Tail drp 4 + Vqi drp 1 + Header parsing drp 2 + pw to ni drp 3 + ni from pw drp 4 + sp0 crc err 12 + sp0 bad align 5 + sp0 bad code 1 + sp0 align fail 3 + sp0 prot err 1 + sp1 crc err 1 + sp1 bad align 0 + sp1 bad code 0 + sp1 align fail 3 + sp1 prot err 0 + + ********** FIA-1 ********** +Category: in_drop-1 + From Spaui Drop-0 0 + accpt tbl-0 0 + ctl len-0 0 + short pkt-0 0 + max pkt len-0 0 + min pkt len-0 0 + From Spaui Drop-1 0 + accpt tbl-1 0 + ctl len-1 0 + short pkt-1 0 + max pkt len-1 0 + min pkt len-1 0 + Tail drp 0 + Vqi drp 0 + Header parsing drp 0 + pw to ni drp 0 + ni from pw drp 0 + sp0 crc err 8 + sp0 bad align 0 + sp0 bad code 5 + sp0 align fail 3 + sp0 prot err 1 + sp1 crc err 12 + sp1 bad align 0 + sp1 bad code 8 + sp1 align fail 3 + sp1 prot err 0 + + ********** FIA-2 ********** +Category: in_drop-2 + From Spaui Drop-0 0 + accpt tbl-0 0 + ctl len-0 0 + short pkt-0 0 + max pkt len-0 0 + min pkt len-0 0 + From Spaui Drop-1 0 + accpt tbl-1 0 + ctl len-1 0 + short pkt-1 0 + max pkt len-1 0 + min pkt len-1 0 + Tail drp 0 + Vqi drp 0 + Header parsing drp 0 + pw to ni drp 0 + ni from pw drp 0 + sp0 crc err 12 + sp0 bad align 0 + sp0 bad code 6 + sp0 align fail 3 + sp0 prot err 1 + sp1 crc err 1 + sp1 bad align 0 + sp1 bad code 0 + sp1 align fail 3 + sp1 prot err 0 + + ********** FIA-3 ********** +Category: in_drop-3 + From Spaui Drop-0 0 + accpt tbl-0 0 + ctl len-0 0 + short pkt-0 0 + max pkt len-0 0 + min pkt len-0 0 + From Spaui Drop-1 0 + accpt tbl-1 0 + ctl len-1 0 + short pkt-1 0 + max pkt len-1 0 + min pkt len-1 0 + Tail drp 0 + Vqi drp 0 + Header parsing drp 0 + pw to ni drp 0 + ni from pw drp 0 + sp0 crc err 2 + sp0 bad align 0 + sp0 bad code 0 + sp0 align fail 3 + sp0 prot err 0 + sp1 crc err 3 + sp1 bad align 0 + sp1 bad code 0 + sp1 align fail 3 + sp1 prot err 0 \ No newline at end of file From 1130222dcc04611f92d8ab16e35c3ed56619f8ba Mon Sep 17 00:00:00 2001 From: jmcgill298 Date: Sun, 27 Jan 2019 00:25:29 -0500 Subject: [PATCH 2/2] XR SHOW CONTROLLERS FABRIC FIA DROPS INGRESS: Add new template GENERAL UPDATES: - Change whitespace matching to user `\s+` - Change `Record` to happen on FIA location --- ...fabric_fia_drops_ingress_location.template | 62 +++++++++---------- ...lers_fabric_fia_drops_ingress_location.raw | 2 +- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/templates/cisco_xr_show_controllers_fabric_fia_drops_ingress_location.template b/templates/cisco_xr_show_controllers_fabric_fia_drops_ingress_location.template index 83c3a8c69e..07423a54b5 100644 --- a/templates/cisco_xr_show_controllers_fabric_fia_drops_ingress_location.template +++ b/templates/cisco_xr_show_controllers_fabric_fia_drops_ingress_location.template @@ -29,35 +29,35 @@ Value SP1_ALIGN_FAIL (\d+) Value SP1_PROT_ERR (\d+) Start - ^ ?\*+ ${FIA} \*+ - ^Category: ${CATEGORY} - ^ +From Spaui Drop-0 +${FROM_SPAUI_DROP_0} - ^ +accpt tbl-0 +${ACCPT_TBL_0} - ^ +ctl len-0 +${CTL_LEN_0} - ^ +short pkt-0 +${SHORT_PKT_0} - ^ +max pkt len-0 +${MAX_PKT_LEN_0} - ^ +min pkt len-0 +${MIN_PKT_LEN_0} - ^ +From Spaui Drop-1 +${FROM_SPAUI_DROP_1} - ^ +accpt tbl-1 +${ACCPT_TBL_1} - ^ +ctl len-1 +${CTL_LEN_1} - ^ +short pkt-1 +${SHORT_PKT_1} - ^ +max pkt len-1 +${MAX_PKT_LEN_1} - ^ +min pkt len-1 +${MIN_PKT_LEN_1} - ^ + Tail drp +${TAIL_DRP} - ^ +Vqi drp +${VQI_DRP} - ^ +Header parsing drp +${HEADER_PARSING_DRP} - ^ +pw to ni drp +${PW_TO_NI_DRP} - ^ +ni from pw drp +${NI_FROM_PW_DRP} - ^ +sp0 crc err +${SP0_CRC_ERR} - ^ +sp0 bad align +${SP0_BAD_ALIGN} - ^ +sp0 bad code +${SP0_BAD_CODE} - ^ +sp0 align fail +${SP0_ALIGN_FAIL} - ^ +sp0 prot err +${SP0_PROT_ERR} - ^ +sp1 crc err +${SP1_CRC_ERR} - ^ +sp1 bad align +${SP1_BAD_ALIGN} - ^ +sp1 bad code +${SP1_BAD_CODE} - ^ +sp1 align fail +${SP1_ALIGN_FAIL} - ^ +sp1 prot err +${SP1_PROT_ERR} -> Record - ^\s+$$ - ^$$ + ^\s*\*+\s+\S+ -> Continue.Record + ^\s*\*+\s+${FIA}\s+\*+ + ^Category:\s+${CATEGORY} + ^\s+From\s+Spaui\s+Drop-0\s+${FROM_SPAUI_DROP_0} + ^\s+accpt\s+tbl-0\s+${ACCPT_TBL_0} + ^\s+ctl\s+len-0\s+${CTL_LEN_0} + ^\s+short\s+pkt-0\s+${SHORT_PKT_0} + ^\s+max\s+pkt\s+len-0\s+${MAX_PKT_LEN_0} + ^\s+min\s+pkt\s+len-0\s+${MIN_PKT_LEN_0} + ^\s+From\s+Spaui\s+Drop-1\s+${FROM_SPAUI_DROP_1} + ^\s+accpt\s+tbl-1\s+${ACCPT_TBL_1} + ^\s+ctl\s+len-1\s+${CTL_LEN_1} + ^\s+short\s+pkt-1\s+${SHORT_PKT_1} + ^\s+max\s+pkt\s+len-1\s+${MAX_PKT_LEN_1} + ^\s+min\s+pkt\s+len-1\s+${MIN_PKT_LEN_1} + ^\s+Tail\s+drp\s+${TAIL_DRP} + ^\s+Vqi\s+drp\s+${VQI_DRP} + ^\s+Header\s+parsing drp\s+${HEADER_PARSING_DRP} + ^\s+pw\s+to\s+ni\s+drp\s+${PW_TO_NI_DRP} + ^\s+ni\s+from\s+pw\s+drp\s+${NI_FROM_PW_DRP} + ^\s+sp0\s+crc\s+err\s+${SP0_CRC_ERR} + ^\s+sp0\s+bad\s+align\s+${SP0_BAD_ALIGN} + ^\s+sp0\s+bad\s+code\s+${SP0_BAD_CODE} + ^\s+sp0\s+align\s+fail\s+${SP0_ALIGN_FAIL} + ^\s+sp0\s+prot\s+err\s+${SP0_PROT_ERR} + ^\s+sp1\s+crc\s+err\s+${SP1_CRC_ERR} + ^\s+sp1\s+bad\s+align\s+${SP1_BAD_ALIGN} + ^\s+sp1\s+bad\s+code\s+${SP1_BAD_CODE} + ^\s+sp1\s+align\s+fail\s+${SP1_ALIGN_FAIL} + ^\s+sp1\s+prot\s+err\s+${SP1_PROT_ERR} + ^\s*$$ ^.* -> Error "LINE NOT FOUND" diff --git a/tests/cisco_xr/show_controllers_fabric_fia_drops_ingress_location/cisco_xr_show_controllers_fabric_fia_drops_ingress_location.raw b/tests/cisco_xr/show_controllers_fabric_fia_drops_ingress_location/cisco_xr_show_controllers_fabric_fia_drops_ingress_location.raw index 377467053e..29067799a7 100644 --- a/tests/cisco_xr/show_controllers_fabric_fia_drops_ingress_location/cisco_xr_show_controllers_fabric_fia_drops_ingress_location.raw +++ b/tests/cisco_xr/show_controllers_fabric_fia_drops_ingress_location/cisco_xr_show_controllers_fabric_fia_drops_ingress_location.raw @@ -116,4 +116,4 @@ Category: in_drop-3 sp1 bad align 0 sp1 bad code 0 sp1 align fail 3 - sp1 prot err 0 \ No newline at end of file + sp1 prot err 0