Skip to content

Commit 171a487

Browse files
dsaherndavem330
dsahern
authored and
davem330
committed
selftests: fib_tests: Use an alias for ip command
Replace 'ip -netns testns' with the alias IP. Shortens the line lengths and makes running the commands manually a bit easier. Signed-off-by: David Ahern <dsahern@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 1893ff2 commit 171a487

File tree

1 file changed

+85
-84
lines changed

1 file changed

+85
-84
lines changed

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

Lines changed: 85 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
ret=0
88

99
PAUSE_ON_FAIL=${PAUSE_ON_FAIL:=no}
10+
IP="ip -netns testns"
1011

1112
log_test()
1213
{
@@ -32,19 +33,19 @@ setup()
3233
{
3334
set -e
3435
ip netns add testns
35-
ip -netns testns link set dev lo up
36+
$IP link set dev lo up
3637

37-
ip -netns testns link add dummy0 type dummy
38-
ip -netns testns link set dev dummy0 up
39-
ip -netns testns address add 198.51.100.1/24 dev dummy0
40-
ip -netns testns -6 address add 2001:db8:1::1/64 dev dummy0
38+
$IP link add dummy0 type dummy
39+
$IP link set dev dummy0 up
40+
$IP address add 198.51.100.1/24 dev dummy0
41+
$IP -6 address add 2001:db8:1::1/64 dev dummy0
4142
set +e
4243

4344
}
4445

4546
cleanup()
4647
{
47-
ip -netns testns link del dev dummy0 &> /dev/null
48+
$IP link del dev dummy0 &> /dev/null
4849
ip netns del testns
4950
}
5051

@@ -56,19 +57,19 @@ fib_unreg_unicast_test()
5657
setup
5758

5859
echo " Start point"
59-
ip -netns testns route get fibmatch 198.51.100.2 &> /dev/null
60+
$IP route get fibmatch 198.51.100.2 &> /dev/null
6061
log_test $? 0 "IPv4 fibmatch"
61-
ip -netns testns -6 route get fibmatch 2001:db8:1::2 &> /dev/null
62+
$IP -6 route get fibmatch 2001:db8:1::2 &> /dev/null
6263
log_test $? 0 "IPv6 fibmatch"
6364

6465
set -e
65-
ip -netns testns link del dev dummy0
66+
$IP link del dev dummy0
6667
set +e
6768

6869
echo " Nexthop device deleted"
69-
ip -netns testns route get fibmatch 198.51.100.2 &> /dev/null
70+
$IP route get fibmatch 198.51.100.2 &> /dev/null
7071
log_test $? 2 "IPv4 fibmatch - no route"
71-
ip -netns testns -6 route get fibmatch 2001:db8:1::2 &> /dev/null
72+
$IP -6 route get fibmatch 2001:db8:1::2 &> /dev/null
7273
log_test $? 2 "IPv6 fibmatch - no route"
7374

7475
cleanup
@@ -83,43 +84,43 @@ fib_unreg_multipath_test()
8384
setup
8485

8586
set -e
86-
ip -netns testns link add dummy1 type dummy
87-
ip -netns testns link set dev dummy1 up
88-
ip -netns testns address add 192.0.2.1/24 dev dummy1
89-
ip -netns testns -6 address add 2001:db8:2::1/64 dev dummy1
87+
$IP link add dummy1 type dummy
88+
$IP link set dev dummy1 up
89+
$IP address add 192.0.2.1/24 dev dummy1
90+
$IP -6 address add 2001:db8:2::1/64 dev dummy1
9091

91-
ip -netns testns route add 203.0.113.0/24 \
92+
$IP route add 203.0.113.0/24 \
9293
nexthop via 198.51.100.2 dev dummy0 \
9394
nexthop via 192.0.2.2 dev dummy1
94-
ip -netns testns -6 route add 2001:db8:3::/64 \
95+
$IP -6 route add 2001:db8:3::/64 \
9596
nexthop via 2001:db8:1::2 dev dummy0 \
9697
nexthop via 2001:db8:2::2 dev dummy1
9798
set +e
9899

99100
echo " Start point"
100-
ip -netns testns route get fibmatch 203.0.113.1 &> /dev/null
101+
$IP route get fibmatch 203.0.113.1 &> /dev/null
101102
log_test $? 0 "IPv4 fibmatch"
102-
ip -netns testns -6 route get fibmatch 2001:db8:3::1 &> /dev/null
103+
$IP -6 route get fibmatch 2001:db8:3::1 &> /dev/null
103104
log_test $? 0 "IPv6 fibmatch"
104105

105106
set -e
106-
ip -netns testns link del dev dummy0
107+
$IP link del dev dummy0
107108
set +e
108109

109110
echo " One nexthop device deleted"
110-
ip -netns testns route get fibmatch 203.0.113.1 &> /dev/null
111+
$IP route get fibmatch 203.0.113.1 &> /dev/null
111112
log_test $? 2 "IPv4 - multipath route removed on delete"
112113

113-
ip -netns testns -6 route get fibmatch 2001:db8:3::1 &> /dev/null
114+
$IP -6 route get fibmatch 2001:db8:3::1 &> /dev/null
114115
# In IPv6 we do not flush the entire multipath route.
115116
log_test $? 0 "IPv6 - multipath down to single path"
116117

117118
set -e
118-
ip -netns testns link del dev dummy1
119+
$IP link del dev dummy1
119120
set +e
120121

121122
echo " Second nexthop device deleted"
122-
ip -netns testns -6 route get fibmatch 2001:db8:3::1 &> /dev/null
123+
$IP -6 route get fibmatch 2001:db8:3::1 &> /dev/null
123124
log_test $? 2 "IPv6 - no route"
124125

125126
cleanup
@@ -139,19 +140,19 @@ fib_down_unicast_test()
139140
setup
140141

141142
echo " Start point"
142-
ip -netns testns route get fibmatch 198.51.100.2 &> /dev/null
143+
$IP route get fibmatch 198.51.100.2 &> /dev/null
143144
log_test $? 0 "IPv4 fibmatch"
144-
ip -netns testns -6 route get fibmatch 2001:db8:1::2 &> /dev/null
145+
$IP -6 route get fibmatch 2001:db8:1::2 &> /dev/null
145146
log_test $? 0 "IPv6 fibmatch"
146147

147148
set -e
148-
ip -netns testns link set dev dummy0 down
149+
$IP link set dev dummy0 down
149150
set +e
150151

151152
echo " Route deleted on down"
152-
ip -netns testns route get fibmatch 198.51.100.2 &> /dev/null
153+
$IP route get fibmatch 198.51.100.2 &> /dev/null
153154
log_test $? 2 "IPv4 fibmatch"
154-
ip -netns testns -6 route get fibmatch 2001:db8:1::2 &> /dev/null
155+
$IP -6 route get fibmatch 2001:db8:1::2 &> /dev/null
155156
log_test $? 2 "IPv6 fibmatch"
156157

157158
cleanup
@@ -162,31 +163,31 @@ fib_down_multipath_test_do()
162163
local down_dev=$1
163164
local up_dev=$2
164165

165-
ip -netns testns route get fibmatch 203.0.113.1 \
166+
$IP route get fibmatch 203.0.113.1 \
166167
oif $down_dev &> /dev/null
167168
log_test $? 2 "IPv4 fibmatch on down device"
168-
ip -netns testns -6 route get fibmatch 2001:db8:3::1 \
169+
$IP -6 route get fibmatch 2001:db8:3::1 \
169170
oif $down_dev &> /dev/null
170171
log_test $? 2 "IPv6 fibmatch on down device"
171172

172-
ip -netns testns route get fibmatch 203.0.113.1 \
173+
$IP route get fibmatch 203.0.113.1 \
173174
oif $up_dev &> /dev/null
174175
log_test $? 0 "IPv4 fibmatch on up device"
175-
ip -netns testns -6 route get fibmatch 2001:db8:3::1 \
176+
$IP -6 route get fibmatch 2001:db8:3::1 \
176177
oif $up_dev &> /dev/null
177178
log_test $? 0 "IPv6 fibmatch on up device"
178179

179-
ip -netns testns route get fibmatch 203.0.113.1 | \
180+
$IP route get fibmatch 203.0.113.1 | \
180181
grep $down_dev | grep -q "dead linkdown"
181182
log_test $? 0 "IPv4 flags on down device"
182-
ip -netns testns -6 route get fibmatch 2001:db8:3::1 | \
183+
$IP -6 route get fibmatch 2001:db8:3::1 | \
183184
grep $down_dev | grep -q "dead linkdown"
184185
log_test $? 0 "IPv6 flags on down device"
185186

186-
ip -netns testns route get fibmatch 203.0.113.1 | \
187+
$IP route get fibmatch 203.0.113.1 | \
187188
grep $up_dev | grep -q "dead linkdown"
188189
log_test $? 1 "IPv4 flags on up device"
189-
ip -netns testns -6 route get fibmatch 2001:db8:3::1 | \
190+
$IP -6 route get fibmatch 2001:db8:3::1 | \
190191
grep $up_dev | grep -q "dead linkdown"
191192
log_test $? 1 "IPv6 flags on up device"
192193
}
@@ -199,53 +200,53 @@ fib_down_multipath_test()
199200
setup
200201

