Merge branch 'master' into alcatel_aos_show_lldp_remote-system

ntc_templates/templates/alcatel_aos_show_interfaces_status.textfsm

@@ -0,0 +1,31 @@
+Value PORT ((\d+\/?)+)
+Value ADMIN_STATUS (\S+)
+Value AUTO_NEGOTIATION (\S+)
+Value DETECTED_SPEED (\d+)
+Value DETECTED_DUPLEX (\S+)
+Value DETECTED_HYBRID (\S+)
+Value DETECTED_PAUSE (\S+)
+Value DETECTED_FEC (\S+)
+Value CONFIGURED_SPEED (\S+)
+Value CONFIGURED_DUPLEX (\S+)
+Value CONFIGURED_HYBRID (\S+)
+Value CONFIGURED_PAUSE (\S+)
+Value CONFIGURED_FEC (\S+)
+Value LINK_TRAP (\S+)
+Value ENERGY_EFFICIENT_ETHERNET (\S+)
+
+Start
+  ^\s*-+\+
+  ^\s*${PORT}\s+${AUTO_NEGOTIATION}\s*(-|${DETECTED_SPEED})\s*(-|${DETECTED_DUPLEX})\s*(-|${DETECTED_HYBRID})\s*${CONFIGURED_SPEED}\s*${CONFIGURED_DUPLEX}\s*${CONFIGURED_HYBRID}\s*(-|${LINK_TRAP})\s*$$ -> Record
+  ^\s*${PORT}\s+${ADMIN_STATUS}\s+${AUTO_NEGOTIATION}\s+(-|${DETECTED_SPEED})\s+(-|${DETECTED_DUPLEX})\s+(-|${DETECTED_PAUSE})\s+(-|${DETECTED_FEC})\s+${CONFIGURED_SPEED}\s+${CONFIGURED_DUPLEX}\s+(-|${CONFIGURED_PAUSE})\s+${CONFIGURED_FEC}\s+(-|${LINK_TRAP})\s+${ENERGY_EFFICIENT_ETHERNET}\s*$$ -> Record
+  ^\s*(Chas/\s+)?DETECTED(-VALUES)?\s+CONFIGURED(-VALUES)?\s*$$
+  # R6 version
+  ^\s*Slot/\s+AutoNego\s+Speed\s+Duplex\s+Hybrid\s+Speed\s+Duplex\s+Hybrid\s+Trap\s*$$
+  ^\s*(\S+\s+\(Mbps\)\s+)+Mode\s+LinkUpDown\s*$$
+  # R8 version
+  ^\s*Slot/\s+Admin\s+Auto\s+Speed\s+Duplex\s+Pause\s+FEC\s+Speed\s+Duplex\s+Pause\s+FEC\s+Link\s*$$
+  ^\s*Port\s+Status\s+(\S+\s+\(Mbps\)\s+)+Cfg\s+Trap\s+EEE\s*$$
+  #
+  ^\s*F[A-Z]\s+-\s+Forced
+  ^\s*$$
+  ^.*$$ -> Error

ntc_templates/templates/alcatel_aos_show_mac-address-table.textfsm

@@ -8,13 +8,12 @@ Value OPERATION (\S+)
 Value INTERFACE (\S+)
 
 Start
-  ^\s*Vlan\s*Mac\s*Address\s*Type\s*Protocol\s*Operation\s*Interface\s*$$
+  ^\s+Vlan\s+Mac\s+Address\s+Type\s+Protocol\s+Operation\s+Interface\s+$$
   ^\s*-+\+
