Fix template for Eltex's command 'show interface' (#1813)

Co-authored-by: Maxim Shpak <[email protected]>

ntc_templates/templates/eltex_show_interface.textfsm

@@ -1,4 +1,4 @@
-Value INTERFACE ([a-zA-Z\-]+\s*(\d+(/\d+)*)?)
+Value INTERFACE ([a-zA-Z\-]+\s*(?:\d+(?:/\d+)*)?)
 Value STATUS (.*)
 Value IFACE_INDEX (\d+)
 Value MAC_ADDRESS ([a-zA-Z0-9]{2}(:[a-zA-Z0-9]{2}){5})
@@ -17,7 +17,8 @@ Value FEC_STATUS (\S+)
 Value MDIX_MODE_STATUS (\S+)
 Value IFACE_IN_PO_NUM (\d+)
 Value ACTIVE_IFACE_IN_PO_NUM (\d+)
-Value List IFACE_IN_PO ([a-zA-Z\-]+\s*(\d+(/\d+)*)?)
+Value MIN_IFACE_REQUIRED_IN_PO_NUM (\d+)
+Value List IFACE_IN_PO ([a-zA-Z\-]+\s*(?:\d+(?:/\d+)*)?)
 Value List IFACE_IN_PO_BANDWIDTH (\d+[a-zA-Z]+)
 Value List IFACE_IN_PO_STATUS (.*)
 Value SUM_BANDWIDTH ([a-zA-Z0-9]+)
@@ -48,6 +49,9 @@ Value List OUTPUT_QUEUE_PACKETS_PASSED (\d+)
 Value List OUTPUT_QUEUE_PACKETS_DROPPED (\d+)
 
 Start
+  ^\s*Load\s+balancing\s*:.*$$
+  ^\s*Gathering\s+information...\s*$$
+  ^\s*Channel\s+Ports\s*$$ -> Columns2
   ^\s*-+\s*show\s+interfaces\s+\S+\s*-+\s*$$ -> Continue.Record
   ^\s*-+\s*show\s+interfaces\s+\S+\s*-+\s*$$
   ^\s*${INTERFACE}\s+is\s+${STATUS}\s+\(.*\)\s*$$
@@ -66,7 +70,7 @@ Start
   ^\s*(?:\d+baseT/(?:Full|Half))\s+${LINK_MODES}\s*$$ -> Continue
   ^\s*(?:\d+baseT/(?:Full|Half)).*$$
   ^\s*Link\s+aggregation\s+type\s+is\s+${LINK_AGGREGATION_TYPE}\s*$$
-  ^\s*No.\s+of\s+members\s+in\s+this\s+port-channel:\s+${IFACE_IN_PO_NUM}\s+\(active\s+${ACTIVE_IFACE_IN_PO_NUM}\)\s*$$
+  ^\s*No.\s+of\s+members\s+in\s+this\s+port-channel:\s+${IFACE_IN_PO_NUM}\s+\(active\s+${ACTIVE_IFACE_IN_PO_NUM}(?:,\s+minimum\s+required\s+${MIN_IFACE_REQUIRED_IN_PO_NUM})?\)\s*$$
   ^\s*${IFACE_IN_PO},.*,\s*${IFACE_IN_PO_BANDWIDTH}\s+\(${IFACE_IN_PO_STATUS}\)\s*$$
   ^\s*Active\s+bandwidth\s+is\s+${SUM_BANDWIDTH}\s*$$
   ^\s*Flow\s+control\s+is\s+${FLOW_CONTROL_STATUS},\s+MDIX\s+mode\s+is\s+${MDIX_MODE_STATUS}\s*$$
@@ -87,3 +91,33 @@ Start
   ^\s*${OUTPUT_QUEUE_NUM}\s*:\s*${OUTPUT_QUEUE_PACKETS_PASSED}/${OUTPUT_QUEUE_PACKETS_DROPPED}\s*$$
   ^\s*$$
   ^. -> Error
