From f56886c8e9922405bcc0037006ff3ac8631d2d13 Mon Sep 17 00:00:00 2001 From: pskliarenko <“pskliarenko@bsh.ru”> Date: Mon, 11 Sep 2023 12:40:33 +0400 Subject: [PATCH 1/3] Template + test --- ...o_s300_show_interfaces_description.textfsm | 21 ++++++ ntc_templates/templates/index | 1 + ...cisco_s300_show_interfaces_description.raw | 41 ++++++++++ ...cisco_s300_show_interfaces_description.yml | 74 +++++++++++++++++++ 4 files changed, 137 insertions(+) create mode 100644 ntc_templates/templates/cisco_s300_show_interfaces_description.textfsm create mode 100644 tests/cisco_s300/show_interfaces_description/cisco_s300_show_interfaces_description.raw create mode 100644 tests/cisco_s300/show_interfaces_description/cisco_s300_show_interfaces_description.yml diff --git a/ntc_templates/templates/cisco_s300_show_interfaces_description.textfsm b/ntc_templates/templates/cisco_s300_show_interfaces_description.textfsm new file mode 100644 index 0000000000..8913b346e5 --- /dev/null +++ b/ntc_templates/templates/cisco_s300_show_interfaces_description.textfsm @@ -0,0 +1,21 @@ +Value PORT (\S+) +Value DESCRIPTION (\S.*?) + +Start + ^\s*Port\s+Description\s*$$ -> Column1 + ^\s*Ch\s+Description\s*$$ -> Column2 + ^\s*$$ + ^. -> Error + +Column1 + ^(\s*-*)*\s*$$ + ^\s*Ch\s+Description\s*$$ -> Column2 + ^\s*${PORT}(\s+${DESCRIPTION})?\s*$$ -> Record + ^\s*$$ + ^. -> Error + +Column2 + ^(\s*-*)*\s*$$ + ^\s*${PORT}(\s+${DESCRIPTION})?\s*$$ -> Record + ^\s*$$ + ^. -> Error diff --git a/ntc_templates/templates/index b/ntc_templates/templates/index index 3a5b516184..d8964b68df 100644 --- a/ntc_templates/templates/index +++ b/ntc_templates/templates/index @@ -376,6 +376,7 @@ cisco_nxos_show_vdc.textfsm, .*, cisco_nxos, sh[[ow]] vdc cisco_nxos_show_vpc.textfsm, .*, cisco_nxos, sh[[ow]] vpc cisco_nxos_show_vrf.textfsm, .*, cisco_nxos, sh[[ow]] vrf +cisco_s300_show_interfaces_description.textfsm, .*, cisco_s300, sh[[ow]] int[[erfaces]] description cisco_s300_show_interfaces_status.textfsm, .*, cisco_s300, sh[[ow]] int[[erfaces]] st[[atus]] cisco_s300_show_mac_address-table.textfsm, .*, cisco_s300, sh[[ow]] mac address-[[table]] cisco_s300_show_lldp_neighbors.textfsm, .*, cisco_s300, sh[[ow]] lld[[p]] neig[[hbors]] diff --git a/tests/cisco_s300/show_interfaces_description/cisco_s300_show_interfaces_description.raw b/tests/cisco_s300/show_interfaces_description/cisco_s300_show_interfaces_description.raw new file mode 100644 index 0000000000..c6f62874da --- /dev/null +++ b/tests/cisco_s300/show_interfaces_description/cisco_s300_show_interfaces_description.raw @@ -0,0 +1,41 @@ +Port Description +------- ----------- +fa1 Test +fa2 Printer +fa3 Socket_7/7 +fa4 Socket_7/3 +fa5 +fa6 +fa7 +fa8 Camera +fa9 Camera +fa10 Camera +fa11 +fa12 Socket_7/2 +fa13 Socket_7/4 +fa14 Socket_7/8 +fa15 +fa16 +fa17 +fa18 +fa19 +fa20 +fa21 +fa22 +fa23 AP +fa24 AP +gi1 +gi2 +gi3 +gi4 Eltex2124-8 - gi1/0/5 + +Ch Description +------- ----------- +Po1 +Po2 +Po3 +Po4 +Po5 +Po6 +Po7 +Po8 diff --git a/tests/cisco_s300/show_interfaces_description/cisco_s300_show_interfaces_description.yml b/tests/cisco_s300/show_interfaces_description/cisco_s300_show_interfaces_description.yml new file mode 100644 index 0000000000..294807380c --- /dev/null +++ b/tests/cisco_s300/show_interfaces_description/cisco_s300_show_interfaces_description.yml @@ -0,0 +1,74 @@ +--- +parsed_sample: + - description: "Test" + port: "fa1" + - description: "Printer" + port: "fa2" + - description: "Socket_7/7" + port: "fa3" + - description: "Socket_7/3" + port: "fa4" + - description: "" + port: "fa5" + - description: "" + port: "fa6" + - description: "" + port: "fa7" + - description: "Camera" + port: "fa8" + - description: "Camera" + port: "fa9" + - description: "Camera" + port: "fa10" + - description: "" + port: "fa11" + - description: "Socket_7/2" + port: "fa12" + - description: "Socket_7/4" + port: "fa13" + - description: "Socket_7/8" + port: "fa14" + - description: "" + port: "fa15" + - description: "" + port: "fa16" + - description: "" + port: "fa17" + - description: "" + port: "fa18" + - description: "" + port: "fa19" + - description: "" + port: "fa20" + - description: "" + port: "fa21" + - description: "" + port: "fa22" + - description: "AP" + port: "fa23" + - description: "AP" + port: "fa24" + - description: "" + port: "gi1" + - description: "" + port: "gi2" + - description: "" + port: "gi3" + - description: "Eltex2124-8 - gi1/0/5" + port: "gi4" + - description: "" + port: "Po1" + - description: "" + port: "Po2" + - description: "" + port: "Po3" + - description: "" + port: "Po4" + - description: "" + port: "Po5" + - description: "" + port: "Po6" + - description: "" + port: "Po7" + - description: "" + port: "Po8" From f50f3a3d34fd2bd1c672aeeeacbc2435fb1c3fa6 Mon Sep 17 00:00:00 2001 From: PavloSkliarenko <78343937+PavloSkliarenko@users.noreply.github.com> Date: Mon, 6 Nov 2023 19:08:36 +0400 Subject: [PATCH 2/3] Update ntc_templates/templates/cisco_s300_show_interfaces_description.textfsm Co-authored-by: Josh VanDeraa --- .../templates/cisco_s300_show_interfaces_description.textfsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntc_templates/templates/cisco_s300_show_interfaces_description.textfsm b/ntc_templates/templates/cisco_s300_show_interfaces_description.textfsm index 8913b346e5..ff61442125 100644 --- a/ntc_templates/templates/cisco_s300_show_interfaces_description.textfsm +++ b/ntc_templates/templates/cisco_s300_show_interfaces_description.textfsm @@ -1,4 +1,4 @@ -Value PORT (\S+) +Value INTERFACE (\S+) Value DESCRIPTION (\S.*?) Start From 3aaf2f5b77eeec1bbb8d22a7e3967118f03af384 Mon Sep 17 00:00:00 2001 From: pskliarenko <“pskliarenko@bsh.ru”> Date: Mon, 6 Nov 2023 19:11:07 +0400 Subject: [PATCH 3/3] Fix value names --- ...o_s300_show_interfaces_description.textfsm | 4 +- ...cisco_s300_show_interfaces_description.yml | 72 +++++++++---------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/ntc_templates/templates/cisco_s300_show_interfaces_description.textfsm b/ntc_templates/templates/cisco_s300_show_interfaces_description.textfsm index ff61442125..b407a0e09e 100644 --- a/ntc_templates/templates/cisco_s300_show_interfaces_description.textfsm +++ b/ntc_templates/templates/cisco_s300_show_interfaces_description.textfsm @@ -10,12 +10,12 @@ Start Column1 ^(\s*-*)*\s*$$ ^\s*Ch\s+Description\s*$$ -> Column2 - ^\s*${PORT}(\s+${DESCRIPTION})?\s*$$ -> Record + ^\s*${INTERFACE}(\s+${DESCRIPTION})?\s*$$ -> Record ^\s*$$ ^. -> Error Column2 ^(\s*-*)*\s*$$ - ^\s*${PORT}(\s+${DESCRIPTION})?\s*$$ -> Record + ^\s*${INTERFACE}(\s+${DESCRIPTION})?\s*$$ -> Record ^\s*$$ ^. -> Error diff --git a/tests/cisco_s300/show_interfaces_description/cisco_s300_show_interfaces_description.yml b/tests/cisco_s300/show_interfaces_description/cisco_s300_show_interfaces_description.yml index 294807380c..55075729ef 100644 --- a/tests/cisco_s300/show_interfaces_description/cisco_s300_show_interfaces_description.yml +++ b/tests/cisco_s300/show_interfaces_description/cisco_s300_show_interfaces_description.yml @@ -1,74 +1,74 @@ --- parsed_sample: - description: "Test" - port: "fa1" + interface: "fa1" - description: "Printer" - port: "fa2" + interface: "fa2" - description: "Socket_7/7" - port: "fa3" + interface: "fa3" - description: "Socket_7/3" - port: "fa4" + interface: "fa4" - description: "" - port: "fa5" + interface: "fa5" - description: "" - port: "fa6" + interface: "fa6" - description: "" - port: "fa7" + interface: "fa7" - description: "Camera" - port: "fa8" + interface: "fa8" - description: "Camera" - port: "fa9" + interface: "fa9" - description: "Camera" - port: "fa10" + interface: "fa10" - description: "" - port: "fa11" + interface: "fa11" - description: "Socket_7/2" - port: "fa12" + interface: "fa12" - description: "Socket_7/4" - port: "fa13" + interface: "fa13" - description: "Socket_7/8" - port: "fa14" + interface: "fa14" - description: "" - port: "fa15" + interface: "fa15" - description: "" - port: "fa16" + interface: "fa16" - description: "" - port: "fa17" + interface: "fa17" - description: "" - port: "fa18" + interface: "fa18" - description: "" - port: "fa19" + interface: "fa19" - description: "" - port: "fa20" + interface: "fa20" - description: "" - port: "fa21" + interface: "fa21" - description: "" - port: "fa22" + interface: "fa22" - description: "AP" - port: "fa23" + interface: "fa23" - description: "AP" - port: "fa24" + interface: "fa24" - description: "" - port: "gi1" + interface: "gi1" - description: "" - port: "gi2" + interface: "gi2" - description: "" - port: "gi3" + interface: "gi3" - description: "Eltex2124-8 - gi1/0/5" - port: "gi4" + interface: "gi4" - description: "" - port: "Po1" + interface: "Po1" - description: "" - port: "Po2" + interface: "Po2" - description: "" - port: "Po3" + interface: "Po3" - description: "" - port: "Po4" + interface: "Po4" - description: "" - port: "Po5" + interface: "Po5" - description: "" - port: "Po6" + interface: "Po6" - description: "" - port: "Po7" + interface: "Po7" - description: "" - port: "Po8" + interface: "Po8"