BugFix: Account for fpc and master lines on older Junos versions (#622)

networktocode · Mar 13, 2020 · 3bad277 · 3bad277
1 parent 0e69deb
commit 3bad277
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 6 deletions.
diff --git a/templates/juniper_junos_show_arp_no-resolve.textfsm b/templates/juniper_junos_show_arp_no-resolve.textfsm
@@ -8,4 +8,5 @@ Start
   ^${MAC}\s+${IP_ADDRESS}\s+${INTERFACE}\s+${FLAGS} -> Record
   ^Total.*
   ^\s*$$
-  ^. -> Error
+  ^{master:\d+}
+  ^. -> Error
diff --git a/templates/juniper_junos_show_chassis_firmware.textfsm b/templates/juniper_junos_show_chassis_firmware.textfsm
@@ -6,5 +6,7 @@ Start
   ^[Pp]art
   ^${PART}\s+${TYPE}?\s+?(.+Version\s+|.+U-Boot\s.+|.+?)${VERSION}(Copy\S+$$|\s+.+$$|$$) -> Record
   ^\s+${TYPE}\s+?(.+Version\s+|.+U-Boot\s.+|.+?)${VERSION}(Copy\S+$$|\s+.+$$|$$) -> Record
+  ^\s*$$
+  ^{master:\d+}
 
-EOF
+EOF
diff --git a/templates/juniper_junos_show_interfaces.textfsm b/templates/juniper_junos_show_interfaces.textfsm
@@ -10,5 +10,7 @@ Start
   ^.*ype:\s+${HARDWARE_TYPE},.*MTU:\s+${MTU}.* -> Record
   ^.*MTU:\s+${MTU}.* -> Record
   ^.*[fF]lags -> Record
+  ^\s*$$
+  ^{master:\d+}
 
 EOF
diff --git a/templates/juniper_junos_show_isis_adjacency.textfsm b/templates/juniper_junos_show_isis_adjacency.textfsm
@@ -7,3 +7,5 @@ Value SNPA ((\S+)?)
 
 Start
   ^${INTERFACE}\s+${SYSTEM_ID}\s+${TYPE}\s+${STATE}\s+${HOLD_TIME}(\s+)?${SNPA} -> Record
+  ^\s*$$
+  ^{master:\d+}
diff --git a/templates/juniper_junos_show_ospf_neighbor.textfsm b/templates/juniper_junos_show_ospf_neighbor.textfsm
@@ -8,3 +8,5 @@ Value DEAD_TIME (\d+)
 
 Start
   ^${ADDRESS}\s+${INTERFACE}\s+${STATE}\s+${NEIGHBOR_ID}\s+${PRIORITY}\s+${DEAD_TIME} -> Record
+  ^\s*$$
+  ^{master:\d+}
diff --git a/templates/juniper_junos_show_version.textfsm b/templates/juniper_junos_show_version.textfsm
@@ -75,4 +75,7 @@ Start
   ^Serial\s+Number:\s+${SERIAL_NUMBER}
   ^QFabric\s+System\s+ID:\s+${QFABRIC_SYSTEM_ID}
   ^JUNOS\s+${OTHER_DEVICE_PROPERTIES}\[${OTHER_PROPERTIES_VERSIONS}\]
-  ^. -> Error
+  ^fpc\d+
+  ^-----
+  ^{master:\d+}
+  ^. -> Error
diff --git a/tests/juniper_junos/show_arp_no-resolve/juniper_junos_show_arp_no-resolve.raw b/tests/juniper_junos/show_arp_no-resolve/juniper_junos_show_arp_no-resolve.raw
@@ -8,4 +8,6 @@ MAC Address       Address         Interface     Flags
 00:00:00:00:00:0c 10.1.100.76     vlan.20        none
 00:00:00:00:11:11 10.1.111.11     vlan.20        none
 00:00:00:00:13:13 10.1.13.13      vlan.20        none
-Total entries: 9
+Total entries: 9
+
+{master:0}
diff --git a/tests/juniper_junos/show_chassis_firmware/juniper_junos_show_chassis_firmware.raw b/tests/juniper_junos/show_chassis_firmware/juniper_junos_show_chassis_firmware.raw
@@ -180,4 +180,6 @@ FPC 2                    ROM        Juniper ROM Monitor Version 6.4b20
                          O/S        Version 7.0-20040804.0 by builder on 2004-0
 SPMB 0                   ROM        Juniper ROM Monitor Version 6.4b18         
                          O/S        Version 7.0-20040804.0 by builder on 2004-0
-                         O/S        Version 7.0-20040804.0 by builder on 2004-0
+                         O/S        Version 7.0-20040804.0 by builder on 2004-0
+
+{master:0}
diff --git a/tests/juniper_junos/show_interfaces/juniper_junos_show_interfaces.raw b/tests/juniper_junos/show_interfaces/juniper_junos_show_interfaces.raw
@@ -69,3 +69,4 @@ Physical interface: sp-0/0/0, Enabled, Physical link is Up
   Device Flags   : Present Running
   Interface flags: Point-To-Point SNMP-Traps Internal: 0x4000
 
+{master:0}
diff --git a/tests/juniper_junos/show_isis_adjacency/juniper_junos_show_isis_adjacency.raw b/tests/juniper_junos/show_isis_adjacency/juniper_junos_show_isis_adjacency.raw
@@ -4,3 +4,5 @@ ge-0/0/2.0            CSR2           2  Up                   25  50:0:0:2:0:1
 ge-0/0/2.0            XRv3           1  Up                    8  50:0:0:3:0:2
 ge-0/0/2.0            XRv3           2  Up                    8  50:0:0:3:0:2
 ge-0/0/3.0            XRv3           3  Up                   25
+
+{master:0}
diff --git a/tests/juniper_junos/show_ospf_neighbor/juniper_junos_show_ospf_neighbor.raw b/tests/juniper_junos/show_ospf_neighbor/juniper_junos_show_ospf_neighbor.raw
@@ -1,3 +1,5 @@
 Address          Interface              State     ID               Pri  Dead
 10.1.2.2         ge-0/0/2.0             Full      2.2.2.2            1    37
 10.1.3.3         ge-0/0/3.0             Full      3.3.3.3            1    31
+
+{master:0}
diff --git a/tests/juniper_junos/show_version/juniper_junos_show_version.raw b/tests/juniper_junos/show_version/juniper_junos_show_version.raw
@@ -1,3 +1,5 @@
+fpc0:
+-------------------------------------------------------------------------
 Hostname: lab
 Model: mx240
 Junos: 13.3R1.4
@@ -33,4 +35,6 @@ JUNOS Routing Software Suite [13.3R1.4]
 JUNOS py-base-i386 [13.3R1.4]
 labpkg [7.0]
 Serial Number: qfsn-0123456789
-QFabric System ID: f158527a-f99e-11e0-9fbd-00e081c57cda
+QFabric System ID: f158527a-f99e-11e0-9fbd-00e081c57cda
+
+{master:0}
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,3 +7,5 @@ Value SNPA ((\S+)?) @@
     Start
       ^${INTERFACE}\s+${SYSTEM_ID}\s+${TYPE}\s+${STATE}\s+${HOLD_TIME}(\s+)?${SNPA} -> Record
+      ^\s*$$
+      ^{master:\d+}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -69,3 +69,4 @@ Physical interface: sp-0/0/0, Enabled, Physical link is Up
		Device Flags : Present Running
		Interface flags: Point-To-Point SNMP-Traps Internal: 0x4000

		{master:0}