aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Ahern <dsahern@gmail.com>2018-02-13 11:37:33 -0500
committerDavid S. Miller <davem@davemloft.net>2018-02-13 14:34:28 -0500
commit07f4e62f1c704f583740e6dd59c223819feb03ec (patch)
treec21f89d12e7a3bc445f65d88b380ce1722ab093f
parent8c2ceabe99e04005cadba739856eed6953a8a3af (diff)
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>
-rwxr-xr-xtools/testing/selftests/net/fib_tests.sh210
1 files changed, 105 insertions, 105 deletions
diff --git a/tools/testing/selftests/net/fib_tests.sh b/tools/testing/selftests/net/fib_tests.sh
index a9154eefb2e2..672f263f8f53 100755
--- a/tools/testing/selftests/net/fib_tests.sh
+++ b/tools/testing/selftests/net/fib_tests.sh
@@ -34,23 +34,23 @@ fib_unreg_unicast_test()
34 34
35 netns_create "testns" 35 netns_create "testns"
36 36
37 ip netns exec testns ip link add dummy0 type dummy 37 ip -netns testns link add dummy0 type dummy
38 ip netns exec testns ip link set dev dummy0 up 38 ip -netns testns link set dev dummy0 up
39 39
40 ip netns exec testns ip address add 198.51.100.1/24 dev dummy0 40 ip -netns testns 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 41 ip -netns testns -6 address add 2001:db8:1::1/64 dev dummy0
42 42
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
44 check_err $? 44 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
46 check_err $? 46 check_err $?
47 47
48 ip netns exec testns ip link del dev dummy0 48 ip -netns testns link del dev dummy0
49 check_err $? 49 check_err $?
50 50
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
52 check_fail $? 52 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
54 check_fail $? 54 check_fail $?
55 55
56 ip netns del testns 56 ip netns del testns
@@ -68,40 +68,40 @@ fib_unreg_multipath_test()
68 68
69 netns_create "testns" 69 netns_create "testns"
70 70
71 ip netns exec testns ip link add dummy0 type dummy 71 ip -netns testns link add dummy0 type dummy
72 ip netns exec testns ip link set dev dummy0 up 72 ip -netns testns link set dev dummy0 up
73 73
74 ip netns exec testns ip link add dummy1 type dummy 74 ip -netns testns link add dummy1 type dummy
75 ip netns exec testns ip link set dev dummy1 up 75 ip -netns testns link set dev dummy1 up
76 76
77 ip netns exec testns ip address add 198.51.100.1/24 dev dummy0 77 ip -netns testns 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 78 ip -netns testns -6 address add 2001:db8:1::1/64 dev dummy0
79 79
80 ip netns exec testns ip address add 192.0.2.1/24 dev dummy1 80 ip -netns testns 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 81 ip -netns testns -6 address add 2001:db8:2::1/64 dev dummy1
82 82
83 ip netns exec testns ip route add 203.0.113.0/24 \ 83 ip -netns testns route add 203.0.113.0/24 \
84 nexthop via 198.51.100.2 dev dummy0 \ 84 nexthop via 198.51.100.2 dev dummy0 \
85 nexthop via 192.0.2.2 dev dummy1 85 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 \
87 nexthop via 2001:db8:1::2 dev dummy0 \ 87 nexthop via 2001:db8:1::2 dev dummy0 \
88 nexthop via 2001:db8:2::2 dev dummy1 88 nexthop via 2001:db8:2::2 dev dummy1
89 89
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
91 check_err $? 91 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
93 check_err $? 93 check_err $?
94 94
95 ip netns exec testns ip link del dev dummy0 95 ip -netns testns link del dev dummy0
96 check_err $? 96 check_err $?
97 97
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
99 check_fail $? 99 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
101 # In IPv6 we do not flush the entire multipath route. 101 # In IPv6 we do not flush the entire multipath route.
102 check_err $? 102 check_err $?
103 103
104 ip netns exec testns ip link del dev dummy1 104 ip -netns testns link del dev dummy1
105 105
106 ip netns del testns 106 ip netns del testns
107 107
@@ -126,26 +126,26 @@ fib_down_unicast_test()
126 126
127 netns_create "testns" 127 netns_create "testns"
128 128
129 ip netns exec testns ip link add dummy0 type dummy 129 ip -netns testns link add dummy0 type dummy
130 ip netns exec testns ip link set dev dummy0 up 130 ip -netns testns link set dev dummy0 up
131 131
132 ip netns exec testns ip address add 198.51.100.1/24 dev dummy0 132 ip -netns testns 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 133 ip -netns testns -6 address add 2001:db8:1::1/64 dev dummy0
134 134
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
136 check_err $? 136 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
138 check_err $? 138 check_err $?
139 139
140 ip netns exec testns ip link set dev dummy0 down 140 ip -netns testns link set dev dummy0 down
141 check_err $? 141 check_err $?
142 142
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
144 check_fail $? 144 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
146 check_fail $? 146 check_fail $?
147 147
148 ip netns exec testns ip link del dev dummy0 148 ip -netns testns link del dev dummy0
149 149
150 ip netns del testns 150 ip netns del testns
151 151
@@ -161,31 +161,31 @@ fib_down_multipath_test_do()
161 local down_dev=$1 161 local down_dev=$1
162 local up_dev=$2 162 local up_dev=$2
163 163
164 ip netns exec testns ip route get fibmatch 203.0.113.1 \ 164 ip -netns testns route get fibmatch 203.0.113.1 \
165 oif $down_dev &> /dev/null 165 oif $down_dev &> /dev/null
166 check_fail $? 166 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 \
168 oif $down_dev &> /dev/null 168 oif $down_dev &> /dev/null
169 check_fail $? 169 check_fail $?
170 170
171 ip netns exec testns ip route get fibmatch 203.0.113.1 \ 171 ip -netns testns route get fibmatch 203.0.113.1 \
172 oif $up_dev &> /dev/null 172 oif $up_dev &> /dev/null
173 check_err $? 173 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 \
175 oif $up_dev &> /dev/null 175 oif $up_dev &> /dev/null
176 check_err $? 176 check_err $?
177 177
178 ip netns exec testns ip route get fibmatch 203.0.113.1 | \ 178 ip -netns testns route get fibmatch 203.0.113.1 | \
179 grep $down_dev | grep -q "dead linkdown" 179 grep $down_dev | grep -q "dead linkdown"
180 check_err $? 180 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 | \
182 grep $down_dev | grep -q "dead linkdown" 182 grep $down_dev | grep -q "dead linkdown"
183 check_err $? 183 check_err $?
184 184
185 ip netns exec testns ip route get fibmatch 203.0.113.1 | \ 185 ip -netns testns route get fibmatch 203.0.113.1 | \
186 grep $up_dev | grep -q "dead linkdown" 186 grep $up_dev | grep -q "dead linkdown"
187 check_fail $? 187 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 | \
189 grep $up_dev | grep -q "dead linkdown" 189 grep $up_dev | grep -q "dead linkdown"
190 check_fail $? 190 check_fail $?
191} 191}
@@ -196,52 +196,52 @@ fib_down_multipath_test()
196 196
197 netns_create "testns" 197 netns_create "testns"
198 198
199 ip netns exec testns ip link add dummy0 type dummy 199 ip -netns testns link add dummy0 type dummy
200 ip netns exec testns ip link set dev dummy0 up 200 ip -netns testns link set dev dummy0 up
201 201
202 ip netns exec testns ip link add dummy1 type dummy 202 ip -netns testns link add dummy1 type dummy
203 ip netns exec testns ip link set dev dummy1 up 203 ip -netns testns link set dev dummy1 up
204 204
205 ip netns exec testns ip address add 198.51.100.1/24 dev dummy0 205 ip -netns testns 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 206 ip -netns testns -6 address add 2001:db8:1::1/64 dev dummy0
207 207
208 ip netns exec testns ip address add 192.0.2.1/24 dev dummy1 208 ip -netns testns 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 209 ip -netns testns -6 address add 2001:db8:2::1/64 dev dummy1
210 210
211 ip netns exec testns ip route add 203.0.113.0/24 \ 211 ip -netns testns route add 203.0.113.0/24 \
212 nexthop via 198.51.100.2 dev dummy0 \ 212 nexthop via 198.51.100.2 dev dummy0 \
213 nexthop via 192.0.2.2 dev dummy1 213 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 \
215 nexthop via 2001:db8:1::2 dev dummy0 \ 215 nexthop via 2001:db8:1::2 dev dummy0 \
216 nexthop via 2001:db8:2::2 dev dummy1 216 nexthop via 2001:db8:2::2 dev dummy1
217 217
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
219 check_err $? 219 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
221 check_err $? 221 check_err $?
222 222
223 ip netns exec testns ip link set dev dummy0 down 223 ip -netns testns link set dev dummy0 down
224 check_err $? 224 check_err $?
225 225
226 fib_down_multipath_test_do "dummy0" "dummy1" 226 fib_down_multipath_test_do "dummy0" "dummy1"
227 227
228 ip netns exec testns ip link set dev dummy0 up 228 ip -netns testns link set dev dummy0 up
229 check_err $? 229 check_err $?
230 ip netns exec testns ip link set dev dummy1 down 230 ip -netns testns link set dev dummy1 down
231 check_err $? 231 check_err $?
232 232
233 fib_down_multipath_test_do "dummy1" "dummy0" 233 fib_down_multipath_test_do "dummy1" "dummy0"
234 234
235 ip netns exec testns ip link set dev dummy0 down 235 ip -netns testns link set dev dummy0 down
236 check_err $? 236 check_err $?
237 237
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
239 check_fail $? 239 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
241 check_fail $? 241 check_fail $?
242 242
243 ip netns exec testns ip link del dev dummy1 243 ip -netns testns link del dev dummy1
244 ip netns exec testns ip link del dev dummy0 244 ip -netns testns link del dev dummy0
245 245
246 ip netns del testns 246 ip netns del testns
247 247
@@ -267,56 +267,56 @@ fib_carrier_local_test()
267 # Local routes should not be affected when carrier changes. 267 # Local routes should not be affected when carrier changes.
268 netns_create "testns" 268 netns_create "testns"
269 269
270 ip netns exec testns ip link add dummy0 type dummy 270 ip -netns testns link add dummy0 type dummy
271 ip netns exec testns ip link set dev dummy0 up 271 ip -netns testns link set dev dummy0 up
272 272
273 ip netns exec testns ip link set dev dummy0 carrier on 273 ip -netns testns link set dev dummy0 carrier on
274 274
275 ip netns exec testns ip address add 198.51.100.1/24 dev dummy0 275 ip -netns testns 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 276 ip -netns testns -6 address add 2001:db8:1::1/64 dev dummy0
277 277
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
279 check_err $? 279 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
281 check_err $? 281 check_err $?
282 282
283 ip netns exec testns ip route get fibmatch 198.51.100.1 | \ 283 ip -netns testns route get fibmatch 198.51.100.1 | \
284 grep -q "linkdown" 284 grep -q "linkdown"
285 check_fail $? 285 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 | \
287 grep -q "linkdown" 287 grep -q "linkdown"
288 check_fail $? 288 check_fail $?
289 289
290 ip netns exec testns ip link set dev dummy0 carrier off 290 ip -netns testns link set dev dummy0 carrier off
291 291
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
293 check_err $? 293 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
295 check_err $? 295 check_err $?
296 296
297 ip netns exec testns ip route get fibmatch 198.51.100.1 | \ 297 ip -netns testns route get fibmatch 198.51.100.1 | \
298 grep -q "linkdown" 298 grep -q "linkdown"
299 check_fail $? 299 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 | \
301 grep -q "linkdown" 301 grep -q "linkdown"
302 check_fail $? 302 check_fail $?
303 303
304 ip netns exec testns ip address add 192.0.2.1/24 dev dummy0 304 ip -netns testns 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 305 ip -netns testns -6 address add 2001:db8:2::1/64 dev dummy0
306 306
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
308 check_err $? 308 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
310 check_err $? 310 check_err $?
311 311
312 ip netns exec testns ip route get fibmatch 192.0.2.1 | \ 312 ip -netns testns route get fibmatch 192.0.2.1 | \
313 grep -q "linkdown" 313 grep -q "linkdown"
314 check_fail $? 314 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 | \
316 grep -q "linkdown" 316 grep -q "linkdown"
317 check_fail $? 317 check_fail $?
318 318
319 ip netns exec testns ip link del dev dummy0 319 ip -netns testns link del dev dummy0
320 320
321 ip netns del testns 321 ip netns del testns
322 322
@@ -333,56 +333,56 @@ fib_carrier_unicast_test()
333 333
334 netns_create "testns" 334 netns_create "testns"
335 335
336 ip netns exec testns ip link add dummy0 type dummy 336 ip -netns testns link add dummy0 type dummy
337 ip netns exec testns ip link set dev dummy0 up 337 ip -netns testns link set dev dummy0 up
338 338
339 ip netns exec testns ip link set dev dummy0 carrier on 339 ip -netns testns link set dev dummy0 carrier on
340 340
341 ip netns exec testns ip address add 198.51.100.1/24 dev dummy0 341 ip -netns testns 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 342 ip -netns testns -6 address add 2001:db8:1::1/64 dev dummy0
343 343
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
345 check_err $? 345 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
347 check_err $? 347 check_err $?
348 348
349 ip netns exec testns ip route get fibmatch 198.51.100.2 | \ 349 ip -netns testns route get fibmatch 198.51.100.2 | \
350 grep -q "linkdown" 350 grep -q "linkdown"
351 check_fail $? 351 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 | \
353 grep -q "linkdown" 353 grep -q "linkdown"
354 check_fail $? 354 check_fail $?
355 355
356 ip netns exec testns ip link set dev dummy0 carrier off 356 ip -netns testns link set dev dummy0 carrier off
357 357
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
359 check_err $? 359 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
361 check_err $? 361 check_err $?
362 362
363 ip netns exec testns ip route get fibmatch 198.51.100.2 | \ 363 ip -netns testns route get fibmatch 198.51.100.2 | \
364 grep -q "linkdown" 364 grep -q "linkdown"
365 check_err $? 365 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 | \
367 grep -q "linkdown" 367 grep -q "linkdown"
368 check_err $? 368 check_err $?
369 369
370 ip netns exec testns ip address add 192.0.2.1/24 dev dummy0 370 ip -netns testns 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 371 ip -netns testns -6 address add 2001:db8:2::1/64 dev dummy0
372 372
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
374 check_err $? 374 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
376 check_err $? 376 check_err $?
377 377
378 ip netns exec testns ip route get fibmatch 192.0.2.2 | \ 378 ip -netns testns route get fibmatch 192.0.2.2 | \
379 grep -q "linkdown" 379 grep -q "linkdown"
380 check_err $? 380 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 | \
382 grep -q "linkdown" 382 grep -q "linkdown"
383 check_err $? 383 check_err $?
384 384
385 ip netns exec testns ip link del dev dummy0 385 ip -netns testns link del dev dummy0
386 386
387 ip netns del testns 387 ip netns del testns
388 388