Skip to content

Commit 07f4e62

Browse files
dsaherndavem330
dsahern
authored and
davem330
committed
selftests: fib_tests: simplify ip commands in a namespace
'ip netns exec testns ip' is more efficiently handled using 'ip -netns'; runs the ip command after switching the namespace and avoids an exec. Signed-off-by: David Ahern <dsahern@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 8c2ceab commit 07f4e62

File tree

1 file changed

+105
-105
lines changed

1 file changed

+105
-105
lines changed

‎tools/testing/selftests/net/fib_tests.sh

Lines changed: 105 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,23 @@ fib_unreg_unicast_test()
3434

3535
netns_create "testns"
3636

37-
ip netns exec testns ip link add dummy0 type dummy
38-
ip netns exec testns ip link set dev dummy0 up
37+
ip -netns testns link add dummy0 type dummy
38+
ip -netns testns link set dev dummy0 up
3939

40-
ip netns exec testns ip address add 198.51.100.1/24 dev dummy0
41-
ip netns exec testns ip -6 address add 2001:db8:1::1/64 dev dummy0
40+
ip -netns testns address add 198.51.100.1/24 dev dummy0
41+
ip -netns testns -6 address add 2001:db8:1::1/64 dev dummy0
4242

43-
ip netns exec testns ip route get fibmatch 198.51.100.2 &> /dev/null
43+
ip -netns testns route get fibmatch 198.51.100.2 &> /dev/null
4444
check_err $?
45-
ip netns exec testns ip -6 route get fibmatch 2001:db8:1::2 &> /dev/null
45+
ip -netns testns -6 route get fibmatch 2001:db8:1::2 &> /dev/null
4646
check_err $?
4747

48-
ip netns exec testns ip link del dev dummy0
48+
ip -netns testns link del dev dummy0
4949
check_err $?
5050

51-
ip netns exec testns ip route get fibmatch 198.51.100.2 &> /dev/null
51+
ip -netns testns route get fibmatch 198.51.100.2 &> /dev/null
5252
check_fail $?
53-
ip netns exec testns ip -6 route get fibmatch 2001:db8:1::2 &> /dev/null
53+
ip -netns testns -6 route get fibmatch 2001:db8:1::2 &> /dev/null
5454
check_fail $?
5555

5656
ip netns del testns
@@ -68,40 +68,40 @@ fib_unreg_multipath_test()
6868

6969
netns_create "testns"
7070

71-
ip netns exec testns ip link add dummy0 type dummy
72-
ip netns exec testns ip link set dev dummy0 up
71+
ip -netns testns link add dummy0 type dummy
72+
ip -netns testns link set dev dummy0 up
7373

74-
ip netns exec testns ip link add dummy1 type dummy
75-
ip netns exec testns ip link set dev dummy1 up
74+
ip -netns testns link add dummy1 type dummy
75+
ip -netns testns link set dev dummy1 up
7676

77-
ip netns exec testns ip address add 198.51.100.1/24 dev dummy0
78-
ip netns exec testns ip -6 address add 2001:db8:1::1/64 dev dummy0
77+
ip -netns testns address add 198.51.100.1/24 dev dummy0
78+
ip -netns testns -6 address add 2001:db8:1::1/64 dev dummy0
7979

80-
ip netns exec testns ip address add 192.0.2.1/24 dev dummy1
81-
ip netns exec testns ip -6 address add 2001:db8:2::1/64 dev dummy1
80+
ip -netns testns address add 192.0.2.1/24 dev dummy1
81+
ip -netns testns -6 address add 2001:db8:2::1/64 dev dummy1
8282

83-
ip netns exec testns ip route add 203.0.113.0/24 \
83+
ip -netns testns route add 203.0.113.0/24 \
8484
nexthop via 198.51.100.2 dev dummy0 \
8585
nexthop via 192.0.2.2 dev dummy1
86-
ip netns exec testns ip -6 route add 2001:db8:3::/64 \
86+
ip -netns testns -6 route add 2001:db8:3::/64 \
8787
nexthop via 2001:db8:1::2 dev dummy0 \
8888
nexthop via 2001:db8:2::2 dev dummy1
8989

