Fix networktocode#6: 'Improved Detection logic'

Yakuza-UA · May 10, 2020 · 730b2cc · 730b2cc
1 parent 59c822b
commit 730b2cc
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 19 deletions.
diff --git a/templates/cisco_ios_show_ip_cef.textfsm b/templates/cisco_ios_show_ip_cef.textfsm
@@ -37,22 +37,27 @@ Start
   ^\d.*?flags\s+\[?(?:[^\]\n]+?,\s+){5}${FLAGS} -> Continue
   # Stop processing Flags (6+)
   ^\d.*?flags.*?$$
-  # Extract Type / Nexthop / Interface
-  # Available Type (IOS >v15.x):
+  # 1st attempt to extract details via source info
+  # Supported Type (IOS >v15.x):
   #     - attached
   #     - receive
   #     - drop
   #     - no route
   #     - nexthop
   #     - multicast
+  ^\s+Adj\s+source:\s+IP\s+adj\s+out\s+of\s+${INTERFACE},\s+addr\s+${NEXTHOP}\s*
+  ^\s+Special\s+source:\s+${TYPE}$$
+  ^\s+Interface\s+source:\s+${INTERFACE}
+  ^\s+DefNet\s+source
+  # 2nd attempt to extract details 
+  ^\s+recursive\s+via\s+${NEXTHOP}
+  ^\s+${TYPE}(?<=receive)\s+for\s+${INTERFACE}
+  ^\s+${TYPE}(?<=attached)\s+to\s+${INTERFACE}
   ^\s+${TYPE}(?<=drop)$$
   ^\s+${TYPE}(?<=no route)$$
   ^\s+${TYPE}(?<=receive)$$
   ^\s+${TYPE}(?<=multicast)$$
   ^\s+${TYPE}(?<=nexthop)\s+${NEXTHOP}\s+${INTERFACE}
-  ^\s+recursive\s+via\s+${NEXTHOP}
-  ^\s+${TYPE}(?<=receive)\s+for\s+${INTERFACE}
-  ^\s+${TYPE}(?<=attached)\s+to\s+${INTERFACE}
   #
   # --- Parse CEF table from Cisco IOS 12.x ISR G1
   #
@@ -67,10 +72,10 @@ Start
   ^.*?epoch.*?$$
   # Extract extra Flag, such as recursive
   ^.*?dependenc(?:y|ies),\s+${FLAGS} -> Continue
-  ^\s+via\s+${NEXTHOP},\s+\d+\s+dependenc
-  ^\s+via\s+${INTERFACE},\s+\d+\s+dependenc
-  ^\s+via\s+${NEXTHOP},\s+${INTERFACE},\s+\d+\s+dependenc
-  ^.*?dependenc(?:y|ies)
+  ^\s+via\s+${NEXTHOP},\s+\d+\s+depend
+  ^\s+via\s+${INTERFACE},\s+\d+\s+depend
+  ^\s+via\s+${NEXTHOP},\s+${INTERFACE},\s+\d+\s+depend
+  ^.*?depend
   # Extract Nexthop and Interface
   ^\s+next\s+hop\s+${NEXTHOP}\s*$$
   ^\s+next\s+hop\s+${NEXTHOP},\s+${INTERFACE}
@@ -86,10 +91,6 @@ Start
   # Ignore JUNK
   #
   ^\s+Q[Oo]S
-  ^\s+Special\s+source
-  ^\s+Interface\s+source
-  ^\s+Adj\s+source
-  ^\s+DefNet\s+source
   ^\s+Covered\s+dependent
   ^\s+need\s+deagg
   ^\s+notify\s+cover

diff --git a/tests/cisco_ios/show_ip_cef/show_ip_cef_detail_c2800_v1.yml b/tests/cisco_ios/show_ip_cef/show_ip_cef_detail_c2800_v1.yml
@@ -47,7 +47,7 @@ parsed_sample:
     flags:
       - "attached"
     type: "attached"
-    nexthop: ""
+    nexthop: "10.191.64.2"
     interface: "GigabitEthernet0/0"
   - prefix: "172.17.40.0/24"
     flags:

diff --git a/tests/cisco_ios/show_ip_cef/show_ip_cef_detail_c2900_v1.yml b/tests/cisco_ios/show_ip_cef/show_ip_cef_detail_c2900_v1.yml
@@ -35,7 +35,7 @@ parsed_sample:
     flags:
       - "attached"
     type: "attached"
-    nexthop: ""
+    nexthop: "10.180.140.153"
     interface: "GigabitEthernet0/1"
   - prefix: "10.180.150.0/26"
     flags:
@@ -73,7 +73,7 @@ parsed_sample:
     flags:
       - "attached"
     type: "attached"
-    nexthop: ""
+    nexthop: "10.180.150.33"
     interface: "Port-channel1.1822"
   - prefix: "10.180.150.38/32"
     flags:

diff --git a/tests/cisco_ios/show_ip_cef/show_ip_cef_detail_c3750.yml b/tests/cisco_ios/show_ip_cef/show_ip_cef_detail_c3750.yml
@@ -40,7 +40,7 @@ parsed_sample:
     flags:
       - "attached"
     type: "attached"
-    nexthop: ""
+    nexthop: "10.158.0.195"
     interface: "Vlan1801"
   - prefix: "224.0.0.0/4"
     flags: []

diff --git a/tests/cisco_ios/show_ip_cef/show_ip_cef_detail_c3850_v1.yml b/tests/cisco_ios/show_ip_cef/show_ip_cef_detail_c3850_v1.yml
@@ -41,7 +41,7 @@ parsed_sample:
     flags:
       - "attached"
     type: "attached"
-    nexthop: ""
+    nexthop: "10.255.1.1"
     interface: "Port-channel1.1"
   - prefix: "10.255.1.11/32"
     flags:
@@ -73,7 +73,7 @@ parsed_sample:
     flags:
       - "attached"
     type: "attached"
-    nexthop: ""
+    nexthop: "10.180.163.133"
     interface: "Vlan1831"
   - prefix: "127.0.0.0/8"
     flags: []