From 70dd6cfd23e4f101f3185792038e90cd152602ff Mon Sep 17 00:00:00 2001 From: Kaigan Woodford Date: Sat, 12 Oct 2024 03:06:52 +1000 Subject: [PATCH] Fix: inner vlan parsing cisco ios ```show interfaces``` (#1865) --- ntc_templates/templates/cisco_ios_show_interfaces.textfsm | 4 ++-- .../cisco_ios/show_interfaces/cisco_ios_show_interfaces5.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ntc_templates/templates/cisco_ios_show_interfaces.textfsm b/ntc_templates/templates/cisco_ios_show_interfaces.textfsm index 8a360c57fa..95c91a43d6 100644 --- a/ntc_templates/templates/cisco_ios_show_interfaces.textfsm +++ b/ntc_templates/templates/cisco_ios_show_interfaces.textfsm @@ -49,8 +49,8 @@ Start ^\s+Description:\s+${DESCRIPTION}\s*$$ ^\s+Internet\s+address\s+is\s+${IP_ADDRESS}\/${PREFIX_LENGTH}\s*$$ ^\s+MTU\s+${MTU}.*BW\s+${BANDWIDTH}.*DLY\s+${DELAY},\s*$$ - ^\s+Encapsulation\s+${ENCAPSULATION}, Vlan ID\s+${VLAN_ID}.+$$ - ^\s+Encapsulation\s+${ENCAPSULATION}, outer ID\s+${VLAN_ID_OUTER}, inner ID\s+${VLAN_ID_INNER}.+$$ + ^\s+Encapsulation\s+${ENCAPSULATION}, Vlan ID\s+${VLAN_ID} + ^\s+Encapsulation\s+${ENCAPSULATION}, outer ID\s+${VLAN_ID_OUTER}, inner ID\s+${VLAN_ID_INNER} ^\s+Encapsulation\s+${ENCAPSULATION},.+$$ ^\s+Last\s+input\s+${LAST_INPUT},\s+output\s+${LAST_OUTPUT},\s+output\s+hang\s+${LAST_OUTPUT_HANG}\s*$$ ^\s+Input\s+queue:\s+${QUEUE_SIZE}\/${QUEUE_MAX}\/${QUEUE_DROPS}\/${QUEUE_FLUSHES}\s+\(size\/max\/drops\/flushes\);\s+Total output\s+drops:\s+${QUEUE_OUTPUT_DROPS}\s*$$ diff --git a/tests/cisco_ios/show_interfaces/cisco_ios_show_interfaces5.yml b/tests/cisco_ios/show_interfaces/cisco_ios_show_interfaces5.yml index b5114c84ae..e478699373 100644 --- a/tests/cisco_ios/show_interfaces/cisco_ios_show_interfaces5.yml +++ b/tests/cisco_ios/show_interfaces/cisco_ios_show_interfaces5.yml @@ -82,5 +82,5 @@ parsed_sample: runts: "" speed: "" vlan_id: "" - vlan_id_inner: "1" + vlan_id_inner: "13" vlan_id_outer: "813"