90-
ip netns exec testns ip route get fibmatch 203.0.113.1 &> /dev/null
90+
ip -netns testns route get fibmatch 203.0.113.1 &> /dev/null
9191
check_err $?
92-
ip netns exec testns ip -6 route get fibmatch 2001:db8:3::1 &> /dev/null
92+
ip -netns testns -6 route get fibmatch 2001:db8:3::1 &> /dev/null
9393
check_err $?
9494

95-
ip netns exec testns ip link del dev dummy0
95+
ip -netns testns link del dev dummy0
9696
check_err $?
9797

98-
ip netns exec testns ip route get fibmatch 203.0.113.1 &> /dev/null
98+
ip -netns testns route get fibmatch 203.0.113.1 &> /dev/null
9999
check_fail $?
100-
ip netns exec testns ip -6 route get fibmatch 2001:db8:3::1 &> /dev/null
100+
ip -netns testns -6 route get fibmatch 2001:db8:3::1 &> /dev/null
101101
# In IPv6 we do not flush the entire multipath route.
102102
check_err $?
103103

104-
ip netns exec testns ip link del dev dummy1
104+
ip -netns testns link del dev dummy1
105105

106106
ip netns del testns
107107

@@ -126,26 +126,26 @@ fib_down_unicast_test()
126126

127127
netns_create "testns"
128128

129-
ip netns exec testns ip link add dummy0 type dummy
130-
ip netns exec testns ip link set dev dummy0 up
129+
ip -netns testns link add dummy0 type dummy
130+
ip -netns testns link set dev dummy0 up
131131

132-
ip netns exec testns ip address add 198.51.100.1/24 dev dummy0
133-
ip netns exec testns ip -6 address add 2001:db8:1::1/64 dev dummy0
132+
ip -netns testns address add 198.51.100.1/24 dev dummy0
133+
ip -netns testns -6 address add 2001:db8:1::1/64 dev dummy0
134134

135-
ip netns exec testns ip route get fibmatch 198.51.100.2 &> /dev/null
135+
ip -netns testns route get fibmatch 198.51.100.2 &> /dev/null
136136
check_err $?
137-
ip netns exec testns ip -6 route get fibmatch 2001:db8:1::2 &> /dev/null
137+
ip -netns testns -6 route get fibmatch 2001:db8:1::2 &> /dev/null
138138
check_err $?
139139

140-
ip netns exec testns ip link set dev dummy0 down
140+
ip -netns testns link set dev dummy0 down
141141
check_err $?
142142

143-
ip netns exec testns ip route get fibmatch 198.51.100.2 &> /dev/null
143+
ip -netns testns route get fibmatch 198.51.100.2 &> /dev/null
144144
check_fail $?
145-
ip netns exec testns ip -6 route get fibmatch 2001:db8:1::2 &> /dev/null
145+
ip -netns testns -6 route get fibmatch 2001:db8:1::2 &> /dev/null
146146
check_fail $?
147147

148-
ip netns exec testns ip link del dev dummy0
148+
ip -netns testns link del dev dummy0
149149

150150
ip netns del testns
151151

@@ -161,31 +161,31 @@ fib_down_multipath_test_do()
161161
local down_dev=$1
162162
local up_dev=$2
163163

164-
ip netns exec testns ip route get fibmatch 203.0.113.1 \
164+
ip -netns testns route get fibmatch 203.0.113.1 \
165165
oif $down_dev &> /dev/null
166166
check_fail $?
167-
ip netns exec testns ip -6 route get fibmatch 2001:db8:3::1 \
167+
ip -netns testns -6 route get fibmatch 2001:db8:3::1 \
168168
oif $down_dev &> /dev/null
169169
check_fail $?
170170

171-
ip netns exec testns ip route get fibmatch 203.0.113.1 \
171+
ip -netns testns route get fibmatch 203.0.113.1 \
172172
oif $up_dev &> /dev/null
173173
check_err $?
174-
ip netns exec testns ip -6 route get fibmatch 2001:db8:3::1 \
174+
ip -netns testns -6 route get fibmatch 2001:db8:3::1 \
175175
oif $up_dev &> /dev/null
176176
check_err $?
177177

178-
ip netns exec testns ip route get fibmatch 203.0.113.1 | \
178+
ip -netns testns route get fibmatch 203.0.113.1 | \
179179
grep $down_dev | grep -q "dead linkdown"
180180
check_err $?
181-
ip netns exec testns ip -6 route get fibmatch 2001:db8:3::1 | \
181+
ip -netns testns -6 route get fibmatch 2001:db8:3::1 | \
182182
grep $down_dev | grep -q "dead linkdown"
183183
check_err $?
184184