-  ^\s*${ADDRESS_NOT_VALID}${VLAN_ID}\s*${MAC}\s*${TYPE}\s*(---|${PROTOCOL})\s*${OPERATION}\s*${INTERFACE}\s*$$ -> Record
-  ^\s*Domain\s*Vlan\/SrvcId\[ISId\/vnId\]\s*Mac\s*Address\s*Type\s*Operation\s*Interface\s*$$
-  ^\s*${DOMAIN}\s*${VLAN_ID}\s*${MAC}\s*${TYPE}\s*${OPERATION}\s*${INTERFACE}\s*$$ -> Record
-  ^\s*Total\s*number\s*of\s*Valid\s*MAC\s*addresses\s*above\s*=\s*\d+\s*$$ -> Record
-  ^Legend
-  ^\s+Mac\s+Address:
+  ^\s*${ADDRESS_NOT_VALID}${VLAN_ID}\s+${MAC}\s+${TYPE}\s+(---|${PROTOCOL})\s+${OPERATION}\s+${INTERFACE}\s*$$ -> Record
+  ^\s*Domain\s+Vlan\/SrvcId\[ISId\/vnId\]\s+Mac\s+Address\s+Type\s+Operation\s+Interface\s*$$
+  ^\s*${DOMAIN}\s+${VLAN_ID}\s+${MAC}\s+${TYPE}\s+${OPERATION}\s+${INTERFACE}\s*$$ -> Record
+  ^\s*Total\s+number\s+of\s+Valid\s+MAC\s+addresses\s+above\s+=\s+\d+\s*$$ -> Record
+  ^\s*(Legend:\s+)?Mac\s+Address:
   ^\s*$$
   ^.*$$ -> Error

ntc_templates/templates/alcatel_aos_show_vlan_port.textfsm

@@ -7,5 +7,5 @@ Start
   ^\s*vlan\s*port\s*type\s*status\s*$$
   ^\s*[-+]+\s*$$
   ^\s*${VLAN_ID}\s*${PORT}\s*${TYPE}\s*${STATUS}\s*$$ -> Record
-  ^\s*
+  ^\s*$$
   ^.*$$ -> Error

ntc_templates/templates/alcatel_sros_show_lag_port.textfsm

@@ -1,5 +1,5 @@
 Value LAG_ID (\d+\(\w\))
-Value PORT_ID (\d+/\d+/\d+)
+Value PORT_ID (\S+)
 Value ADMIN_STATUS (up|down)
 Value ACTIVE_STATUS (active|standby)
 Value OPERATIONAL_STATUS (up|down)
@@ -19,8 +19,8 @@ Start
   ^. -> Error
 
 LagPort
-  ^${LAG_ID}\s+${PORT_ID}\s+${ADMIN_STATUS}\s+${ACTIVE_STATUS}\s+${OPERATIONAL_STATUS}\s+${PRIMARY}\s+${SUB_GROUP}\s+${FORCED}\s+${PRIORITY}(\s|$$) -> Record
-  ^\s+${PORT_ID}\s+${ADMIN_STATUS}\s+${ACTIVE_STATUS}\s+${OPERATIONAL_STATUS}\s+${SUB_GROUP}\s+${FORCED}\s+${PRIORITY}(\s|$$) -> Record
+  ^${LAG_ID}\s+${PORT_ID}\s+${ADMIN_STATUS}\s+${ACTIVE_STATUS}\s+${OPERATIONAL_STATUS}\s+${PRIMARY}\s+${SUB_GROUP}\s+${FORCED}\s+${PRIORITY}\s*$$ -> Record
+  ^\s+${PORT_ID}\s+${ADMIN_STATUS}\s+${ACTIVE_STATUS}\s+${OPERATIONAL_STATUS}\s+${SUB_GROUP}\s+${FORCED}\s+${PRIORITY}\s*$$ -> Record
   ^\s*$$
   ^-+
   ^=+

ntc_templates/templates/arista_eos_show_interfaces.textfsm

@@ -12,15 +12,30 @@ Value INTERFACE_UP_TIME (.*)
 Value LINK_STATUS_CHANGE (\d+)
 
 Start