201202
set -e
202-
ip -netns testns link add dummy1 type dummy
203-
ip -netns testns link set dev dummy1 up
203+
$IP link add dummy1 type dummy
204+
$IP link set dev dummy1 up
204205

205-
ip -netns testns address add 192.0.2.1/24 dev dummy1
206-
ip -netns testns -6 address add 2001:db8:2::1/64 dev dummy1
206+
$IP address add 192.0.2.1/24 dev dummy1
207+
$IP -6 address add 2001:db8:2::1/64 dev dummy1
207208

208-
ip -netns testns route add 203.0.113.0/24 \
209+
$IP route add 203.0.113.0/24 \
209210
nexthop via 198.51.100.2 dev dummy0 \
210211
nexthop via 192.0.2.2 dev dummy1
211-
ip -netns testns -6 route add 2001:db8:3::/64 \
212+
$IP -6 route add 2001:db8:3::/64 \
212213
nexthop via 2001:db8:1::2 dev dummy0 \
213214
nexthop via 2001:db8:2::2 dev dummy1
214215
set +e
215216

216217
echo " Verify start point"
217-
ip -netns testns route get fibmatch 203.0.113.1 &> /dev/null
218+
$IP route get fibmatch 203.0.113.1 &> /dev/null
218219
log_test $? 0 "IPv4 fibmatch"
219220