185-
ip netns exec testns ip route get fibmatch 203.0.113.1 | \
185+
ip -netns testns route get fibmatch 203.0.113.1 | \
186186
grep $up_dev | grep -q "dead linkdown"
187187
check_fail $?
188-
ip netns exec testns ip -6 route get fibmatch 2001:db8:3::1 | \
188+
ip -netns testns -6 route get fibmatch 2001:db8:3::1 | \
189189
grep $up_dev | grep -q "dead linkdown"
190190
check_fail $?
191191
}
@@ -196,52 +196,52 @@ fib_down_multipath_test()
196196

197197
netns_create "testns"
198198

199-
ip netns exec testns ip link add dummy0 type dummy
200-
ip netns exec testns ip link set dev dummy0 up
199+
ip -netns testns link add dummy0 type dummy
200+
ip -netns testns link set dev dummy0 up
201201

202-
ip netns exec testns ip link add dummy1 type dummy
203-
ip netns exec testns ip link set dev dummy1 up
202+
ip -netns testns link add dummy1 type dummy
203+
ip -netns testns link set dev dummy1 up
204204

205-
ip netns exec testns ip address add 198.51.100.1/24 dev dummy0
206-
ip netns exec testns ip -6 address add 2001:db8:1::1/64 dev dummy0
205+
ip -netns testns address add 198.51.100.1/24 dev dummy0
206+
ip -netns testns -6 address add 2001:db8:1::1/64 dev dummy0
207207

208-
ip netns exec testns ip address add 192.0.2.1/24 dev dummy1
209-
ip netns exec testns ip -6 address add 2001:db8:2::1/64 dev dummy1
208+
ip -netns testns address add 192.0.2.1/24 dev dummy1
209+
ip -netns testns -6 address add 2001:db8:2::1/64 dev dummy1
210210

211-
ip netns exec testns ip route add 203.0.113.0/24 \
211+
ip -netns testns route add 203.0.113.0/24 \
212212
nexthop via 198.51.100.2 dev dummy0 \
213213
nexthop via 192.0.2.2 dev dummy1
214-
ip netns exec testns ip -6 route add 2001:db8:3::/64 \
214+
ip -netns testns -6 route add 2001:db8:3::/64 \
215215
nexthop via 2001:db8:1::2 dev dummy0 \
216216
nexthop via 2001:db8:2::2 dev dummy1
217217

218-
ip netns exec testns ip route get fibmatch 203.0.113.1 &> /dev/null
218+
ip -netns testns route get fibmatch 203.0.113.1 &> /dev/null
219219
check_err $?
220-
ip netns exec testns ip -6 route get fibmatch 2001:db8:3::1 &> /dev/null
220+
ip -netns testns -6 route get fibmatch 2001:db8:3::1 &> /dev/null
221221
check_err $?
222222

223-
ip netns exec testns ip link set dev dummy0 down
223+
ip -netns testns link set dev dummy0 down
224224
check_err $?
225225

226226
fib_down_multipath_test_do "dummy0" "dummy1"
227227

228-
ip netns exec testns ip link set dev dummy0 up
228+
ip -netns testns link set dev dummy0 up
229229
check_err $?
230-
ip netns exec testns ip link set dev dummy1 down
230+
ip -netns testns link set dev dummy1 down
231231
check_err $?
232232

233233
fib_down_multipath_test_do "dummy1" "dummy0"
234234

235-
ip netns exec testns ip link set dev dummy0 down
235+
ip -netns testns link set dev dummy0 down
236236
check_err $?
237237

238-
ip netns exec testns ip route get fibmatch 203.0.113.1 &> /dev/null
238+
ip -netns testns route get fibmatch 203.0.113.1 &> /dev/null
239239
check_fail $?
240-
ip netns exec testns ip -6 route get fibmatch 2001:db8:3::1 &> /dev/null
240+
ip -netns testns -6 route get fibmatch 2001:db8:3::1 &> /dev/null
241241
check_fail $?
242242

