Merge branch 'master' into oneaccess_fifth_5

networktocode · Jul 22, 2024 · 1f8deaf · 1f8deaf
2 parents 2630826 + af6be91
commit 1f8deaf
Show file tree

Hide file tree

Showing 84 changed files with 21,043 additions and 12 deletions.
diff --git a/docs/admin/release_notes/version_6.0.md b/docs/admin/release_notes/version_6.0.md
@@ -0,0 +1,46 @@
+## What's Changed
+
+* cisco_xr_dir: Add edge case for year/time by @lamiskin in https://github.com/networktocode/ntc-templates/pull/1705
+* Updated huawei_smartax display ont info by @evilmonkey19 in https://github.com/networktocode/ntc-templates/pull/1704
+* Add ability to specify template dir as argument by @jmcgill298 in https://github.com/networktocode/ntc-templates/pull/1689
+* Fix template huawei_vrp_display_interface_description by @AlexLardschneider in https://github.com/networktocode/ntc-templates/pull/1698
+* Normalize CDP, LLDP, ISDP capture groups by @mjbear in https://github.com/networktocode/ntc-templates/pull/1469
+* fix issue#1182 - capture BGP times less than a day by @mjbear in https://github.com/networktocode/ntc-templates/pull/1719
+* replace ROUTE with NETWORK in cisco_ios_show_ip_eigrp_topology by @mjbear in https://github.com/networktocode/ntc-templates/pull/1466
+* resolves #1707 - make transceiver version optional and allow hyphens/dashes in transceiver serial numbers by @mjbear in https://github.com/networktocode/ntc-templates/pull/1721
+* closes #932 by @ryanmerolle in https://github.com/networktocode/ntc-templates/pull/1720
+* New template: cisco_nxos_show_ip_eigrp_neighbors by @ryanmerolle in https://github.com/networktocode/ntc-templates/pull/1718
+* Junos show_chassis_hardware simplify regex by @mjbear in https://github.com/networktocode/ntc-templates/pull/1722
+* add a new template: cisco_viptela_show_arp by @yone2ks in https://github.com/networktocode/ntc-templates/pull/1723
+* Bugfix cisco_asa_show_inventory - catch space in PID value Issue #1692 by @SI727367 in https://github.com/networktocode/ntc-templates/pull/1697
+* make ip int vrf all more flexible with outputs minus wccp lines by @jeffkala in https://github.com/networktocode/ntc-templates/pull/1725
+* fix ip int brief for forward-enabled ips by @jeffkala in https://github.com/networktocode/ntc-templates/pull/1727
+* AddTemplate cisco_nxos_show_nve_vni_interface_nve_1_detail.textfsm by @jpvrenen in https://github.com/networktocode/ntc-templates/pull/1712
+* Arista eos show environment power by @jmcgill298 in https://github.com/networktocode/ntc-templates/pull/1734
+* Add nxos show bfd neighbors by @jmcgill298 in https://github.com/networktocode/ntc-templates/pull/1738
+* Enhance IOS sho ip route to support * by @jmcgill298 in https://github.com/networktocode/ntc-templates/pull/1737
+* New Template: NXOS show fabricpath route by @jmcgill298 in https://github.com/networktocode/ntc-templates/pull/1736
+* resolves 1605 - support sub-interfaces in ios show interface link by @mjbear in https://github.com/networktocode/ntc-templates/pull/1740
+* resolves #1731 - changes to handle Cisco IOS-XE WLC output changes for `show ap summary` by @mjbear in https://github.com/networktocode/ntc-templates/pull/1739
+* resolves 1741 (bugfix) - ios show interface link - NAME should not match a space if there is no other text by @mjbear in https://github.com/networktocode/ntc-templates/pull/1742
+* fix: `show vlans` for cisco-ios to get IPv6 ip addresses by @gertzakis in https://github.com/networktocode/ntc-templates/pull/1748
+* Fix IOS show int status by @jmcgill298 in https://github.com/networktocode/ntc-templates/pull/1749
+* Cisco xr show interfaces add hardware_media by @jmcgill298 in https://github.com/networktocode/ntc-templates/pull/1746
+* Brocade ics link state by @jmcgill298 in https://github.com/networktocode/ntc-templates/pull/1745
+* Adding juniper show bgp summary command by @jmcgill298 in https://github.com/networktocode/ntc-templates/pull/1744
+* Updated Huawei SmartAX display ont info files so it can match the cas… by @jmcgill298 in https://github.com/networktocode/ntc-templates/pull/1743
+* Update Junos sh eth switch table by @jmcgill298 in https://github.com/networktocode/ntc-templates/pull/1733
+* Create exos_show_iparp.textfsm by @jmcgill298 in https://github.com/networktocode/ntc-templates/pull/1730
+* Jorlandobr by @jmcgill298 in https://github.com/networktocode/ntc-templates/pull/1729
+* add a new template: cisco_viptela_show_interface by @yone2ks in https://github.com/networktocode/ntc-templates/pull/1724
+* New template: huawei_smartax_ont_add by @evilmonkey19 in https://github.com/networktocode/ntc-templates/pull/1714
+* Ios show ip dhcp snooping binding by @jmcgill298 in https://github.com/networktocode/ntc-templates/pull/1751
+* Add cisco nxos show ip arp detail vrf all by @jmcgill298 in https://github.com/networktocode/ntc-templates/pull/1750
+
+## New Contributors
+* @AlexLardschneider made their first contribution in https://github.com/networktocode/ntc-templates/pull/1698
+* @SI727367 made their first contribution in https://github.com/networktocode/ntc-templates/pull/1697
+* @jpvrenen made their first contribution in https://github.com/networktocode/ntc-templates/pull/1712
+* @gertzakis made their first contribution in https://github.com/networktocode/ntc-templates/pull/1748
+
+**Full Changelog**: https://github.com/networktocode/ntc-templates/compare/v5.1.0...v6.0.0
diff --git a/ntc_templates/templates/arista_eos_show_ip_bgp_summary.textfsm b/ntc_templates/templates/arista_eos_show_ip_bgp_summary.textfsm
@@ -26,6 +26,7 @@ Start
   ^\s+${BGP_NEIGH}\s+\d+\s+${NEIGH_AS}\s+${MSG_RCVD}\s+${MSG_SENT}\s+${IN_QUEUE}\s+${OUT_QUEUE}\s+${UP_DOWN}\s+${STATE}\s* -> Record
   ^${BGP_NEIGH}\s+\d+\s+${NEIGH_AS}\s+${MSG_RCVD}\s+${MSG_SENT}\s+${IN_QUEUE}\s+${OUT_QUEUE}\s+${UP_DOWN}\s+${STATE}\s+${STATE_PFXRCD} -> Record
   ^${BGP_NEIGH}\s+\d+\s+${NEIGH_AS}\s+${MSG_RCVD}\s+${MSG_SENT}\s+${IN_QUEUE}\s+${OUT_QUEUE}\s+${UP_DOWN}\s+${STATE_PFXRCD} -> Record