220-
ip -netns testns -6 route get fibmatch 2001:db8:3::1 &> /dev/null
221+
$IP -6 route get fibmatch 2001:db8:3::1 &> /dev/null
221222
log_test $? 0 "IPv6 fibmatch"
222223

223224
set -e
224-
ip -netns testns link set dev dummy0 down
225+
$IP link set dev dummy0 down
225226
set +e
226227

227228
echo " One device down, one up"
228229
fib_down_multipath_test_do "dummy0" "dummy1"
229230

230231
set -e
231-
ip -netns testns link set dev dummy0 up
232-
ip -netns testns link set dev dummy1 down
232+
$IP link set dev dummy0 up
233+
$IP link set dev dummy1 down
233234
set +e
234235

235236
echo " Other device down and up"
236237
fib_down_multipath_test_do "dummy1" "dummy0"
237238

238239
set -e
239-
ip -netns testns link set dev dummy0 down
240+
$IP link set dev dummy0 down
240241
set +e
241242

242243
echo " Both devices down"
243-
ip -netns testns route get fibmatch 203.0.113.1 &> /dev/null
244+
$IP route get fibmatch 203.0.113.1 &> /dev/null
244245
log_test $? 2 "IPv4 fibmatch"
245-
ip -netns testns -6 route get fibmatch 2001:db8:3::1 &> /dev/null
246+
$IP -6 route get fibmatch 2001:db8:3::1 &> /dev/null
246247
log_test $? 2 "IPv6 fibmatch"
247248

