diff --git a/ntc_templates/templates/eltex_show_interfaces_description.textfsm b/ntc_templates/templates/eltex_show_interfaces_description.textfsm index 64f8759b72..12423367b3 100644 --- a/ntc_templates/templates/eltex_show_interfaces_description.textfsm +++ b/ntc_templates/templates/eltex_show_interfaces_description.textfsm @@ -2,7 +2,7 @@ Value INTERFACE ((?!Port|Ch|-)\S+) Value INTERFACE_MODE (Trunk|Access(?:\s*\(\d+\))?|Customer(?:\s*\(\d+\))?) Value ADMIN_STATE (Up|Down) Value LINK_STATE (Up|Down|Not Present) -Value DESCRIPTION (.*?) +Value List DESCRIPTION (.*?) Start ^\s*Admin\s+Link\s*$$ @@ -56,8 +56,10 @@ Ch5 Vlan ^(?:\s*-+)+\s*$$ - ^\s*${INTERFACE}\s+${ADMIN_STATE}\s+${LINK_STATE}(?:\s+${DESCRIPTION})?\s*$$ -> Record + ^(?:\s*(?!Port|Ch|-)\S+\s+(?:Up|Down).*|\s*)$$ -> Continue.Record ^\s*$$ -> Start + ^\s*${INTERFACE}\s+${ADMIN_STATE}\s+${LINK_STATE}(?:\s+${DESCRIPTION})?\s*$$ + ^\s*${DESCRIPTION}\s*$$ ^. -> Error Loopback diff --git a/tests/eltex/show_interfaces_description/show_interfaces_description_1.yml b/tests/eltex/show_interfaces_description/show_interfaces_description_1.yml index 97344ed615..8d597c7953 100644 --- a/tests/eltex/show_interfaces_description/show_interfaces_description_1.yml +++ b/tests/eltex/show_interfaces_description/show_interfaces_description_1.yml @@ -1,232 +1,278 @@ --- parsed_sample: - admin_state: "Up" - description: "mirror_te1/0/1" - link_state: "Down" + description: + - "mirror_te1/0/1" interface: "gi1/0/1" interface_mode: "" - - admin_state: "Up" - description: "" link_state: "Down" + - admin_state: "Up" + description: + - "None" interface: "gi1/0/2" interface_mode: "" - - admin_state: "Up" - description: "" link_state: "Down" + - admin_state: "Up" + description: + - "None" interface: "gi1/0/3" interface_mode: "" - - admin_state: "Up" - description: "" link_state: "Down" + - admin_state: "Up" + description: + - "None" interface: "gi1/0/4" interface_mode: "" - - admin_state: "Up" - description: "" link_state: "Down" + - admin_state: "Up" + description: + - "None" interface: "gi1/0/5" interface_mode: "" - - admin_state: "Up" - description: "" link_state: "Down" + - admin_state: "Up" + description: + - "None" interface: "gi1/0/6" interface_mode: "" - - admin_state: "Up" - description: "" link_state: "Down" + - admin_state: "Up" + description: + - "None" interface: "gi1/0/7" interface_mode: "" - - admin_state: "Up" - description: "" link_state: "Down" + - admin_state: "Up" + description: + - "None" interface: "gi1/0/8" interface_mode: "" - - admin_state: "Up" - description: "" link_state: "Down" + - admin_state: "Up" + description: + - "None" interface: "gi1/0/9" interface_mode: "" - - admin_state: "Up" - description: "" link_state: "Down" + - admin_state: "Up" + description: + - "None" interface: "gi1/0/10" interface_mode: "" - - admin_state: "Up" - description: "" link_state: "Down" + - admin_state: "Up" + description: + - "None" interface: "gi1/0/11" interface_mode: "" - - admin_state: "Up" - description: "" link_state: "Down" + - admin_state: "Up" + description: + - "None" interface: "gi1/0/12" interface_mode: "" - - admin_state: "Up" - description: "" link_state: "Down" + - admin_state: "Up" + description: + - "None" interface: "gi1/0/13" interface_mode: "" - - admin_state: "Up" - description: "" link_state: "Down" + - admin_state: "Up" + description: + - "None" interface: "gi1/0/14" interface_mode: "" - - admin_state: "Up" - description: "" link_state: "Down" + - admin_state: "Up" + description: + - "None" interface: "gi1/0/15" interface_mode: "" - - admin_state: "Up" - description: "" link_state: "Down" + - admin_state: "Up" + description: + - "None" interface: "gi1/0/16" interface_mode: "" - - admin_state: "Up" - description: "" link_state: "Down" + - admin_state: "Up" + description: + - "None" interface: "gi1/0/17" interface_mode: "" - - admin_state: "Up" - description: "" link_state: "Down" + - admin_state: "Up" + description: + - "None" interface: "gi1/0/18" interface_mode: "" - - admin_state: "Up" - description: "" link_state: "Down" + - admin_state: "Up" + description: + - "None" interface: "gi1/0/19" interface_mode: "" - - admin_state: "Up" - description: "" link_state: "Down" + - admin_state: "Up" + description: + - "None" interface: "gi1/0/20" interface_mode: "" - - admin_state: "Up" - description: "" link_state: "Down" + - admin_state: "Up" + description: + - "None" interface: "gi1/0/21" interface_mode: "" - - admin_state: "Up" - description: "" link_state: "Down" + - admin_state: "Up" + description: + - "None" interface: "gi1/0/22" interface_mode: "" - - admin_state: "Up" - description: "" link_state: "Down" + - admin_state: "Up" + description: + - "None" interface: "gi1/0/23" interface_mode: "" - - admin_state: "Up" - description: "MGMT" link_state: "Down" + - admin_state: "Up" + description: + - "MGMT" interface: "gi1/0/24" interface_mode: "" + link_state: "Down" - admin_state: "Up" - description: "Eltex3324-1 - Te1/0/4" - link_state: "Up" + description: + - "Eltex3324-1 - Te1/0/4" interface: "te1/0/1" interface_mode: "" - - admin_state: "Up" - description: "FIORD-10G" link_state: "Up" + - admin_state: "Up" + description: + - "FIORD-10G" interface: "te1/0/2" interface_mode: "" - - admin_state: "Up" - description: "MX5-2 - xe-0/0/2" link_state: "Up" + - admin_state: "Up" + description: + - "MX5-2 - xe-0/0/2" interface: "te1/0/3" interface_mode: "" - - admin_state: "Up" - description: "Eltex3124-1 - Te1/0/3" link_state: "Up" + - admin_state: "Up" + description: + - "Eltex3124-1 - Te1/0/3" interface: "te1/0/4" interface_mode: "" + link_state: "Up" - admin_state: "Up" - description: "" - link_state: "Not Present" + description: + - "None" interface: "Po1" interface_mode: "" - - admin_state: "Up" - description: "" link_state: "Not Present" + - admin_state: "Up" + description: + - "None" interface: "Po2" interface_mode: "" - - admin_state: "Up" - description: "" link_state: "Not Present" + - admin_state: "Up" + description: + - "None" interface: "Po3" interface_mode: "" - - admin_state: "Up" - description: "" link_state: "Not Present" + - admin_state: "Up" + description: + - "None" interface: "Po4" interface_mode: "" - - admin_state: "Up" - description: "" link_state: "Not Present" + - admin_state: "Up" + description: + - "None" interface: "Po5" interface_mode: "" - - admin_state: "Up" - description: "" link_state: "Not Present" + - admin_state: "Up" + description: + - "None" interface: "Po6" interface_mode: "" - - admin_state: "Up" - description: "" link_state: "Not Present" + - admin_state: "Up" + description: + - "None" interface: "Po7" interface_mode: "" - - admin_state: "Up" - description: "" link_state: "Not Present" + - admin_state: "Up" + description: + - "None" interface: "Po8" interface_mode: "" - - admin_state: "Up" - description: "" link_state: "Not Present" + - admin_state: "Up" + description: + - "None" interface: "Po9" interface_mode: "" - - admin_state: "Up" - description: "" link_state: "Not Present" + - admin_state: "Up" + description: + - "None" interface: "Po10" interface_mode: "" - - admin_state: "Up" - description: "" link_state: "Not Present" + - admin_state: "Up" + description: + - "None" interface: "Po11" interface_mode: "" - - admin_state: "Up" - description: "" link_state: "Not Present" + - admin_state: "Up" + description: + - "None" interface: "Po12" interface_mode: "" + link_state: "Not Present" - admin_state: "Up" - description: "-" - link_state: "Up" + description: + - "-" interface: "1" interface_mode: "" - - admin_state: "Up" - description: "Telia" link_state: "Up" + - admin_state: "Up" + description: + - "Telia" interface: "2" interface_mode: "" - - admin_state: "Up" - description: "" link_state: "Up" + - admin_state: "Up" + description: + - "None" interface: "loopback1" interface_mode: "" - - admin_state: "Up" - description: "" link_state: "Up" + - admin_state: "Up" + description: + - "None" interface: "loopback2" interface_mode: "" - - admin_state: "Up" - description: "" link_state: "Up" + - admin_state: "Up" + description: + - "None" interface: "loopback3" interface_mode: "" - - admin_state: "Up" - description: "" link_state: "Up" + - admin_state: "Up" + description: + - "None" interface: "loopback4" interface_mode: "" + link_state: "Up" diff --git a/tests/eltex/show_interfaces_description/show_interfaces_description_2.raw b/tests/eltex/show_interfaces_description/show_interfaces_description_2.raw index f0420e8e54..4aac808ce4 100644 --- a/tests/eltex/show_interfaces_description/show_interfaces_description_2.raw +++ b/tests/eltex/show_interfaces_description/show_interfaces_description_2.raw @@ -50,7 +50,11 @@ Vlan Admin State Link State Description ---- ----------- ---------- -------------------------------- 1 Up Up - 4 Up Up SW_MGMT +555 Up Up Very long description of the + VLAN 1 634 Up Up Multicast Office +666 Up Up Very long description of the + VLAN 2 Admin Link diff --git a/tests/eltex/show_interfaces_description/show_interfaces_description_2.yml b/tests/eltex/show_interfaces_description/show_interfaces_description_2.yml index b5ec924e06..10255979a9 100644 --- a/tests/eltex/show_interfaces_description/show_interfaces_description_2.yml +++ b/tests/eltex/show_interfaces_description/show_interfaces_description_2.yml @@ -1,222 +1,280 @@ --- parsed_sample: - admin_state: "Up" - description: "link_to_MGTS_ADSL" - link_state: "Up" + description: + - "link_to_MGTS_ADSL" interface: "gi1/0/1" interface_mode: "Trunk" - - admin_state: "Up" - description: "BS12700_-LAN (Office)" link_state: "Up" + - admin_state: "Up" + description: + - "BS12700_-LAN (Office)" interface: "gi1/0/2" interface_mode: "Trunk" - - admin_state: "Up" - description: "Eltex1124M - gi1/0/1" link_state: "Up" + - admin_state: "Up" + description: + - "Eltex1124M - gi1/0/1" interface: "gi1/0/3" interface_mode: "Trunk" - - admin_state: "Up" - description: "L2_OST_M9" link_state: "Up" + - admin_state: "Up" + description: + - "L2_OST_M9" interface: "gi1/0/4" interface_mode: "Trunk" + link_state: "Up" - admin_state: "Down" - description: "" - link_state: "Down" + description: + - "None" interface: "gi1/0/5" interface_mode: "Access (1)" - - admin_state: "Down" - description: "" link_state: "Down" + - admin_state: "Down" + description: + - "None" interface: "gi1/0/6" interface_mode: "Access (1)" - - admin_state: "Down" - description: "" link_state: "Down" + - admin_state: "Down" + description: + - "None" interface: "gi1/0/7" interface_mode: "Access (1)" - - admin_state: "Down" - description: "" link_state: "Down" + - admin_state: "Down" + description: + - "None" interface: "gi1/0/8" interface_mode: "Access (1)" - - admin_state: "Down" - description: "" link_state: "Down" + - admin_state: "Down" + description: + - "None" interface: "gi1/0/9" interface_mode: "Access (1)" - - admin_state: "Down" - description: "" link_state: "Down" + - admin_state: "Down" + description: + - "None" interface: "gi1/0/10" interface_mode: "Access (1)" + link_state: "Down" - admin_state: "Up" - description: "ASR920-1 - Gi0" - link_state: "Up" + description: + - "ASR920-1 - Gi0" interface: "gi1/0/11" interface_mode: "Access (111)" - - admin_state: "Up" - description: "ASR920-2 - Gi0" link_state: "Up" + - admin_state: "Up" + description: + - "ASR920-2 - Gi0" interface: "gi1/0/12" interface_mode: "Access (111)" + link_state: "Up" - admin_state: "Down" - description: "" - link_state: "Down" + description: + - "None" interface: "gi1/0/13" interface_mode: "Access (1)" - - admin_state: "Down" - description: "" link_state: "Down" + - admin_state: "Down" + description: + - "None" interface: "gi1/0/14" interface_mode: "Access (1)" - - admin_state: "Down" - description: "" link_state: "Down" + - admin_state: "Down" + description: + - "None" interface: "gi1/0/15" interface_mode: "Access (1)" - - admin_state: "Down" - description: "" link_state: "Down" + - admin_state: "Down" + description: + - "None" interface: "gi1/0/16" interface_mode: "Access (1)" - - admin_state: "Down" - description: "" link_state: "Down" + - admin_state: "Down" + description: + - "None" interface: "gi1/0/17" interface_mode: "Access (1)" - - admin_state: "Down" - description: "" link_state: "Down" + - admin_state: "Down" + description: + - "None" interface: "gi1/0/18" interface_mode: "Access (1)" - - admin_state: "Down" - description: "" link_state: "Down" + - admin_state: "Down" + description: + - "None" interface: "gi1/0/19" interface_mode: "Access (1)" - - admin_state: "Down" - description: "" link_state: "Down" + - admin_state: "Down" + description: + - "None" interface: "gi1/0/20" interface_mode: "Access (1)" - - admin_state: "Down" - description: "" link_state: "Down" + - admin_state: "Down" + description: + - "None" interface: "gi1/0/21" interface_mode: "Access (1)" - - admin_state: "Down" - description: "" link_state: "Down" + - admin_state: "Down" + description: + - "None" interface: "gi1/0/22" interface_mode: "Access (1)" - - admin_state: "Down" - description: "" link_state: "Down" + - admin_state: "Down" + description: + - "None" interface: "gi1/0/23" interface_mode: "Access (1)" - - admin_state: "Down" - description: "" link_state: "Down" + - admin_state: "Down" + description: + - "None" interface: "gi1/0/24" interface_mode: "Access (1)" + link_state: "Down" - admin_state: "Up" - description: "N9K-1 - eth1/18 (Po1)" - link_state: "Up" + description: + - "N9K-1 - eth1/18 (Po1)" interface: "te1/0/1" interface_mode: "Trunk" - - admin_state: "Up" - description: "N9K-1 - eth1/19 (Po1)" link_state: "Up" + - admin_state: "Up" + description: + - "N9K-1 - eth1/19 (Po1)" interface: "te1/0/2" interface_mode: "Trunk" + link_state: "Up" - admin_state: "Down" - description: "" - link_state: "Down" + description: + - "None" interface: "te1/0/3" interface_mode: "Access (1)" + link_state: "Down" - admin_state: "Up" - description: "Eltex3124-2 - te1/0/1" - link_state: "Up" + description: + - "Eltex3124-2 - te1/0/1" interface: "te1/0/4" interface_mode: "Trunk" - - admin_state: "Up" - description: "N9K-1 - po25" link_state: "Up" + - admin_state: "Up" + description: + - "N9K-1 - po25" interface: "Po1" interface_mode: "Trunk" + link_state: "Up" - admin_state: "Up" - description: "" - link_state: "Not Present" + description: + - "None" interface: "Po2" interface_mode: "Access (1)" - - admin_state: "Up" - description: "" link_state: "Not Present" + - admin_state: "Up" + description: + - "None" interface: "Po3" interface_mode: "Access (1)" - - admin_state: "Up" - description: "" link_state: "Not Present" + - admin_state: "Up" + description: + - "None" interface: "Po4" interface_mode: "Access (1)" - - admin_state: "Up" - description: "" link_state: "Not Present" + - admin_state: "Up" + description: + - "None" interface: "Po5" interface_mode: "Access (1)" - - admin_state: "Up" - description: "" link_state: "Not Present" + - admin_state: "Up" + description: + - "None" interface: "Po6" interface_mode: "Access (1)" - - admin_state: "Up" - description: "" link_state: "Not Present" + - admin_state: "Up" + description: + - "None" interface: "Po7" interface_mode: "Access (1)" - - admin_state: "Up" - description: "" link_state: "Not Present" + - admin_state: "Up" + description: + - "None" interface: "Po8" interface_mode: "Access (1)" - - admin_state: "Up" - description: "" link_state: "Not Present" + - admin_state: "Up" + description: + - "None" interface: "Po9" interface_mode: "Access (1)" - - admin_state: "Up" - description: "" link_state: "Not Present" + - admin_state: "Up" + description: + - "None" interface: "Po10" interface_mode: "Access (1)" - - admin_state: "Up" - description: "" link_state: "Not Present" + - admin_state: "Up" + description: + - "None" interface: "Po11" interface_mode: "Access (1)" - - admin_state: "Up" - description: "" link_state: "Not Present" + - admin_state: "Up" + description: + - "None" interface: "Po12" interface_mode: "Access (1)" + link_state: "Not Present" - admin_state: "Up" - description: "-" - link_state: "Up" + description: + - "-" interface: "1" interface_mode: "" - - admin_state: "Up" - description: "SW_MGMT" link_state: "Up" + - admin_state: "Up" + description: + - "SW_MGMT" interface: "4" interface_mode: "" + link_state: "Up" - admin_state: "Up" - description: "Multicast Office" + description: + - "Very long description of the" + - "VLAN 1" + interface: "555" + interface_mode: "" link_state: "Up" + - admin_state: "Up" + description: + - "Multicast Office" interface: "634" interface_mode: "" + link_state: "Up" - admin_state: "Up" - description: "ASR920-1 - Gi0/0/0" + description: + - "Very long description of the" + - "VLAN 2" + interface: "666" + interface_mode: "" link_state: "Up" + - admin_state: "Up" + description: + - "ASR920-1 - Gi0/0/0" interface: "oob" interface_mode: "" + link_state: "Up" diff --git a/tests/eltex/show_interfaces_description/show_interfaces_description_3.yml b/tests/eltex/show_interfaces_description/show_interfaces_description_3.yml index a3cc1bed04..7bff2dbd3e 100644 --- a/tests/eltex/show_interfaces_description/show_interfaces_description_3.yml +++ b/tests/eltex/show_interfaces_description/show_interfaces_description_3.yml @@ -1,202 +1,242 @@ --- parsed_sample: - admin_state: "" - description: "via_Orange" - link_state: "" + description: + - "via_Orange" interface: "gi1/0/1" interface_mode: "" - - admin_state: "" - description: "QNAP" link_state: "" + - admin_state: "" + description: + - "QNAP" interface: "gi1/0/2" interface_mode: "" - - admin_state: "" - description: "Office-Fortigate-Port2" link_state: "" + - admin_state: "" + description: + - "Office-Fortigate-Port2" interface: "gi1/0/3" interface_mode: "" - - admin_state: "" - description: "MSL4048Backup" link_state: "" + - admin_state: "" + description: + - "MSL4048Backup" interface: "gi1/0/4" interface_mode: "" - - admin_state: "" - description: "VEEAM2 - eth3" link_state: "" + - admin_state: "" + description: + - "VEEAM2 - eth3" interface: "gi1/0/5" interface_mode: "" - - admin_state: "" - description: "VEEAM2 - eth4" link_state: "" + - admin_state: "" + description: + - "VEEAM2 - eth4" interface: "gi1/0/6" interface_mode: "" - - admin_state: "" - description: "" link_state: "" + - admin_state: "" + description: + - "None" interface: "gi1/0/7" interface_mode: "" - - admin_state: "" - description: "" link_state: "" + - admin_state: "" + description: + - "None" interface: "gi1/0/8" interface_mode: "" - - admin_state: "" - description: "" link_state: "" + - admin_state: "" + description: + - "None" interface: "gi1/0/9" interface_mode: "" - - admin_state: "" - description: "" link_state: "" + - admin_state: "" + description: + - "None" interface: "gi1/0/10" interface_mode: "" - - admin_state: "" - description: "" link_state: "" + - admin_state: "" + description: + - "None" interface: "gi1/0/11" interface_mode: "" - - admin_state: "" - description: "" link_state: "" + - admin_state: "" + description: + - "None" interface: "gi1/0/12" interface_mode: "" - - admin_state: "" - description: "Blade" link_state: "" + - admin_state: "" + description: + - "Blade" interface: "gi1/0/13" interface_mode: "" - - admin_state: "" - description: "Blade" link_state: "" + - admin_state: "" + description: + - "Blade" interface: "gi1/0/14" interface_mode: "" - - admin_state: "" - description: "" link_state: "" + - admin_state: "" + description: + - "None" interface: "gi1/0/15" interface_mode: "" - - admin_state: "" - description: "" link_state: "" + - admin_state: "" + description: + - "None" interface: "gi1/0/16" interface_mode: "" - - admin_state: "" - description: "" link_state: "" + - admin_state: "" + description: + - "None" interface: "gi1/0/17" interface_mode: "" - - admin_state: "" - description: "" link_state: "" + - admin_state: "" + description: + - "None" interface: "gi1/0/18" interface_mode: "" - - admin_state: "" - description: "" link_state: "" + - admin_state: "" + description: + - "None" interface: "gi1/0/19" interface_mode: "" - - admin_state: "" - description: "" link_state: "" + - admin_state: "" + description: + - "None" interface: "gi1/0/20" interface_mode: "" - - admin_state: "" - description: "" link_state: "" + - admin_state: "" + description: + - "None" interface: "gi1/0/21" interface_mode: "" - - admin_state: "" - description: "" link_state: "" + - admin_state: "" + description: + - "None" interface: "gi1/0/22" interface_mode: "" - - admin_state: "" - description: "" link_state: "" + - admin_state: "" + description: + - "None" interface: "gi1/0/23" interface_mode: "" - - admin_state: "" - description: "" link_state: "" + - admin_state: "" + description: + - "None" interface: "gi1/0/24" interface_mode: "" - - admin_state: "" - description: "EXTREME - Port16" link_state: "" + - admin_state: "" + description: + - "EXTREME - Port16" interface: "te1/0/1" interface_mode: "" - - admin_state: "" - description: "" link_state: "" + - admin_state: "" + description: + - "None" interface: "te1/0/2" interface_mode: "" - - admin_state: "" - description: "FREE" link_state: "" + - admin_state: "" + description: + - "FREE" interface: "te1/0/3" interface_mode: "" - - admin_state: "" - description: "FREE" link_state: "" + - admin_state: "" + description: + - "FREE" interface: "te1/0/4" interface_mode: "" - - admin_state: "" - description: "" link_state: "" + - admin_state: "" + description: + - "None" interface: "Po1" interface_mode: "" - - admin_state: "" - description: "" link_state: "" + - admin_state: "" + description: + - "None" interface: "Po2" interface_mode: "" - - admin_state: "" - description: "" link_state: "" + - admin_state: "" + description: + - "None" interface: "Po3" interface_mode: "" - - admin_state: "" - description: "" link_state: "" + - admin_state: "" + description: + - "None" interface: "Po4" interface_mode: "" - - admin_state: "" - description: "" link_state: "" + - admin_state: "" + description: + - "None" interface: "Po5" interface_mode: "" - - admin_state: "" - description: "" link_state: "" + - admin_state: "" + description: + - "None" interface: "Po6" interface_mode: "" - - admin_state: "" - description: "" link_state: "" + - admin_state: "" + description: + - "None" interface: "Po7" interface_mode: "" - - admin_state: "" - description: "" link_state: "" + - admin_state: "" + description: + - "None" interface: "Po8" interface_mode: "" - - admin_state: "" - description: "" link_state: "" + - admin_state: "" + description: + - "None" interface: "Po9" interface_mode: "" - - admin_state: "" - description: "Office-Fortigate-LACP" link_state: "" + - admin_state: "" + description: + - "Office-Fortigate-LACP" interface: "Po10" interface_mode: "" - - admin_state: "" - description: "" link_state: "" + - admin_state: "" + description: + - "None" interface: "Po11" interface_mode: "" - - admin_state: "" - description: "" link_state: "" + - admin_state: "" + description: + - "None" interface: "Po12" interface_mode: "" + link_state: ""