+  ^${BGP_NEIGH}\s+\d+\s+${NEIGH_AS}\s+${MSG_RCVD}\s+${MSG_SENT}\s+${IN_QUEUE}\s+${OUT_QUEUE}\s+${UP_DOWN}\s+${STATE} -> Record
   ^Neighbor\s+Status\s+Codes:
   ^\s*$$
   ^. -> Error
diff --git a/ntc_templates/templates/cisco_asa_show_access-list_brief.textfsm b/ntc_templates/templates/cisco_asa_show_access-list_brief.textfsm
@@ -0,0 +1,15 @@
+Value Filldown ACL_NAME (\S+)
+Value Filldown ACL_TOTAL_ELEMENTS (\d+)
+Value Filldown ACL_NAME_HASH (0x\w+)
+Value Required LINE_HASH (\w{8})
+Value GROUP_HASH (\w{8})
+Value COUNTER (\w{8})
+Value LAST_HIT (\w{8})
+
+Start
+  ^access\-list\s+${ACL_NAME};\s+${ACL_TOTAL_ELEMENTS}\s+elements;\s+name\s+hash:\s+${ACL_NAME_HASH}\s*
+  ^${LINE_HASH}\s+${GROUP_HASH}\s+${COUNTER}\s+${LAST_HIT}\s* -> Record
+  ^\s*$$
+  ^.* -> Error 
+
+EOF
diff --git a/ntc_templates/templates/cisco_ios_show_interfaces.textfsm b/ntc_templates/templates/cisco_ios_show_interfaces.textfsm
@@ -35,6 +35,11 @@ Value OUTPUT_ERRORS (\d+)
 Value VLAN_ID (\d+)
 Value VLAN_ID_INNER (\d+)
 Value VLAN_ID_OUTER (\d+)