248-
ip -netns testns link del dev dummy1
249+
$IP link del dev dummy1
249250
cleanup
250251
}
251252

@@ -264,55 +265,55 @@ fib_carrier_local_test()
264265
setup
265266

266267
set -e
267-
ip -netns testns link set dev dummy0 carrier on
268+
$IP link set dev dummy0 carrier on
268269
set +e
269270

270271
echo " Start point"
271-
ip -netns testns route get fibmatch 198.51.100.1 &> /dev/null
272+
$IP route get fibmatch 198.51.100.1 &> /dev/null
272273
log_test $? 0 "IPv4 fibmatch"
273-
ip -netns testns -6 route get fibmatch 2001:db8:1::1 &> /dev/null
274+
$IP -6 route get fibmatch 2001:db8:1::1 &> /dev/null
274275
log_test $? 0 "IPv6 fibmatch"
275276

276-
ip -netns testns route get fibmatch 198.51.100.1 | \
277+
$IP route get fibmatch 198.51.100.1 | \
277278
grep -q "linkdown"
278279
log_test $? 1 "IPv4 - no linkdown flag"
279-
ip -netns testns -6 route get fibmatch 2001:db8:1::1 | \
280+
$IP -6 route get fibmatch 2001:db8:1::1 | \
280281
grep -q "linkdown"
281282
log_test $? 1 "IPv6 - no linkdown flag"
282283

283284
set -e
284-
ip -netns testns link set dev dummy0 carrier off
285+
$IP link set dev dummy0 carrier off
285286
sleep 1
286287
set +e
287288

288289
echo " Carrier off on nexthop"
289-
ip -netns testns route get fibmatch 198.51.100.1 &> /dev/null
290+
$IP route get fibmatch 198.51.100.1 &> /dev/null
290291
log_test $? 0 "IPv4 fibmatch"
291-
ip -netns testns -6 route get fibmatch 2001:db8:1::1 &> /dev/null
292+
$IP -6 route get fibmatch 2001:db8:1::1 &> /dev/null
292293
log_test $? 0 "IPv6 fibmatch"
293294

294-
ip -netns testns route get fibmatch 198.51.100.1 | \
295+
$IP route get fibmatch 198.51.100.1 | \
295296
grep -q "linkdown"
296297
log_test $? 1 "IPv4 - linkdown flag set"
297-
ip -netns testns -6 route get fibmatch 2001:db8:1::1 | \
298+
$IP -6 route get fibmatch 2001:db8:1::1 | \
298299
grep -q "linkdown"
299300
log_test $? 1 "IPv6 - linkdown flag set"
300301

301302
set -e
302-
ip -netns testns address add 192.0.2.1/24 dev dummy0
303-
ip -netns testns -6 address add 2001:db8:2::1/64 dev dummy0
303+
$IP address add 192.0.2.1/24 dev dummy0
304+
$IP -6 address add 2001:db8:2::1/64 dev dummy0
304305
set +e
305306

306307
echo " Route to local address with carrier down"
307-
ip -netns testns route get fibmatch 192.0.2.1 &> /dev/null
308+
$IP route get fibmatch 192.0.2.1 &> /dev/null
308309
log_test $? 0 "IPv4 fibmatch"
309-
ip -netns testns -6 route get fibmatch 2001:db8:2::1 &> /dev/null
310+
$IP -6 route get fibmatch 2001:db8:2::1 &> /dev/null
310311
log_test $? 0 "IPv6 fibmatch"
311312

312-
ip -netns testns route get fibmatch 192.0.2.1 | \
313+
$IP route get fibmatch 192.0.2.1 | \
313314
grep -q "linkdown"
314315
log_test $? 1 "IPv4 linkdown flag set"
315-
ip -netns testns -6 route get fibmatch 2001:db8:2::1 | \
316+
$IP -6 route get fibmatch 2001:db8:2::1 | \
316317
grep -q "linkdown"
317318
log_test $? 1 "IPv6 linkdown flag set"
318319