243-
ip netns exec testns ip link del dev dummy1
244-
ip netns exec testns ip link del dev dummy0
243+
ip -netns testns link del dev dummy1
244+
ip -netns testns link del dev dummy0
245245

246246
ip netns del testns
247247

@@ -267,56 +267,56 @@ fib_carrier_local_test()
267267
# Local routes should not be affected when carrier changes.
268268
netns_create "testns"
269269

270-
ip netns exec testns ip link add dummy0 type dummy
271-
ip netns exec testns ip link set dev dummy0 up
270+
ip -netns testns link add dummy0 type dummy
271+
ip -netns testns link set dev dummy0 up
272272

273-
ip netns exec testns ip link set dev dummy0 carrier on
273+
ip -netns testns link set dev dummy0 carrier on
274274

275-
ip netns exec testns ip address add 198.51.100.1/24 dev dummy0
276-
ip netns exec testns ip -6 address add 2001:db8:1::1/64 dev dummy0
275+
ip -netns testns address add 198.51.100.1/24 dev dummy0
276+
ip -netns testns -6 address add 2001:db8:1::1/64 dev dummy0
277277

278-
ip netns exec testns ip route get fibmatch 198.51.100.1 &> /dev/null
278+
ip -netns testns route get fibmatch 198.51.100.1 &> /dev/null
279279
check_err $?
280-
ip netns exec testns ip -6 route get fibmatch 2001:db8:1::1 &> /dev/null
280+
ip -netns testns -6 route get fibmatch 2001:db8:1::1 &> /dev/null
281281
check_err $?
282282

283-
ip netns exec testns ip route get fibmatch 198.51.100.1 | \
283+
ip -netns testns route get fibmatch 198.51.100.1 | \
284284
grep -q "linkdown"
285285
check_fail $?
286-
ip netns exec testns ip -6 route get fibmatch 2001:db8:1::1 | \
286+
ip -netns testns -6 route get fibmatch 2001:db8:1::1 | \
287287
grep -q "linkdown"
288288
check_fail $?
289289

290-
ip netns exec testns ip link set dev dummy0 carrier off
290+
ip -netns testns link set dev dummy0 carrier off
291291

292-
ip netns exec testns ip route get fibmatch 198.51.100.1 &> /dev/null
292+
ip -netns testns route get fibmatch 198.51.100.1 &> /dev/null
293293
check_err $?
294-
ip netns exec testns ip -6 route get fibmatch 2001:db8:1::1 &> /dev/null
294+
ip -netns testns -6 route get fibmatch 2001:db8:1::1 &> /dev/null
295295
check_err $?
296296

297-
ip netns exec testns ip route get fibmatch 198.51.100.1 | \
297+
ip -netns testns route get fibmatch 198.51.100.1 | \
298298
grep -q "linkdown"
299299
check_fail $?
300-
ip netns exec testns ip -6 route get fibmatch 2001:db8:1::1 | \
300+
ip -netns testns -6 route get fibmatch 2001:db8:1::1 | \
301301
grep -q "linkdown"
302302
check_fail $?
303303

304-
ip netns exec testns ip address add 192.0.2.1/24 dev dummy0
305-
ip netns exec testns ip -6 address add 2001:db8:2::1/64 dev dummy0
304+
ip -netns testns address add 192.0.2.1/24 dev dummy0
305+
ip -netns testns -6 address add 2001:db8:2::1/64 dev dummy0
306306

307-
ip netns exec testns ip route get fibmatch 192.0.2.1 &> /dev/null
307+
ip -netns testns route get fibmatch 192.0.2.1 &> /dev/null
308308
check_err $?
309-
ip netns exec testns ip -6 route get fibmatch 2001:db8:2::1 &> /dev/null
309+
ip -netns testns -6 route get fibmatch 2001:db8:2::1 &> /dev/null
310310
check_err $?
311311

312-
ip netns exec testns ip route get fibmatch 192.0.2.1 | \
312+
ip -netns testns route get fibmatch 192.0.2.1 | \
313313
grep -q "linkdown"
314314
check_fail $?
315-
ip netns exec testns ip -6 route get fibmatch 2001:db8:2::1 | \
315+
ip -netns testns -6 route get fibmatch 2001:db8:2::1 | \
316316
grep -q "linkdown"
317317
check_fail $?
318318