+Value QUEUE_SIZE (\d+)
+Value QUEUE_MAX (\d+) 
+Value QUEUE_DROPS (\d+)
+Value QUEUE_FLUSHES (\d+)
+Value QUEUE_OUTPUT_DROPS (\d+)
 
 Start
   ^\S+\s+is\s+.+?,\s+line\s+protocol.*$$ -> Continue.Record
@@ -48,6 +53,7 @@ Start
   ^\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*$$
   ^\s+Queueing\s+strategy:\s+${QUEUE_STRATEGY}\s*$$
   ^\s+${DUPLEX},\s+${SPEED},.+media\stype\sis\s${MEDIA_TYPE}$$
   ^\s+${DUPLEX},\s+${SPEED},.+TX/FX$$

diff --git a/ntc_templates/templates/cisco_ios_show_ip_dhcp_snooping_binding.textfsm b/ntc_templates/templates/cisco_ios_show_ip_dhcp_snooping_binding.textfsm
@@ -0,0 +1,14 @@
+Value Required IP_ADDRESS ((?:[0-9]{1,3}\.){3}[0-9]{1,3})
+Value Required MAC_ADDRESS ([0-9a-fA-F]{2}:[0-9a-fA-F]{2}:[0-9a-fA-F]{2}:[0-9a-fA-F]{2}:[0-9a-fA-F]{2}:[0-9a-fA-F]{2})
+Value Required VLAN ([0-9]+)
+Value Required INTERFACE (\S+)
+Value Required TYPE (\S+)
+Value Required LEASE (\S+)
+
+Start
+  ^\s*M[Aa][Cc]\s*Address\s+I[Pp]\s*Address\s+Lease\(sec\)\s+Type\s+VLAN\s+Interface\s*$$
+  ^\s*-+\s+-+
+  ^\s*${MAC_ADDRESS}\s+${IP_ADDRESS}\s+${LEASE}\s+${TYPE}\s+${VLAN}\s+${INTERFACE} -> Record
+  ^\s*Total\s+number\s+of\s+bindings
+  ^\s*$$
+  ^. -> Error
diff --git a/ntc_templates/templates/cisco_ios_show_snmp_community.textfsm b/ntc_templates/templates/cisco_ios_show_snmp_community.textfsm
@@ -2,12 +2,16 @@ Value NAME (\S+)
 Value INDEX (\S+)
 Value SECURITY_NAME (\S+)
 Value STORAGE_TYPE (\S+)
+Value ACCESS_LIST_NUMBER (\S+)
 
 Start
-  ^Community\s+name:\s+${NAME}.*
+  ^Community\s+name: -> Continue.Record
+  ^Community\s+name:\s+${NAME}\s*$$
   ^Community\sIndex:\s+${INDEX}
   ^Community\sSecurityName:\s+${SECURITY_NAME}
