Merge pull request #143 from itdependsnetworks/cdp_fix

Fix CDP to work with 3 capablities in cdp output
networktocode · May 20, 2018 · 259a8db · 259a8db
2 parents 55aaa1c + 2c633e1
commit 259a8db
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/templates/cisco_ios_show_cdp_neighbors.template b/templates/cisco_ios_show_cdp_neighbors.template
@@ -1,11 +1,14 @@
-Value NEIGHBOR (\S+)
+Value Required NEIGHBOR (\S+)
 Value LOCAL_INTERFACE (\S+\s\S+)
-Value CAPABILITY ([\w\s]+?)
+Value CAPABILITY (\w.*?)
 Value PLATFORM (\S+\s\S+|\S+)
 Value NEIGHBOR_INTERFACE (\S+\s\S+)
 
 Start
   ^Device.*ID -> CDP
 
 CDP
-  ^${NEIGHBOR}\s+${LOCAL_INTERFACE}\s+\d+\s+${CAPABILITY}\s{2}\s+${PLATFORM}\s+${NEIGHBOR_INTERFACE} -> Record
+  ^${NEIGHBOR}$$
+  ^\s+${LOCAL_INTERFACE}\s+\d+\s+${CAPABILITY}\s{2}\s*${PLATFORM}\s+${NEIGHBOR_INTERFACE} -> Record
+  ^${NEIGHBOR}\s+${LOCAL_INTERFACE}\s+\d+\s+${CAPABILITY}\s{2}\s*${PLATFORM}\s+${NEIGHBOR_INTERFACE} -> Record
+