-  ^\S+\s+is\s+\S+,\s+line\s+protocol\s+is\s+\S+\s+\S+ -> Continue.Record
+  ^\S+\s+is\s+\S+(\s+\S+)?, -> Continue.Record
   ^${INTERFACE}\s+is\s+${LINK_STATUS},\s+line\s+protocol\s+is\s+${PROTOCOL_STATUS}
   ^\s+Hardware\s+is\s+${HARDWARE_TYPE}(.*address\s+is\s+${MAC_ADDRESS})*(.*bia\s+${BIA})*
   ^\s+Description:\s+"?${DESCRIPTION}"?$$
   ^\s+Internet\s+address\s+is\s+${IP_ADDRESS}
   ^\s+(Up|Down)\s+${INTERFACE_UP_TIME}
   ^\s+${LINK_STATUS_CHANGE}\s+link\s+status\s+changes.*
   ^.*MTU\s+${MTU}(.*BW\s+${BANDWIDTH})*
-  ^\s*
+  ^\s+Broadcast\s+address
+  ^\s+Address\s+determined
+  ^\s+\S+(-|\s)duplex,
+  ^\s+Last\s+clearing
+  ^\s+\d+\s+\S+\s+(in|out)put\s+rate
+  ^\s+\d+\s+packets\s+(in|out)put,
+  ^\s+(Sent|Received)\s+\d+\s+broadcasts,
+  ^\s+\d+\s+runts,
+  ^\s+\d+\s+(in|out)put\s+errors,
+  ^\s+\d+\s+PAUSE
+  ^\s+\d+\s+late\s+collision,
+  ^\s+Loopback\s+Mode\s*:
+  ^\s+Active\s+members
+  ^\s+Fallback\s+mode
+  ^\s+IPv6\s+link-local
+  ^\s+.+IPv6\s+global\s+unicast
+  ^\s+[\dA-Fa-f:]+,\s+subnet\s+is
+  ^\s*$$
   ^. -> Error
-
-EOF

ntc_templates/templates/arista_eos_show_interfaces_status.textfsm

@@ -9,5 +9,6 @@ Value TYPE (.+?)
 Start
   ^${PORT}\s+${NAME}\s+${STATUS}\s+(?:in\s+)?${VLAN_ID}\s+${DUPLEX}\s+${SPEED}\s+${TYPE}\s*$$ -> Record
   ^${PORT}\s+${STATUS}\s+(?:in\s+)?${VLAN_ID}\s+${DUPLEX}\s+${SPEED}\s+${TYPE}\s*$$ -> Record
-  ^\s*
+  ^Port\s+Name\s+Status\s+Vlan\s+Duplex\s+Speed\s+Type\s*$$
+  ^\s*$$
   ^. -> Error

ntc_templates/templates/cisco_asa_show_asp_table_vpn-context_detail.textfsm

@@ -33,5 +33,5 @@ Start
   ^Rekey\s+Pkt\s+=\s+${REKEY_PKT}
   ^Rekey\s+Call\s+=\s+${REKEY_CALL}
   ^VPN\s+Filter\s+=\s+${VPN_FILTER}
-  ^\s*
+  ^\s*$$
   ^. -> Error

ntc_templates/templates/cisco_asa_show_cpu_usage_detailed.textfsm