@@ -329,54 +330,54 @@ fib_carrier_unicast_test()
329330
setup
330331

331332
set -e
332-
ip -netns testns link set dev dummy0 carrier on
333+
$IP link set dev dummy0 carrier on
333334
set +e
334335

335336
echo " Start point"
336-
ip -netns testns route get fibmatch 198.51.100.2 &> /dev/null
337+
$IP route get fibmatch 198.51.100.2 &> /dev/null
337338
log_test $? 0 "IPv4 fibmatch"
338-
ip -netns testns -6 route get fibmatch 2001:db8:1::2 &> /dev/null
339+
$IP -6 route get fibmatch 2001:db8:1::2 &> /dev/null
339340
log_test $? 0 "IPv6 fibmatch"
340341

341-
ip -netns testns route get fibmatch 198.51.100.2 | \
342+
$IP route get fibmatch 198.51.100.2 | \
342343
grep -q "linkdown"
343344
log_test $? 1 "IPv4 no linkdown flag"
344-
ip -netns testns -6 route get fibmatch 2001:db8:1::2 | \
345+
$IP -6 route get fibmatch 2001:db8:1::2 | \
345346
grep -q "linkdown"
346347
log_test $? 1 "IPv6 no linkdown flag"
347348

348349
set -e
349-
ip -netns testns link set dev dummy0 carrier off
350+
$IP link set dev dummy0 carrier off
350351
set +e
351352

352353
echo " Carrier down"
353-
ip -netns testns route get fibmatch 198.51.100.2 &> /dev/null
354+
$IP route get fibmatch 198.51.100.2 &> /dev/null
354355
log_test $? 0 "IPv4 fibmatch"
355-
ip -netns testns -6 route get fibmatch 2001:db8:1::2 &> /dev/null
356+
$IP -6 route get fibmatch 2001:db8:1::2 &> /dev/null
356357
log_test $? 0 "IPv6 fibmatch"
357358

358-
ip -netns testns route get fibmatch 198.51.100.2 | \
359+
$IP route get fibmatch 198.51.100.2 | \
359360
grep -q "linkdown"
360361
log_test $? 0 "IPv4 linkdown flag set"
361-
ip -netns testns -6 route get fibmatch 2001:db8:1::2 | \
362+
$IP -6 route get fibmatch 2001:db8:1::2 | \
362363
grep -q "linkdown"
363364
log_test $? 0 "IPv6 linkdown flag set"
364365

365366
set -e
366-
ip -netns testns address add 192.0.2.1/24 dev dummy0
367-
ip -netns testns -6 address add 2001:db8:2::1/64 dev dummy0
367+
$IP address add 192.0.2.1/24 dev dummy0
368+
$IP -6 address add 2001:db8:2::1/64 dev dummy0
368369
set +e
369370

370371
echo " Second address added with carrier down"
371-
ip -netns testns route get fibmatch 192.0.2.2 &> /dev/null
372+
$IP route get fibmatch 192.0.2.2 &> /dev/null
372373
log_test $? 0 "IPv4 fibmatch"
373-
ip -netns testns -6 route get fibmatch 2001:db8:2::2 &> /dev/null
374+
$IP -6 route get fibmatch 2001:db8:2::2 &> /dev/null
374375
log_test $? 0 "IPv6 fibmatch"
375376

376-
ip -netns testns route get fibmatch 192.0.2.2 | \
377+
$IP route get fibmatch 192.0.2.2 | \
377378
grep -q "linkdown"
378379
log_test $? 0 "IPv4 linkdown flag set"
379-
ip -netns testns -6 route get fibmatch 2001:db8:2::2 | \
380+
$IP -6 route get fibmatch 2001:db8:2::2 | \
380381
grep -q "linkdown"
381382
log_test $? 0 "IPv6 linkdown flag set"
382383

0 commit comments

Comments
 (0)