Fix empty line strings to have end-of-line match (#1927)

jmcgill298 · web-flow · commit aee4973ad944 · 2024-12-05T17:35:41.000-05:00
diff --git a/ntc_templates/templates/alcatel_aos_show_vlan_port.textfsm b/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
diff --git a/ntc_templates/templates/arista_eos_show_interfaces.textfsm b/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
diff --git a/ntc_templates/templates/arista_eos_show_interfaces_status.textfsm b/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
diff --git a/ntc_templates/templates/cisco_asa_show_asp_table_vpn-context_detail.textfsm b/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
diff --git a/ntc_templates/templates/cisco_asa_show_cpu_usage_detailed.textfsm b/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
diff --git a/ntc_templates/templates/cisco_asa_show_nat.textfsm b/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
diff --git a/ntc_templates/templates/cisco_wlc_ssh_show_802.11a.textfsm b/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
diff --git a/ntc_templates/templates/dell_powerconnect_show_interfaces_description.textfsm b/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
diff --git a/ntc_templates/templates/dell_powerconnect_show_interfaces_status.textfsm b/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
diff --git a/ntc_templates/templates/extreme_exos_show_ipconfig.textfsm b/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
diff --git a/ntc_templates/templates/extreme_exos_show_ports_description.textfsm b/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
diff --git a/ntc_templates/templates/extreme_exos_show_ports_information.textfsm b/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
diff --git a/ntc_templates/templates/extreme_exos_show_sharing.textfsm b/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
diff --git a/ntc_templates/templates/extreme_exos_show_vlan_description.textfsm b/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
diff --git a/ntc_templates/templates/fortinet_get_system_arp.textfsm b/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
diff --git a/ntc_templates/templates/huawei_smartax_display_ont_autofind.textfsm b/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
diff --git a/ntc_templates/templates/huawei_smartax_display_ont_gemport_0_ontid_0.textfsm b/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
diff --git a/ntc_templates/templates/huawei_smartax_display_ont_port_vlan_0_1_byport_eth_0.textfsm b/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
diff --git a/ntc_templates/templates/huawei_smartax_display_ont_port_vlan_0_1_byvlan_0.textfsm b/ntc_templates/templates/huawei_smartax_display_ont_port_vlan_0_1_byvlan_0.textfsm
@@ -12,5 +12,7 @@ Start
   ^\s*C-VLAN\s*C-PRI\s*ETH-type\s*VLAN-type\s*Port\s*Port\s*S-VLAN\s*S-PRI\s*
   ^\s*type\s*ID\s*POLICY
   ^\s+${C_VLAN}\s+(-|${C_PRI})\s+${ETH_TYPE}\s+${VLAN_TYPE}\s+${PORT_TYPE}\s+${PORT_ID}\s+${S_VLAN}\s+(-|${S_PRI})\s*(-|${S_PRI_POLICY})\s* -> Record
-  ^\s*
+  ^\s*-+\s*$$
+  ^\s*Notes: -> EOF
+  ^\s*$$
   ^. -> Error
diff --git a/ntc_templates/templates/huawei_smartax_display_ont_snmp-profile_0_all.textfsm b/ntc_templates/templates/huawei_smartax_display_ont_snmp-profile_0_all.textfsm
@@ -5,5 +5,6 @@ Value SNMP_PROFILE_NAME (\S+)
 Start
   ^\s*ONT\s*ID\s*SNMP\s*profile\s*ID\s*SNMP\s*profile\s*name\s*
   ^\s*${ONT_ID}\s*${SNMP_PROFILE_ID}\s*${SNMP_PROFILE_NAME} -> Record
-  ^\s*
+  ^\s*-+\s*$$
+  ^\s*$$
   ^. -> Error
diff --git a/ntc_templates/templates/huawei_smartax_display_port_info.textfsm b/ntc_templates/templates/huawei_smartax_display_port_info.textfsm
@@ -47,5 +47,7 @@ Start
   ^\s*Channel\w*\s*Information\s*
   ^\s*Channel\s*Type\s*${CHANNEL_TYPE}
   ^\s*Online\s*ONT\s*number\s*threshold\s*${ONLINE_ONT_NUMBER_THRESHOLD}
-  ^\s*
-  ^. -> Error
+  ^\s*-+\s*$$
+  ^\s*Channel\s+\d+\s+Information
+  ^\s*$$
+  ^. -> Error
diff --git a/ntc_templates/templates/mikrotik_routeros_ip_neighbor_print_detail.textfsm b/ntc_templates/templates/mikrotik_routeros_ip_neighbor_print_detail.textfsm
@@ -37,7 +37,8 @@ Start
   ^.*\s+ipv6=${IPV6} -> Continue
   ^.*\s+interface-name="${INTERFACE_NAME}" -> Continue
   ^.*\s+system-description="${SYSTEM_DESCRIPTION}" -> Continue
+  ^.*\s+system-caps="?${SYSTEM_CAPS}"?\s*$$
   ^.*\s+system-caps="?${SYSTEM_CAPS}"? -> Continue
-  ^.*\s+system-caps-enabled="?${SYSTEM_CAPS_ENABLED}"? -> Continue
-  ^\s*
+  ^.*\s+system-caps-enabled="?${SYSTEM_CAPS_ENABLED}"?
+  ^\s*$$
   ^. -> Error
diff --git a/ntc_templates/templates/oneaccess_oneos_show_system_hardware.textfsm b/ntc_templates/templates/oneaccess_oneos_show_system_hardware.textfsm
@@ -46,5 +46,21 @@ Start
   ^\s*Uplink\s+:\s+${UPLINK_PORTS}\s
   ^\s*Wlan\s+0\s+:\s+${WLAN0}\s
   ^\s*Wlan\s+1\s+:\s+${WLAN1}\s
-  ^\s*
+  ^\s*CPLD\s+Index\s*:
+  ^\s*Local\s*:\s+x\s+Uplink\s*:
+  ^\s*FMAN\s+Freq\s*:
+  ^\s*FPGA\s*:
+  ^\s*Bus\s+Freq\s*:
+  ^\s*FPGA\s+(Index|Ext)\s*:
+  ^\s*M\s+Ext\s*:
+  ^\s*Ram\s+(size|disk)\s*:
+  ^\s*Local\s*:
+  ^\s*PRI\s*:
+  ^\s*PRI\s+Ext\s*:
+  ^\s*Dsp\d+\s*:
+  ^\s*FXS\s*:
+  ^\s*FXS\s+Ext\s*:
+  ^\s*BRI\s*:
+  ^\s*Uplink\s*:
+  ^\s*$$
   ^. -> Error
diff --git a/tests/arista_eos/show_interfaces/arista_eos_show_interfaces.yml b/tests/arista_eos/show_interfaces/arista_eos_show_interfaces.yml
@@ -12,13 +12,25 @@ parsed_sample:
     mac_address: "0800.27dc.5443"
     mtu: "1500"
     protocol_status: "up (connected)"
+  - bandwidth: "10000000 kbit"
+    bia: ""
+    description: "Connects to Ethernet1 on localhost"
+    hardware_type: "Ethernet"
+    interface: "Ethernet2"
+    interface_up_time: "14 minutes, 2 seconds"
+    ip_address: "172.16.2.1/24"
+    link_status: "up"
+    link_status_change: "1"
+    mac_address: "0800.27dc.5443"
+    mtu: "1500"
+    protocol_status: "up (connected)"
   - bandwidth: "100000000 kbit"
     bia: "fcbd.67e2.b922"
-    description: "Connects to Ethernet1 on localhost"
+    description: ""
     hardware_type: "Ethernet"
     interface: "Ethernet49/1"
     interface_up_time: "6 days, 11 hours, 16 minutes, 54 seconds"
-    ip_address: "172.16.2.1/24"
+    ip_address: ""
     link_status: "administratively down"
     link_status_change: "1"
     mac_address: "fcbd.67e2.b922"
@@ -60,3 +72,15 @@ parsed_sample:
     mac_address: "0800.27a5.02b7"
     mtu: "1500"
     protocol_status: "up (connected)"
+  - bandwidth: ""
+    bia: "0800.27dc.5443"
+    description: ""
+    hardware_type: "Vlan"
+    interface: "Vlan10"
+    interface_up_time: "35 seconds"
+    ip_address: "10.0.0.1/24"
+    link_status: "down"
+    link_status_change: ""
+    mac_address: "0800.27dc.5443"
+    mtu: "1500"
+    protocol_status: "lowerlayerdown (notconnect)"
diff --git a/tests/arista_eos/show_interfaces/arista_eos_show_interfaces2.raw b/tests/arista_eos/show_interfaces/arista_eos_show_interfaces2.raw
@@ -1,5 +1,3 @@
-ceos1#show  interface
-
 Ethernet1 is up, line protocol is up (connected)
   Hardware is Ethernet, address is aac1.ab3b.1c7a (bia aac1.ab3b.1c7a)
   Description: "Test interface Et1"
diff --git a/tests/arista_eos/show_interfaces/arista_eos_show_interfaces2.yml b/tests/arista_eos/show_interfaces/arista_eos_show_interfaces2.yml
@@ -84,3 +84,15 @@ parsed_sample:
     mac_address: "001c.7338.71c7"
     mtu: "1500"
     protocol_status: "up (connected)"
+  - bandwidth: ""
+    bia: "001c.7338.71c7"
+    description: "VLAN500"
+    hardware_type: "Vlan"
+    interface: "Vlan500"
+    interface_up_time: "21 minutes, 56 seconds"
+    ip_address: "192.168.5.1/24"
+    link_status: "up"
+    link_status_change: ""
+    mac_address: "001c.7338.71c7"
+    mtu: "1500"
+    protocol_status: "up (connected)"