@@ -14,9 +14,9 @@ Start
   ^Break\s+down\s+of\s+per-core\s+data\s+path\s+versus\s+control\s+point\s+cpu\s+usage:
   ^Core\s+5\s+sec\s+1\s+min\s+5\s+min
   ^${CORE}\s+${CPU_5_SEC}\s+\(${CPU_5_SEC_DP}\s+\+\s+${CPU_5_SEC_CP}\)\s+${CPU_1_MIN}\s+\(${CPU_1_MIN_DP}\s+\+\s+${CPU_1_MIN_CP}\)\s+${CPU_5_MIN}\s+\(${CPU_5_MIN_DP}\s+\+\s+${CPU_5_MIN_CP}.+ -> Record
-  ^\s*
   ^Current\s+control\s+point\s+elapsed\s+versus\s+the\s+maximum\s+control\s+point\s+elapsed\s+for:
   ^CPU\s+utilization\s+of\s+external\s+processes\s+for:
   ^Total\s+CPU\s+utilization\s+for:
-  ^5\s+seconds\s+=\s+\d+.\d+%;\s+1\s+minute:\s+\d+.\d+%;\s+5\s+minutes:\s+\d+.\d+%
-  ^.*$$ -> Error
+  ^\s+\d+\s+seconds\s+=\s+\d+.\d+%
+  ^\s*$$
+  ^. -> Error

ntc_templates/templates/cisco_asa_show_nat.textfsm

@@ -31,5 +31,5 @@ Start
   ^(Manual|Auto) NAT Policies \(Section ${NAT_SECTION_NUMBER}\)\s*
   ^${LINE_NUMBER}\s+\(${SOURCE_INTERFACE}\)\s+to\s+\(${DESTINATION_INTERFACE}\)\s+source\s+${SOURCE_TYPE}\s+${SOURCE_REAL}\s+${SOURCE_MAPPED}\s*(destination\s+static\s+${DESTINATION_REAL}\s+${DESTINATION_MAPPED})?\s*(service\s+${SERVICE_PROTOCOL}?\s*${SERVICE_REAL}\s+${SERVICE_MAPPED})?\s*${EXTENDED}?\s*${FLAT}?\s*${INCLUDE_RESERVE}?\s*${ROUND_ROBIN}?\s*${NET_TO_NET}?\s*${DNS}?\s*${UNIDIRECTIONAL}?\s*${NO_PROXY_ARP}?\s*${ROUTE_LOOKUP}?\s*${INACTIVE}?\s*(description\s+${DESCRIPTION})?
   ^\s+translate_hits\s+=\s+${TRANSLATE_HITS},\s+untranslate_hits\s+=\s+${UNTRANSLATE_HITS} -> Record
-  ^\s*
+  ^\s*$$
   ^. -> Error

ntc_templates/templates/cisco_asa_show_vpn-sessiondb_detail_l2l.textfsm

@@ -72,7 +72,7 @@ Start
   ^. -> Error
 
 Connection
-  ^\s*Connection\s*:\s+${CONNECTION}\s*$$
+  ^\s*Connection\s*:(\s+${CONNECTION})?\s*$$
   ^\s*Index\s*:\s+${INDEX}\s+IP\s+Addr\s*:\s+${IP_ADDRESS}\s*$$
   ^\s*Protocol\s*:\s+${PROTOCOL}(?:\s+Encryption\s*:\s+${ENCRYPTION}|)\s*$$
   ^\s*Encryption\s*:\s+${ENCRYPTION}\s+Hashing\s*:\s+${HASHING}\s*$$

ntc_templates/templates/cisco_ios_show_platform.textfsm

@@ -0,0 +1,14 @@
+Value INDEX (\d+)
+Value PORTS (\d+)
+Value MODEL (\S+)
+Value SERIAL (\S+)
+Value MAC (\S+)
+Value HARDWARE_VERSION (\S+)
+Value SOFTWARE_VERSION (\d+\.\d+\.\d+)
+
+Start
+  ^Switch\s+Ports\s+Model\s+Serial\s+No\.\s+MAC\s+address\s+Hw\s+Ver\.\s+Sw\s+Ver\.\s*$$
+  ^(-+\s*)+$$
+  ^\s*${INDEX}\s+${PORTS}\s+${MODEL}\s+${SERIAL}\s+${MAC}\s+${HARDWARE_VERSION}\s+${SOFTWARE_VERSION}\s* -> Record
+  ^\s*$$
+  ^. -> Error

ntc_templates/templates/cisco_nxos_show_ip_arp_detail.textfsm

@@ -13,5 +13,5 @@ Start
   ^. -> Error
 
 Data
-  ^${IP_ADDRESS}\s+${AGE}\s+${MAC_ADDRESS}\s+${INTERFACE}\s+${PHYSICAL_INTERFACE}\s*$$ -> Record
+  ^${IP_ADDRESS}\s+${AGE}\s+${MAC_ADDRESS}\s+${INTERFACE}\s+${PHYSICAL_INTERFACE}(?:\s+[#*+])?\s*$$ -> Record
   ^. -> Error

ntc_templates/templates/cisco_wlc_ssh_show_802.11a.textfsm

@@ -22,7 +22,6 @@ Value VIDEO_ROAMING_BANDWIDTH (\d+|)
 Value MAX_CLIENT (\d+)
 
 
-
 Start
   ^802.11(a|b)\sNetwork\.*\s${STATUS}s*$$ -> Spec_support
   ^Beacon\sInterval\.*\s${BEACON_INTERVAL}s*$$
@@ -61,7 +60,7 @@ Spec_support
 Data_Rates
   ^\s+802.11(a|g|b|(b\/g))\s${DATA_RATE}\s+Rate\.*\s+${DATA_RATE_VALUE}s*$$
   ^802.11n\s+MCS\s+Settings: -> MCS_Rates
-  ^\s*
+  ^\s*$$
   ^. -> Error
 
 MCS_Rates

ntc_templates/templates/dell_powerconnect_show_interfaces_description.textfsm

@@ -8,5 +8,5 @@ Begin
   ^-+
   ^Ch\s+Description -> End
   ^${INTERFACE}\s*${DESCRIPTION}\s*$$ -> Record
-  ^\s*
+  ^\s*$$
   ^. -> Error

ntc_templates/templates/dell_powerconnect_show_interfaces_status.textfsm

@@ -9,13 +9,15 @@ Value BACKPRESSURE (Disabled|Enabled|--)
 Value MDIXMODE (Off|On|--)
 
 Start
-  ^Port\s+Type\s+Duplex\s+Speed\s+Neg\s+ctrl\s+State\s+Pressure\s+Mode -> Begin
+  ^Flow\s+Link\s+Back\s+Mdix\s*$$
+  ^Port\s+Type\s+Duplex\s+Speed\s+Neg\s+ctrl\s+State\s+Pressure\s+Mode\s*$$ -> Begin
+  ^\s*$$
+  ^. -> Error
 
 Begin
-  ^\s+Flow\s+Link\s+Back\s+Mdix
-  ^-+
   ^${PORT}\s+${TYPE}\s+${DUPLEX}\s+${SPEED}\s+${NEG}\s+${FLOWCTRL}\s+${LINKSTATE}\s+${BACKPRESSURE}\s+${MDIXMODE} -> Record
-  ^\s+Flow\s+Link
-  ^Ch\s+Type\s+Duplex\s+Speed\s+Neg\s+control\s+State -> End
-  ^\s*
+  ^-+
+  ^Flow\s+Link\s*$$
+  ^Ch\s+Type\s+Duplex\s+Speed\s+Neg\s+control\s+State -> EOF
+  ^\s*$$
   ^. -> Error

ntc_templates/templates/extreme_exos_show_iparp.textfsm

@@ -14,6 +14,19 @@ Start
 Start_record
   ^\s*---
   ^${VR}\s+${DESTINATION}\s+\(*${MAC_ADDRESS}\)*\s+${AGE}\s+${STATIC}\s+${VLAN}\s+${VID}(\s+${PORT})?\s*$$ -> Record
-  ^(\S+\s*){1,4}:
+  ^\s*(Dynamic|Pending)\s+Entries\s*:
+  ^\s*(In|Out|Failed)\s+Requests?\s*:
+  ^\s*Proxy\s+Answered\s*:
+  ^\s*Rx\s+Error\s*:
+  ^\s*Rejected\s+(Count|Port)\s*:
+  ^\s*Max\s+((ARP|Pending|Proxy)\s+)?[Ee]ntries\s*:
+  ^\s*ARP\s+address\s+check\s*:
+  ^\s*Timeout\s*:
+  ^\s*Distributed\s+mode\s*:
+  ^\s*ARP\s+Sender-Mac\s+Learning\s*:
+  ^\s*Locktime\s*:
+  ^\s*(Retransmit|Reachable)\s+Time\s*:
+  ^\s*Fast\s+Convergence\s*:
+  ^\s*ARP\s+Global\s+Settings\s*$$
   ^\s*$$
   ^. -> Error

ntc_templates/templates/extreme_exos_show_ipconfig.textfsm

@@ -48,16 +48,16 @@ Start
   ^\s*\(t\)\s+Tentative\s+address,\s+\(T\)\s+Time\s+Stamp\s+Reply\s+Enabled\s*$$
   ^\s*\(u\)\s+Send\s+Unreachables\s+Enabled,\s+\(U\)\s+Interface\s+Up\s*$$
   ^\s*\(v\)\s+VRRP\s+Enabled,\s+\(X\)\s+Send\s+Time\s+Exceeded\s+Enabled\s*$$
-  ^\s*
+  ^\s*$$
   ^. -> Error
 
 Irdp
   ^\s*Advertisement\s+Address:\s+${IRDP_ADVERTISEMENT_ADDRESS}\s+Maximum\s+Interval:\s+${IRDP_MAX_INTERVAL}\s*$$
   ^\s*Minimum\s+Interval:\s+${IRDP_MIN_INTERVAL}\s+Lifetime:\s+${IRDP_LIFETIME}\s+Preference:\s+${IRDP_PREFERENCE}\s*$$
-  ^\s* -> Start
+  ^\s*$$ -> Start
   ^. -> Error
 
 IpAdresses
   ^\s*${INTERFACE}\s+${IP}\s+${SUBNET}\s+${FLAGS}\s+${NSIA}\s*$$
-  ^\s* -> Start
+  ^\s*$$ -> Start
   ^. -> Error

ntc_templates/templates/extreme_exos_show_ports_description.textfsm

@@ -8,11 +8,11 @@ Value DESCRIPTION (.*)
 
 Start
   ^\s*Port\s+Display\s+String\s+Description\s+String\s*$$ -> Ports
-  ^\s*
+  ^\s*$$
   ^. -> Error
 
 Ports
   ^(\s*=+)+\s*$$
   ^\s*${INTERFACE}(?:\s+${DESCRIPTION})?\s*$$ -> Record
-  ^\s*
+  ^\s*$$
   ^. -> Error

ntc_templates/templates/extreme_exos_show_ports_information.textfsm

@@ -12,30 +12,14 @@ Value QOS_PROFILE (\S+)
 Value LOAD_MASTER (.*)
 
 Start
-  ^\s*Port\s+Flags\s+Link\s+ELSM\s+Link\s+Num\s+Num\s+Num\s+Jumbo\s+QOS\s+Load\s*$$ -> Ports
-  ^\s*
+  ^\s*Port\s+Flags\s+Link\s+ELSM\s+Link\s+Num\s+Num\s+Num\s+Jumbo\s+QOS\s+Load\s*$$
+  ^\s+State\s+/OAM\s+UPS\s+STP\s+VLAN\s+Proto\s+Size\s+profile\s+Master\s*$$
+  ^(\s*=+)+\s*$$ -> Ports
+  ^\s*$$
   ^. -> Error
 
 Ports
-  ^State\s+/OAM\s+UPS\s+STP\s+VLAN\s+Proto\s+Size\s+profile\s+Master\*$$
-  ^(\s*=+)+\s*$$
   ^\s*${INTERFACE}\s+${FLAGS}\s+${LINK_STATE}\s+${ELSM}\s*/\s*${OAM}\s+${LINK_UPS}\s+${NUM_STP}\s+${NUM_VLAN}\s+${NUM_PROTO}\s+${JUMBO_SIZE}\s+${QOS_PROFILE}(?:\s+${LOAD_MASTER})?\s*$$ -> Record
-  ^\s*>\s+indicates\s+Port\s+Display\s+Name\s+truncated\s+past\s+8\s+characters\s*$$
-  ^\s*Flags\s+:\s+a\s+-\s+Load\s+Sharing\s+Algorithm\s+address-based,\s+D\s+-\s+Port\s+Disabled,\s*$$
-  ^\s*e\s+-\s+Extreme\s+Discovery\s+Protocol\s+Enabled,\s+E\s+-\s+Port\s+Enabled,\s*$$
-  ^\s*g\s+-\s+Egress\s+TOS\s+Enabled,\s+i\s+-\s+Isolation,\s+j\s+-\s+Jumbo\s+Frame\s+Enabled,\s*$$
-  ^\s*l\s+-\s+Load\s+Sharing\s+Enabled,\s+m\s+-\s+MACLearning\s+Enabled,\s*$$
-  ^\s*n\s+-\s+Ingress\s+TOS\s+Enabled,\s+o\s+-\s+Dot1p\s+Replacement\s+Enabled,\s*$$
-  ^\s*P\s+-\s+Software\s+redundant\s+port\(Primary\),\s*$$
-  ^\s*R\s+-\s+Software\s+redundant\s+port\(Redundant\),\s*$$
-  ^\s*q\s+-\s+Background\s+QOS\s+Monitoring\s+Enabled,\s*$$
-  ^\s*s\s+-\s+diffserv\s+Replacement\s+Enabled,\s*$$
-  ^\s*v\s+-\s+Vman\s+Enabled,\s+f\s+-\s+Unicast\s+Flooding\s+Enabled,\s*$$
-  ^\s*M\s+-\s+Multicast\s+Flooding\s+Enabled,\s+B\s+-\s+Broadcast\s+Flooding\s+Enabled\s*$$
-  ^\s*L\s+-\s+Extreme\s+Link\s+Status\s+Monitoring\s+Enabled\s*$$
-  ^\s*O\s+-\s+Ethernet\s+OAM\s+Enabled\s*$$
-  ^\s*w\s+-\s+MACLearning\s+Disabled\s+with\s+Forwarding\s*$$
-  ^\s*b\s+-\s+Rx\s+and\s+Tx\s+Flow\s+Control\s+Enabled,\s+x\s+-\s+Rx\s+Flow\s+Control\s+Enabled\s*$$
-  ^\s*p\s+-\s+Priority\s+Flow\s+Control\s+Enabled\s*$$
-  ^\s*
+  ^\s*=+\s*$$ -> EOF
+  ^\s*$$
   ^. -> Error

ntc_templates/templates/extreme_exos_show_sharing.textfsm

@@ -10,7 +10,7 @@ Value List LINK_UP_TRANSITIONS (\d+)
 Start
   ^\s*Load\s+Sharing\s+Monitor\s*$$
   ^\s*Config\s+Current\s+Agg\s+Ld\s+Share\s+Ld\s+Share\s+Agg\s+Link\s+Link\s+Up\s*$$ -> SharingTable
-  ^\s*
+  ^\s*$$
   ^. -> Error
 
 SharingTable
@@ -25,5 +25,5 @@ SharingTable
   ^\s*\(custom\)\s+User-selected\s+address-based\s+configuration\s*$$
   ^\s*Custom\s+Algorithm\s+Configuration:\s+.*\s*$$
   ^\s*Number\s+of\s+load\s+sharing\s+trunks:\s+\d+\s*$$
-  ^\s*
+  ^\s*$$
   ^. -> Error

ntc_templates/templates/extreme_exos_show_vlan_description.textfsm

@@ -5,13 +5,15 @@ Value DESCRIPTION (.*)
 Start
   ^(\s*=+)+\s*$$
   ^\s*Name\s+VID\s+Description\s*$$ -> VlanTable
-  ^\s*
+  ^\s*-+\s*$$
+  ^\s*$$
   ^. -> Error
 
 VlanTable
   ^(\s*=+)+\s*$$
   ^\s*${VLAN_NAME}\s+${VLAN_ID}(?:\s+${DESCRIPTION})?\s*$$ -> Record
   ^\s*>\s+Indicates\s+description\s+string\s+truncated\s+past\s+\d+\s+characters\s*$$
   ^\s*Total\s+number\s+of\s+VLAN\(s\)\s*:\s*\d+\s*$$
-  ^\s*
+  ^\s*-+\s*$$
+  ^\s*$$
   ^. -> Error

ntc_templates/templates/fortinet_get_system_arp.textfsm

@@ -5,6 +5,6 @@ Value INTERFACE (.*)
 
 Start
   ^${IP_ADDRESS}\s+${AGE}\s+${MAC_ADDRESS}\s+${INTERFACE} -> Record
-  ^Address\s+Age(min)\s+Hardware\s+Addr\s+Interface\s*$$
-  ^\s*
+  ^Address\s+Age\(min\)\s+Hardware\s+Addr\s+Interface\s*$$
+  ^\s*$$
   ^. -> Error

ntc_templates/templates/huawei_smartax_display_ont_autofind.textfsm

@@ -30,5 +30,7 @@ Start
   ^\s*Ont\s+Equipment\s+SN\s+:\s+${ONT_EQUIPMENT_SERIAL_NUMBER}
   ^\s*Ont\s+autofind\s+time\s+:\s+${ONT_AUTOFIND_TIME}
   ^\s*Multi\s+channel\s+:\s+${MULTI_CHANNEL} -> Record
-  ^\s*
-  ^. -> Error
+  ^\s*-+\s*$$
+  ^\s*(Loid|Checkcode)\s*:
+  ^\s*$$
+  ^. -> Error

ntc_templates/templates/huawei_smartax_display_ont_gemport_0_ontid_0.textfsm

@@ -11,5 +11,8 @@ Start
   ^\s*ID\s*ID\s*type\s*PQ\s*PQ\s*table\s*index
   ^\s+${GEM_PORT}\s+${T_CONT_ID}\s+${SERVICE_TYPE}\s+${ENCRYPT}\s+(-|${UPSTREAM_PQ})\s+(-|${DOWNSTREAM_PQ})\s+(-|${TRAFFIC_TABLE_INDEX}) -> Record
   ^\s*The\s*number\s*of\s*GEM\s*ports\s*is:\s*\d+
-  ^\s*
+  ^\s*(\S/)+\S:\s+(\d/)+\d\s+ONT\s+ID:\s+\d
+  ^\s*-+\s*$$
+  ^\s*$$
+  ^\s*Notes: -> EOF
   ^. -> Error

ntc_templates/templates/huawei_smartax_display_ont_port_vlan_0_1_byport_eth_0.textfsm

@@ -19,8 +19,10 @@ Start
   ^\s*Native\s*VLAN\s*:\s*${NATIVE_VLAN}\s*
   ^\s*Default\s*priority\s*:\s*${DEFAULT_PRIORITY}\s*
   ^\s*Downstream\s*mode\s*:\s*${DOWNSTREAM_MODE}\s*
-  ^\s*Mismatch\s*policy\s*:\s*${MISMATCH_POLICY}\s* 
-  ^\s*
+  ^\s*Mismatch\s*policy\s*:\s*${MISMATCH_POLICY}\s*
+  ^\s*-+\s*$$
+  ^\s*Notes: -> EOF
+  ^\s*$$
   ^. -> Error
 
 EOF