Skip to content

Commit f591cb0

Browse files
paulbauer1paulbauer1
authored
Fix IOS interface link template uptime issue (#1855)
1 parent d8f568e commit f591cb0

File tree

3 files changed

+41
-41
lines changed

3 files changed

+41
-41
lines changed

‎ntc_templates/templates/cisco_ios_show_interface_link.textfsm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Value PORT (\S+)
22
Value NAME (.*?)
33
Value DOWNTIME ((00:00:00)|(([0-9]{1,2} year[s]? , )?([0-9]{1,2} week[s]?, )?([0-9]{1,2} day[s]?, )?([0-9]{1,2} hour[s]?, )?([0-9]{1,2} minute[s]? )?([0-9]{1,2} secs))|((([0-9]{1,2}y)?([0-9]{1,2}w)?([0-9]{1,2}d)([0-9]{1,2}h)?|[0-9]{1,2}:[0-9]{1,2}:[0-9]{1,2})))
44
Value SINCE (.+?)
5-
Value UPTIME ((([0-9]{1,2}m)?([0-9]{1,2}w)?([0-9]{1,2}d)|[0-9]{1,2}:[0-9]{1,2}:[0-9]{1,2}))
5+
Value UPTIME ((([0-9]{1,2}m)?([0-9]{1,2}w)?([0-9]{1,2}d)([0-9]{1,2}h)?|[0-9]{1,2}:[0-9]{1,2}:[0-9]{1,2}))
66

77
Start
88
^\s*\^\s* -> EOF
@@ -25,7 +25,7 @@ DownSince
2525
^. -> Error
2626

2727
UpTime
28-
^\s*${PORT}\s+${NAME}\s+00:00:00\s+${UPTIME}?\s*$$ -> Record
28+
^\s*${PORT}\s+${NAME}\s+${DOWNTIME}\s+${UPTIME}?\s*$$ -> Record
2929
^\s*${PORT}\s+${DOWNTIME}\s+${UPTIME}?\s*$$ -> Record
3030
^\s*${PORT}\s+${NAME}\s+${DOWNTIME}\s*$$ -> Record
3131
^\s*$$

‎tests/cisco_ios/show_interface_link/cisco_ios_show_interface_link.yml

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ parsed_sample:
55
port: "Gi1/0/1"
66
since: ""
77
uptime: ""
8-
- downtime: ""
8+
- downtime: "00:00:00"
99
name: "0308-ab15mgm0007-d"
1010
port: "Gi1/0/3"
1111
since: ""
1212
uptime: "30w5d"
13-
- downtime: ""
13+
- downtime: "00:00:00"
1414
name: "23PD-PDU-a"
1515
port: "Gi1/0/5"
1616
since: ""
@@ -20,37 +20,37 @@ parsed_sample:
2020
port: "Gi1/0/11"
2121
since: ""
2222
uptime: ""
23-
- downtime: "5d01h"
24-
name: "3201-ab15erp0006-d 00:00:00"
23+
- downtime: "00:00:00"
24+
name: "3201-ab15erp0006-d"
2525
port: "Gi1/0/15"
2626
since: ""
27-
uptime: ""
27+
uptime: "5d01h"
2828
- downtime: "30w5d"
2929
name: "6502-ab15adc0001-d"
3030
port: "Gi1/0/20"
3131
since: ""
3232
uptime: ""
33-
- downtime: ""
33+
- downtime: "00:00:00"
3434
name: "4512-ab15fil0001-s"
3535
port: "Gi1/0/21"
3636
since: ""
3737
uptime: "30w5d"
38-
- downtime: ""
38+
- downtime: "00:00:00"
3939
name: "5803-gh01erp8003-d"
4040
port: "Te1/0/26"
4141
since: ""
4242
uptime: "2w1d"
43-
- downtime: "4d08h"
44-
name: "53609-ab15sql0001-d 00:00:00"
43+
- downtime: "00:00:00"
44+
name: "53609-ab15sql0001-d"
4545
port: "Te1/0/29"
4646
since: ""
47-
uptime: ""
48-
- downtime: ""
47+
uptime: "4d08h"
48+
- downtime: "00:00:00"
4949
name: "54024-ab15san009-s"
5050
port: "Te1/0/30"
5151
since: ""
5252
uptime: "3w0d"
53-
- downtime: ""
53+
- downtime: "00:00:00"
5454
name: "53PD-PDU-b"
5555
port: "Te1/0/31"
5656
since: ""
@@ -65,12 +65,12 @@ parsed_sample:
6565
port: "Te1/0/33"
6666
since: ""
6767
uptime: ""
68-
- downtime: ""
68+
- downtime: "00:00:00"
6969
name: "5654-ab15msx0005-d"
7070
port: "Te1/0/34"
7171
since: ""
7272
uptime: "30w5d"
73-
- downtime: ""
73+
- downtime: "00:00:00"
7474
name: "5665-ghsrv181-d"
7575
port: "Te1/0/35"
7676
since: ""
@@ -80,7 +80,7 @@ parsed_sample:
8080
port: "Te1/0/37"
8181
since: ""
8282
uptime: ""
83-
- downtime: ""
83+
- downtime: "00:00:00"
8484
name: "5902-ab15srv0009-d"
8585
port: "Te1/0/38"
8686
since: ""
@@ -90,22 +90,22 @@ parsed_sample:
9090
port: "Te1/0/39"
9191
since: ""
9292
uptime: ""
93-
- downtime: ""
93+
- downtime: "00:00:00"
9494
name: "5835-maintenance-d"
9595
port: "Te1/0/41"
9696
since: ""
9797
uptime: "4w0d"
98-
- downtime: ""
98+
- downtime: "00:00:00"
9999
name: "58029-maintenance-d"
100100
port: "Te1/0/43"
101101
since: ""
102102
uptime: "4w0d"
103-
- downtime: ""
103+
- downtime: "00:00:00"
104104
name: "Access Port"
105105
port: "Te1/0/44"
106106
since: ""
107107
uptime: "01:59:13"
108-
- downtime: ""
108+
- downtime: "00:00:00"
109109
name: "Access Port"
110110
port: "Te1/0/45"
111111
since: ""
@@ -130,7 +130,7 @@ parsed_sample:
130130
port: "Te2/0/27"
131131
since: ""
132132
uptime: ""
133-
- downtime: ""
133+
- downtime: "00:00:00"
134134
name: "CRXNLLE1051AP51"
135135
port: "Te2/0/29"
136136
since: ""
@@ -140,17 +140,17 @@ parsed_sample:
140140
port: "Gi1/0/13"
141141
since: ""
142142
uptime: ""
143-
- downtime: ""
143+
- downtime: "00:00:00"
144144
name: "DPYghZW1234WI001 L"
145145
port: "Gi1/0/19"
146146
since: ""
147147
uptime: "30w5d"
148-
- downtime: ""
148+
- downtime: "00:00:00"
149149
name: "GFS-MGMT1"
150150
port: "Gi1/0/24"
151151
since: ""
152152
uptime: "30w5d"
153-
- downtime: ""
153+
- downtime: "00:00:00"
154154
name: "ICE Port"
155155
port: "Te1/0/31"
156156
since: ""
@@ -160,27 +160,27 @@ parsed_sample:
160160
port: "Te1/0/32"
161161
since: ""
162162
uptime: ""
163-
- downtime: ""
163+
- downtime: "00:00:00"
164164
name: "ITSghZW1561FW015-F"
165165
port: "Te1/0/33"
166166
since: ""
167167
uptime: "30w5d"
168-
- downtime: ""
168+
- downtime: "00:00:00"
169169
name: "ITSghZWNB10"
170170
port: "Te1/0/34"
171171
since: ""
172172
uptime: "30w5d"
173-
- downtime: ""
173+
- downtime: "00:00:00"
174174
name: "ITSghZWTL01.tld.co"
175175
port: "Te1/0/36"
176176
since: ""
177177
uptime: "4w0d"
178-
- downtime: ""
178+
- downtime: "00:00:00"
179179
name: "NO POLL 4507-ab15f"
180180
port: "Te1/0/37"
181181
since: ""
182182
uptime: "14w0d"
183-
- downtime: ""
183+
- downtime: "00:00:00"
184184
name: "Space Port"
185185
port: "Te1/0/40"
186186
since: ""
@@ -190,27 +190,27 @@ parsed_sample:
190190
port: "Te1/0/42"
191191
since: ""
192192
uptime: ""
193-
- downtime: ""
193+
- downtime: "00:00:00"
194194
name: "dpyghzwnasc01n1r-i"
195195
port: "Te1/0/43"
196196
since: ""
197197
uptime: "30w5d"
198-
- downtime: ""
198+
- downtime: "00:00:00"
199199
name: "itsghzwdd03m"
200200
port: "Te1/0/44"
201201
since: ""
202202
uptime: "13w1d"
203-
- downtime: ""
203+
- downtime: "00:00:00"
204204
name: "jnjghllnas02n1.hos"
205205
port: "Te1/0/45"
206206
since: ""
207207
uptime: "14w0d"
208-
- downtime: ""
208+
- downtime: "00:00:00"
209209
name: "to DGYghGF1234BV00"
210210
port: "Gi2/0/2"
211211
since: ""
212212
uptime: "30w5d"
213-
- downtime: ""
213+
- downtime: "00:00:00"
214214
name: "wlc-service-port-t"
215215
port: "Gi2/0/3"
216216
since: ""

‎tests/cisco_ios/show_interface_link/cisco_ios_show_interface_link3.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ parsed_sample:
1515
port: "Fo5/0/10"
1616
since: ""
1717
uptime: ""
18-
- downtime: ""
18+
- downtime: "00:00:00"
1919
name: "L3 Link"
2020
port: "Twe5/0/1"
2121
since: ""
2222
uptime: "9w4d"
23-
- downtime: ""
23+
- downtime: "00:00:00"
2424
name: "L3 Link VR"
2525
port: "Twe5/0/1.602"
2626
since: ""
2727
uptime: "9w4d"
28-
- downtime: ""
28+
- downtime: "00:00:00"
2929
name: "L3 Link VRF"
3030
port: "Twe5/0/1.603"
3131
since: ""
@@ -55,17 +55,17 @@ parsed_sample:
5555
port: "Fo6/0/10"
5656
since: ""
5757
uptime: ""
58-
- downtime: ""
58+
- downtime: "00:00:00"
5959
name: "L3 Link"
6060
port: "Twe6/0/1"
6161
since: ""
6262
uptime: "9w4d"
63-
- downtime: ""
63+
- downtime: "00:00:00"
6464
name: "L3 Link VR"
6565
port: "Twe6/0/1.602"
6666
since: ""
6767
uptime: "9w4d"
68-
- downtime: ""
68+
- downtime: "00:00:00"
6969
name: "L3 Link VRF"
7070
port: "Twe6/0/1.603"
7171
since: ""

0 commit comments

Comments
 (0)