+
+Columns2
+  ^\s*-+(?:\s+-+)*\s*$$
+  ^[a-zA-Z\-]+\s*(?:\d+(?:/\d+)*)?.* -> Continue.Record
+  ^${INTERFACE}(?:\s+.*?\:\s*${IFACE_IN_PO})?.*$$ -> Continue
+  ^[a-zA-Z\-]+\s*(\d+(/\d+)*)?\s+.*?\:\s*(?:[a-zA-Z\-]+\s*(\d+(/\d+)*)?,){1}${IFACE_IN_PO}.*$$ -> Continue
+  ^[a-zA-Z\-]+\s*(\d+(/\d+)*)?\s+.*?\:\s*(?:[a-zA-Z\-]+\s*(\d+(/\d+)*)?,){2}${IFACE_IN_PO}.*$$ -> Continue
+  ^[a-zA-Z\-]+\s*(\d+(/\d+)*)?\s+.*?\:\s*(?:[a-zA-Z\-]+\s*(\d+(/\d+)*)?,){3}${IFACE_IN_PO}.*$$ -> Continue
+  ^[a-zA-Z\-]+\s*(\d+(/\d+)*)?\s+.*?\:\s*(?:[a-zA-Z\-]+\s*(\d+(/\d+)*)?,){4}${IFACE_IN_PO}.*$$ -> Continue
+  ^[a-zA-Z\-]+\s*(\d+(/\d+)*)?\s+.*?\:\s*(?:[a-zA-Z\-]+\s*(\d+(/\d+)*)?,){5}${IFACE_IN_PO}.*$$ -> Continue
+  ^[a-zA-Z\-]+\s*(\d+(/\d+)*)?\s+.*?\:\s*(?:[a-zA-Z\-]+\s*(\d+(/\d+)*)?,){6}${IFACE_IN_PO}.*$$ -> Continue
+  ^[a-zA-Z\-]+\s*(\d+(/\d+)*)?\s+.*?\:\s*(?:[a-zA-Z\-]+\s*(\d+(/\d+)*)?,){7}${IFACE_IN_PO}.*$$ -> Continue
+  ^[a-zA-Z\-]+\s*(\d+(/\d+)*)?\s+.*?\:\s*(?:[a-zA-Z\-]+\s*(\d+(/\d+)*)?,){8}${IFACE_IN_PO}.*$$ -> Continue
+  ^[a-zA-Z\-]+\s*(\d+(/\d+)*)?\s+.*?\:\s*(?:[a-zA-Z\-]+\s*(\d+(/\d+)*)?,){9}${IFACE_IN_PO}.*$$ -> Continue
+  ^[a-zA-Z\-]+\s*(\d+(/\d+)*)?\s+.*?\:\s*(?:[a-zA-Z\-]+\s*(\d+(/\d+)*)?,){10}${IFACE_IN_PO}.*$$ -> Continue
+  ^\s+${IFACE_IN_PO}.*$$ -> Continue
+  ^\s+(?:[a-zA-Z\-]+\s*(\d+(/\d+)*)?,){1}${IFACE_IN_PO}.*$$ -> Continue
+  ^\s+(?:[a-zA-Z\-]+\s*(\d+(/\d+)*)?,){2}${IFACE_IN_PO}.*$$ -> Continue
+  ^\s+(?:[a-zA-Z\-]+\s*(\d+(/\d+)*)?,){3}${IFACE_IN_PO}.*$$ -> Continue
+  ^\s+(?:[a-zA-Z\-]+\s*(\d+(/\d+)*)?,){4}${IFACE_IN_PO}.*$$ -> Continue
+  ^\s+(?:[a-zA-Z\-]+\s*(\d+(/\d+)*)?,){5}${IFACE_IN_PO}.*$$ -> Continue
+  ^\s+(?:[a-zA-Z\-]+\s*(\d+(/\d+)*)?,){6}${IFACE_IN_PO}.*$$ -> Continue
+  ^\s+(?:[a-zA-Z\-]+\s*(\d+(/\d+)*)?,){7}${IFACE_IN_PO}.*$$ -> Continue
+  ^\s+(?:[a-zA-Z\-]+\s*(\d+(/\d+)*)?,){8}${IFACE_IN_PO}.*$$ -> Continue
+  ^\s+(?:[a-zA-Z\-]+\s*(\d+(/\d+)*)?,){9}${IFACE_IN_PO}.*$$ -> Continue
+  ^\s+(?:[a-zA-Z\-]+\s*(\d+(/\d+)*)?,){10}${IFACE_IN_PO}.*$$ -> Continue
+  ^[a-zA-Z\-]+\s*(\d+(/\d+)*)?(?:\s+.*?\:\s*(?:[a-zA-Z\-]+\s*(\d+(/\d+)*)?,)*[a-zA-Z\-]+\s*(\d+(/\d+)*),?)?\s*$$
+  ^\s+(?:[a-zA-Z\-]+\s*(\d+(/\d+)*)?,)*[a-zA-Z\-]+\s*(\d+(/\d+)*)\s*$$
+  ^\s*$$
+  ^. -> Error