-  ^storage-type:\s${STORAGE_TYPE} -> Record
+  ^storage-type:\s${STORAGE_TYPE}\s+active(\s+access-list:\s${ACCESS_LIST_NUMBER})?
   # Capture time-stamp if vty line has command time-stamping turned on
   ^Load\s+for\s+
   ^Time\s+source\s+is
+  ^\s*$$
+  ^. -> Error
diff --git a/ntc_templates/templates/cisco_nxos_show_interface.textfsm b/ntc_templates/templates/cisco_nxos_show_interface.textfsm
@@ -20,6 +20,11 @@ Value DELAY (\d+\s+\w+)
 Value ENCAPSULATION ([\w\.]+)
 Value LAST_LINK_FLAPPED (.+?)
 Value VLAN_ID (\d+)
+Value PACKET_INPUT_RATE (.+?)
+Value PACKET_OUTPUT_RATE (.+?)
+Value BANDWIDTH_INPUT_RATE (.+?)
+Value BANDWIDTH_OUTPUT_RATE (.+?)
+Value MEDIA_TYPE (.+?)
 
 Start
   ^\S+\s+is.+ -> Continue.Record
@@ -30,11 +35,13 @@ Start
   ^\s+Description:\s+${DESCRIPTION}\s*$$
   ^\s+Internet\s+Address\s+is\s+${IP_ADDRESS}\/${PREFIX_LENGTH}
   ^\s+Port\s+mode\s+is\s+${MODE}
-  ^\s+${DUPLEX}, ${SPEED}(,|$$)
+  ^\s+${DUPLEX}, ${SPEED}(,\s+media\s+type\s+is\s+${MEDIA_TYPE})?\s*$$
   ^\s+MTU\s+${MTU}.*BW\s+${BANDWIDTH}.*DLY\s+${DELAY}
   ^\s+Encapsulation\s+${ENCAPSULATION}(,)?(\s+Virtual\s+LAN,\s+Vlan\s+ID\s+${VLAN_ID},)?
   ^\s+${INPUT_PACKETS}\s+input\s+packets\s+\d+\s+bytes\s*$$
   ^\s+${INPUT_ERRORS}\s+input\s+error\s+\d+\s+short\s+frame\s+\d+\s+overrun\s+\d+\s+underrun\s+\d+\s+ignored\s*$$
   ^\s+${OUTPUT_PACKETS}\s+output\s+packets\s+\d+\s+bytes\s*$$
   ^\s+${OUTPUT_ERRORS}\s+output\s+error\s+\d+\s+collision\s+\d+\s+deferred\s+\d+\s+late\s+collision\s*$$
   ^\s+Last\s+link\s+flapped\s+${LAST_LINK_FLAPPED}\s*$$