319-
ip netns exec testns ip link del dev dummy0
319+
ip -netns testns link del dev dummy0
320320

321321
ip netns del testns
322322

@@ -333,56 +333,56 @@ fib_carrier_unicast_test()
333333

334334
netns_create "testns"
335335

336-
ip netns exec testns ip link add dummy0 type dummy
337-
ip netns exec testns ip link set dev dummy0 up
336+
ip -netns testns link add dummy0 type dummy
337+
ip -netns testns link set dev dummy0 up
338338

339-
ip netns exec testns ip link set dev dummy0 carrier on
339+
ip -netns testns link set dev dummy0 carrier on
340340

341-
ip netns exec testns ip address add 198.51.100.1/24 dev dummy0
342-
ip netns exec testns ip -6 address add 2001:db8:1::1/64 dev dummy0
341+
ip -netns testns address add 198.51.100.1/24 dev dummy0
342+
ip -netns testns -6 address add 2001:db8:1::1/64 dev dummy0
343343

344-
ip netns exec testns ip route get fibmatch 198.51.100.2 &> /dev/null
344+
ip -netns testns route get fibmatch 198.51.100.2 &> /dev/null
345345
check_err $?
346-
ip netns exec testns ip -6 route get fibmatch 2001:db8:1::2 &> /dev/null
346+
ip -netns testns -6 route get fibmatch 2001:db8:1::2 &> /dev/null
347347
check_err $?
348348

349-
ip netns exec testns ip route get fibmatch 198.51.100.2 | \
349+
ip -netns testns route get fibmatch 198.51.100.2 | \
350350
grep -q "linkdown"
351351
check_fail $?
352-
ip netns exec testns ip -6 route get fibmatch 2001:db8:1::2 | \
352+
ip -netns testns -6 route get fibmatch 2001:db8:1::2 | \
353353
grep -q "linkdown"
354354
check_fail $?
355355

356-
ip netns exec testns ip link set dev dummy0 carrier off
356+
ip -netns testns link set dev dummy0 carrier off
357357

358-
ip netns exec testns ip route get fibmatch 198.51.100.2 &> /dev/null
358+
ip -netns testns route get fibmatch 198.51.100.2 &> /dev/null
359359
check_err $?
360-
ip netns exec testns ip -6 route get fibmatch 2001:db8:1::2 &> /dev/null
360+
ip -netns testns -6 route get fibmatch 2001:db8:1::2 &> /dev/null
361361
check_err $?
362362

363-
ip netns exec testns ip route get fibmatch 198.51.100.2 | \
363+
ip -netns testns route get fibmatch 198.51.100.2 | \
364364
grep -q "linkdown"
365365
check_err $?
366-
ip netns exec testns ip -6 route get fibmatch 2001:db8:1::2 | \
366+
ip -netns testns -6 route get fibmatch 2001:db8:1::2 | \
367367
grep -q "linkdown"
368368
check_err $?
369369

370-
ip netns exec testns ip address add 192.0.2.1/24 dev dummy0
371-
ip netns exec testns ip -6 address add 2001:db8:2::1/64 dev dummy0
370+
ip -netns testns address add 192.0.2.1/24 dev dummy0
371+
ip -netns testns -6 address add 2001:db8:2::1/64 dev dummy0
372372

373-
ip netns exec testns ip route get fibmatch 192.0.2.2 &> /dev/null
373+
ip -netns testns route get fibmatch 192.0.2.2 &> /dev/null
374374
check_err $?
375-
ip netns exec testns ip -6 route get fibmatch 2001:db8:2::2 &> /dev/null
375+
ip -netns testns -6 route get fibmatch 2001:db8:2::2 &> /dev/null
376376
check_err $?
377377

378-
ip netns exec testns ip route get fibmatch 192.0.2.2 | \
378+
ip -netns testns route get fibmatch 192.0.2.2 | \
379379
grep -q "linkdown"
380380
check_err $?
381-
ip netns exec testns ip -6 route get fibmatch 2001:db8:2::2 | \
381+
ip -netns testns -6 route get fibmatch 2001:db8:2::2 | \
382382
grep -q "linkdown"
383383
check_err $?
384384

385-
ip netns exec testns ip link del dev dummy0
385+
ip -netns testns link del dev dummy0
386386

387387
ip netns del testns
388388

0 commit comments

Comments
 (0)