IOS MAC Parser: Handle versions which start with * in output

Signed-off-by: Dinesh Dutt <[email protected]>

Author: ddutt

suzieq/config/textfsm_templates/iosxe_show_mac.tfsm

@@ -3,52 +3,21 @@ Value Required macaddr (\S+)
 Value Required flags (\w+)
 Value oif (\S+)
 Value protocol (\S+)
+Value _learn (\w+)
+Value age (\d+|-)
+Value List _ports (\S+)
 
 Start
+  ^\* -> WithStar
   ^\s+vlan.*protocol.* -> WithProtocol
   ^\s*${vlan}\s+${macaddr}\s+${flags}\s+${oif}.*$$ -> Record
 
 WithProtocol
   ^\s*${vlan}\s+${macaddr}\s+${flags}\s+${protocol}\s+${oif}.*$$ -> Record
   ^Multicast\s+Entries -> Start
 
-#          Mac Address Table
-#-------------------------------------------
-#
-#Vlan    Mac Address       Type        Ports
-#----    -----------       --------    -----
-# All    0100.0ccc.cccc    STATIC      CPU
-# All    0100.0ccc.cccd    STATIC      CPU
-# All    0180.c200.0000    STATIC      CPU
-# All    0180.c200.0001    STATIC      CPU
-# All    0180.c200.0002    STATIC      CPU
-# All    0180.c200.0003    STATIC      CPU
-# All    0180.c200.0004    STATIC      CPU
-# All    0180.c200.0005    STATIC      CPU
-# All    0180.c200.0006    STATIC      CPU
-# All    0180.c200.0007    STATIC      CPU
-# All    0180.c200.0008    STATIC      CPU
-# All    0180.c200.0009    STATIC      CPU
-# All    0180.c200.000a    STATIC      CPU
-# All    0180.c200.000b    STATIC      CPU
-# All    0180.c200.000c    STATIC      CPU
-# All    0180.c200.000d    STATIC      CPU
-# All    0180.c200.000e    STATIC      CPU
-# All    0180.c200.000f    STATIC      CPU
-# All    0180.c200.0010    STATIC      CPU
-# All    0180.c200.0021    STATIC      CPU
-# All    ffff.ffff.ffff    STATIC      CPU
-#   1    780c.f0e1.1dc3    STATIC      Vl1 
-#  51    0000.1111.2222    STATIC      Vl51 
-#  51    780c.f0e1.1dc6    STATIC      Vl51 
-#1021    0000.0c9f.f45c    STATIC      Vl1021 
-#1021    0002.02cc.0002    STATIC      Gi6/0/2 
-#1021    0002.02cc.0003    STATIC      Gi6/0/3 
-#1021    0002.02cc.0004    STATIC      Gi6/0/4 
-#1021    0002.02cc.0005    STATIC      Gi6/0/5 
-#1021    0002.02cc.0006    STATIC      Gi6/0/6 
-#1021    0002.02cc.0007    STATIC      Gi6/0/7 
-#1021    0002.02cc.0008    STATIC      Gi6/0/8 
-#1021    0002.02cc.0009    STATIC      Gi6/0/9 
-#1021    0002.02cc.000a    STATIC      Gi6/0/10
-#
+WithStar
+  ^\* -> Continue.Record
+  ^\*\s+${vlan}\s+${macaddr}\s+${flags}\s+${_learn}\s+${age}\s+${_ports}
+  ^\s+${_ports}
+  

suzieq/poller/worker/services/macs.py

@@ -160,14 +160,26 @@ def _clean_iosxe_data(self, processed_data, _):
         for entry in processed_data:
             entry['macaddr'] = convert_macaddr_format_to_colon(
                 entry.get('macaddr', '0000.0000.0000'))
+            oiflist = []
             oifs = ''
-            for oif in entry.get('oif', '').split(','):
-                # Handle multicast entries
+            oif = entry.get('oif', '').strip()
+            if oif:
+                oiflist = oif.split(',')
+            if not oiflist:
+                # Some versions of IOS/XE have a different output
+                # format and we capture that in a different var
+                oif = entry.get('_ports', '')
+                if oif:
+                    for ele in oif:
+                        oiflist.extend(ele.split(','))
+            for oif in oiflist:
+                # Handles multicast entries
                 oifs += f'{expand_ios_ifname(oif)} '
             if oifs:
                 entry['oif'] = oifs.strip()
             else:
-                entry['oif'] = expand_ios_ifname(entry['oif'])
+                entry['oif'] = ''
+
             entry['remoteVtepIp'] = ''
             if entry.get('vlan', ' ').strip() == "All":
                 entry['vlan'] = 0