+  ^\s+\d+\s+seconds\s+input\s+rate\s+${BANDWIDTH_INPUT_RATE}\s+bits/sec,\s+${PACKET_INPUT_RATE}\s+packets/sec
+  ^\s+\d+\s+seconds\s+output\s+rate\s+${BANDWIDTH_OUTPUT_RATE}\s+bits/sec,\s+${PACKET_OUTPUT_RATE}\s+packets/sec
diff --git a/ntc_templates/templates/cisco_nxos_show_ip_arp_detail_vrf_all.textfsm b/ntc_templates/templates/cisco_nxos_show_ip_arp_detail_vrf_all.textfsm
@@ -0,0 +1,22 @@
+Value IP_ADDRESS (\d+\.\d+\.\d+\.\d+)
+Value AGE (\S+)
+Value MAC_ADDRESS (\S+)
+Value INTERFACE (\S+)
+Value PHYSICAL_INTERFACE (\S+)
+Value FLAGS (\*|\+|#|CP|PS|RO)
+Value VRF (\S*)
+
+Start
+  #Ignore junk
+  ^.+\s-\sAdjacencies\s
+  ^.+\sCP\s-\s
+  ^.+\sPS\s-\s
+  ^.+\sRO\s-\s
+  ^\s*IP\sARP\sTable\s
+  ^\s*Total\snumber\sof\sentries:
+  ^\s*Address\s+Age\s+MAC\s+Address\s+Interface\s+Physical\sInterface\s+Flags\s*(VRF\sName)*\s*$$ -> Data
+  ^. -> Error
+
+Data
+  ^${IP_ADDRESS}\s+${AGE}\s+${MAC_ADDRESS}\s+${INTERFACE}\s+${PHYSICAL_INTERFACE}\s*${FLAGS}?\s*${VRF}\s*$$ -> Record
+  ^. -> Error
diff --git a/ntc_templates/templates/cisco_wlc_ssh_show_ap_summary.textfsm b/ntc_templates/templates/cisco_wlc_ssh_show_ap_summary.textfsm
@@ -2,17 +2,28 @@ Value AP_NAME (\S+)
 Value SLOT (\d+)
 Value AP_MODEL (\S+)
 Value MAC_ADDRESS ([a-fA-F0-9:\.]+)
+Value RADIO_MAC ([a-fA-F0-9:\.]+)
 Value LOCATION (.+?)
+Value PORT (.+?)
 Value COUNTRY (\S+)
 Value IP_ADDRESS ([a-fA-F0-9:\.]+)
 Value CLIENTS (\d+)
 Value DSE_LOCATION (.+?)
-
+Value PRIORITY (\d+)
+Value STATE (\S+)
+Value NUMBER_OF_APS (\d+)
 
 Start
+  # Skip lines 
+  ^Number\s+of\s+APs -> Record
+  # Match the various record patterns
   ^${AP_NAME}\s+${SLOT}\s+${AP_MODEL}\s+${MAC_ADDRESS}\s+${LOCATION}\s+${COUNTRY}\s+${IP_ADDRESS}\s+${CLIENTS}\s+${DSE_LOCATION}\s*$$ -> Record
+  ^${AP_NAME}\s+${SLOT}\s+${AP_MODEL}\s+${MAC_ADDRESS}\s+${LOCATION}\s+${PORT}\s+${COUNTRY}\s+${PRIORITY}\s*$$ -> Record
+  ^${AP_NAME}\s+${SLOT}\s+${AP_MODEL}\s+${MAC_ADDRESS}\s+${RADIO_MAC}\s${LOCATION}\s+${COUNTRY}\s+${IP_ADDRESS}\s+${STATE}\s*$$ -> Record
   ^.+\.+
   ^\s*$$
   ^AP\s+Name\s+Slots\s+AP\s+Model\s+Ethernet\s+MAC\s+Location\s+Country\s+IP\s+Address\s+Clients\s+DSE\s+Location\s*$$
+  ^AP\s+Name\s+Slots\s+AP\s+Model\s+Ethernet\s+MAC\s+Location\s+Port\s+Country\s+Priority\s*$$
+  ^AP\s+Name\s+Slots\s+AP\s+Model\s+Ethernet\s+MAC\s+Radio\s+MAC\s+Location\s+Country\s+IP\s+Address\s+State\s*$$
   ^-+
   ^. -> Error
diff --git a/ntc_templates/templates/huawei_smartax_ont_add.textfsm b/ntc_templates/templates/huawei_smartax_ont_add.textfsm
@@ -0,0 +1,12 @@
+Value ONTS (\d+)
+Value SUCCESS (\d+)
+Value PORT_ID (\d+)
+Value ONT_ID (\d+)
+
+Start
+  ^\s*Number\s*of\s*ONTs\s*that\s*can\s*be\s*added:\s*${ONTS},\s*success:\s*${SUCCESS} -> OntDetails
+
+OntDetails
+  ^\s*PortID\s*:${PORT_ID},\s*ONTID\s*:${ONT_ID} -> Record
+  ^\s*$$
+  ^. -> Error
diff --git a/ntc_templates/templates/huawei_smartax_port_vlan.textfsm b/ntc_templates/templates/huawei_smartax_port_vlan.textfsm
@@ -0,0 +1,7 @@
+Value SUCCESS (\d+)
+Value FAILED (\d+)
+
+Start
+  ^Set\sONT\sport\(s\)\sVLAN\sconfiguration,\ssuccess:\s*${SUCCESS},\s*failed:\s*${FAILED} -> Record
+  ^\s*$$
+  ^. -> Error
diff --git a/ntc_templates/templates/index b/ntc_templates/templates/index
@@ -195,6 +195,7 @@ cisco_asa_show_port-channel_summary.textfsm, .*, cisco_asa, sh[[ow]] po[[rt-chan
 cisco_asa_show_running-config_ipsec.textfsm, .*, cisco_asa, sh[[ow]] ru[[nning-config]] ips[[ec]]
 cisco_asa_show_cpu_usage_detailed.textfsm, .*, cisco_asa, sh[[ow]] cpu u[[sage]] d[[etailed]]
 cisco_asa_show_interface_ip_brief.textfsm, .*, cisco_asa, sh[[ow]] int[[erface]] ip br[[ief]]
+cisco_asa_show_access-list_brief.textfsm, .*, cisco_asa, sh[[ow]] ac[[cess-list]] (\S+ )?br[[ief]]
 cisco_asa_show_interface_detail.textfsm, .*, cisco_asa, sh[[ow]] int[[erface]] d[[etail]]
 cisco_asa_show_crypto_ipsec_sa.textfsm, .*, cisco_asa, sh[[ow]] (?:cry[[pto]] ip[[sec]]|ipsec) sa
 cisco_asa_show_resource_usage.textfsm, .*, cisco_asa, sh[[ow]] res[[ource]] u[[sage]]
@@ -229,6 +230,7 @@ cisco_ios_show_port-security_interface_interface.textfsm, .*, cisco_ios, sh[[ow]
 cisco_ios_show_capability_feature_routing.textfsm, .*, cisco_ios, sh[[ow]] cap[[ability]] f[[eature]] r[[outing]]
 cisco_ios_show_ip_bgp_vpnv4_all_neighbors.textfsm, .*, cisco_ios, sh[[ow]] ip bgp vpnv4 all nei[[ghbors]]
 cisco_ios_show_ip_eigrp_interfaces_detail.textfsm, .*, cisco_ios, sh[[ow]] ip ei[[grp]] i[[nterfaces]] de[[tail]]
+cisco_ios_show_ip_dhcp_snooping_binding.textfsm, .*, cisco_ios, sh[[ow]] ip dhcp sn[[ooping]] bi[[nding]]
 cisco_ios_show_ip_ospf_database_network.textfsm, .*, cisco_ios, sh[[ow]] ip ospf data[[base]] ne[[twork]]
 cisco_ios_show_authentication_sessions.textfsm, .*, cisco_ios, show authen[[tication]] ses[[sions]]
 cisco_ios_show_crypto_pki_certificates.textfsm, .*, cisco_ios, sh[[ow]] cry[[pto]] p[[ki]] ce[[rtificates]]
@@ -362,6 +364,7 @@ cisco_nxos_show_forwarding_ipv4_route.textfsm, .*, cisco_nxos, sh[[ow]] fo[[rwar
 cisco_nxos_show_interface_description.textfsm, .*, cisco_nxos, sh[[ow]] int[[erface]] desc[[ription]]
 cisco_nxos_show_interface_transceiver.textfsm, .*, cisco_nxos, sh[[ow]] int[[erface]] tra[[nsceiver]]
 cisco_nxos_show_interfaces_switchport.textfsm, .*, cisco_nxos, sh[[ow]] int[[erfaces]] sw[[itchport]]
+cisco_nxos_show_ip_arp_detail_vrf_all.textfsm, .*, cisco_nxos, sh[[ow]] i[[p]] a[[rp]] det[[ail]] vrf all
 cisco_nxos_show_ip_dhcp_relay_address.textfsm, .*, cisco_nxos, sh[[ow]] ip dh[[cp]] r[[elay]] a[[ddress]]
 cisco_nxos_show_lldp_neighbors_detail.textfsm, .*, cisco_nxos, sh[[ow]] ll[[dp]] nei[[ghbors]] d[[etail]]
 cisco_nxos_show_cdp_neighbors_detail.textfsm, .*, cisco_nxos, sh[[ow]] c[[dp]] neig[[hbors]] det[[ail]]
@@ -610,6 +613,8 @@ huawei_smartax_display_version.textfsm, .*, huawei_smartax, di[[splay]] ver[[sio
 huawei_smartax_display_board.textfsm, .*^, huawei_smartax, di[[splay]] bo[[ard]]\s*
 huawei_smartax_display_cpu.textfsm, .*, huawei_smartax, di[[splay]] cpu\s*
 huawei_smartax_display_mem.textfsm, .*, huawei_smartax, di[[splay]] mem[[ory]]\s*
+huawei_smartax_port_vlan.textfsm, .*, huawei_smartax, port vlan\s*
+huawei_smartax_ont_add.textfsm, .*, huawei_smartax, ont add\s*
 
 huawei_vrp_display_traffic-filter_applied-record.textfsm, .*, huawei_vrp, dis[[play]] traffic-filter applied-record
 huawei_vrp_display_ip_vpn-instance_interface.textfsm, .*, huawei_vrp, di[[splay]] ip vpn[[-instance]] interface
@@ -684,10 +689,13 @@ mikrotik_routeros_user_active_print.textfsm, .*, mikrotik_routeros, [[/]]us[[er]
 mikrotik_routeros_ip_address_print.textfsm, .*, mikrotik_routeros, [[/]]ip ad[[dress]] p[[rint]]
 mikrotik_routeros_ping.textfsm, .*, mikrotik_routeros, [[/]]pin[[g]]
 
+oneaccess_oneos_show_voice_voip-call_active_all.textfsm, .*, oneaccess_oneos, sh[[ow]] voice voip-call active
+oneaccess_oneos_show_voice_voip-call_any_all.textfsm, .*, oneaccess_oneos, sh[[ow]] voice voip-call any all
 oneaccess_oneos_show_running-config_bind.textfsm, .*, oneaccess_oneos, sh[[ow]] run[[ning-config]] \|?bind
 oneaccess_oneos_show_running-config_aaa.textfsm, .*, oneaccess_oneos, sh[[ow]] run[[ning-config]] \|?aaa
 oneaccess_oneos_show_product-info-area.textfsm, .*, oneaccess_oneos, sh[[ow]] product\-info\-area
 oneaccess_oneos_show_reboot_counters.textfsm, .*, oneaccess_oneos, sh[[ow]] reboot counters
+oneaccess_oneos_show_vrrp_interface.textfsm, .*, oneaccess_oneos, sh[[ow]] vrrp int[[erface]]
 oneaccess_oneos_show_route-map.textfsm, .*, oneaccess_oneos, sh[[ow]] route-map
 
 paloalto_panos_show_running_security-policy.textfsm, .*, paloalto_panos, sh[[ow]] runn[[ing]] security[[-policy]]
@@ -739,6 +747,13 @@ watchguard_firebox_show_arp.textfsm, .*, watchguard_firebox, sh[[ow]] arp
 yamaha_show_environment.textfsm, .*, yamaha, sh[[ow]] en[[vironment]]
 yamaha_show_ip_route.textfsm, .*, yamaha, sh[[ow]] ip ro[[ute]]
 
+zte_zxros_show_mpls_traffic-eng_tunnels.textfsm, .*, zte_zxros, sh[[ow]] mpls traffic-eng tunnels
+zte_zxros_show_interface_brief.textfsm, .*, zte_zxros, sh[[ow]] inter[[face]] br[[ief]]
+zte_zxros_show_isis_adjacency.textfsm, .*, zte_zxros, sh[[ow]] is[[is]] ad[[jacency]]
+zte_zxros_show_interface.textfsm, .*, zte_zxros, sh[[ow]] int[[erface]]
+zte_zxros_show_version.textfsm, .*, zte_zxros, sh[[ow]] ver[[sion]]
+zte_zxros_show_arp.textfsm, .*, zte_zxros, sh[[ow]] arp
+
 zyxel_os_cfg_lan_get_--Name_name.textfsm, .*, zyxel_os, cfg lan get --Name .+
 zyxel_os_zycli_Ethctl_media-type.textfsm, .*, zyxel_os, zycli Ethctl media-type(\s\w+)*
 zyxel_os_cfg_firewall_acl_get.textfsm, .*, zyxel_os, cfg firewall(\s|_)acl get

diff --git a/ntc_templates/templates/juniper_junos_show_interfaces.textfsm b/ntc_templates/templates/juniper_junos_show_interfaces.textfsm
@@ -2,19 +2,54 @@ Value Required INTERFACE (\S+)
 Value LINK_STATUS (\w+)
 Value ADMIN_STATE (\S+)
 Value HARDWARE_TYPE (\S+)
-Value DESCRIPTION (\w+.*)
+Value DESCRIPTION (.*)
 Value DESTINATION (\S+)
 Value LOCAL (\S+)
 Value MTU (\d+|Unlimited)
 
 Start
-  ^\s*\S+\s+interface -> Continue.Record
+  ^\s*\S+\s+[Ii]nterface -> Continue.Record
   ^Physical\s+interface:\s+${INTERFACE},\s+${ADMIN_STATE},\s+Physical\s+link\s+is\s+${LINK_STATUS}
-  ^.*Description:\s+${DESCRIPTION}
-  ^.*ype:\s+${HARDWARE_TYPE},.*MTU:\s+${MTU}.*
+  ^\s+Interface index:
+  ^\s+Description:\s+${DESCRIPTION}$$
+  # match "Type: xx, Link-level type:" and "  Link-level type:"
+  ^.*\s+Link-level\s+type:\s+${HARDWARE_TYPE},\s+MTU:\s+${MTU}(,.+)?$$
+  ^\s+Pad to minimum frame size:
+  ^\s+Link-mode
+  ^\s+MAC-REWRITE
+  ^\s+Flow control
+  ^\s+Device [Ff]lags
+  ^\s+Interface flags
+  ^\s+Link flags
+  ^\s+Physical info
+  ^\s+CoS queues
+  ^\s+Schedulers
+  ^\s+Current address
+  ^\s+Last flapped
+  ^\s+Input rate
+  ^\s+Output rate
+  ^\s+Active alarms
+  ^\s+Active defects
+  ^\s+PCS statistics
+  ^\s+Bit errors
+  ^\s+Errored blocks
+  ^\s+Interface transmit statistics
+  #
   ^\s+Logical\s+interface\s+${INTERFACE}
   ^\s+Flags:\s+${LINK_STATUS}\s+\S+\s+\w+\s+(\S+\s+)*Encapsulation:
   ^\s+Protocol\s+inet.*,\s+MTU:\s+${MTU}
-  ^.*Destination:\s+${DESTINATION},\s+Local:\s+${LOCAL},.*
-  ^\s*$$
+  ^\s+Flags
+  ^\s+Input packets
+  ^\s+Output packets
+  ^\s+Security
+  ^\s+Protocol
+  ^\s+Flags
+  ^\s+Address
+  ^\s+Bandwidth
+  ^\s+Routing
+  ^\s+Max
+  ^\s+Destination:\s+${DESTINATION},\s+Local:\s+${LOCAL},.*
+  ^\s+MAC:
   ^{master:\d+}
+  ^\s*$$
+  ^. -> Error