Skip to content

Commit be9cefe

Browse files
dsaherndavem330
dsahern
authored and
davem330
committed
selftests: rtnetlink: use internal netns switch for ip commands
'ip' can switch network namespaces internally and then run a given command relative to that namespace without the need to fork and exec another ip instance. Update all references of the form: ip netns exec "$testns" ip ... to ip -netns "$testns" ... Signed-off-by: David Ahern <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent b9f2c02 commit be9cefe

File tree

1 file changed

+61
-61
lines changed

1 file changed

+61
-61
lines changed

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

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -391,76 +391,76 @@ kci_test_encap_vxlan()
391391
vlan="test-vlan0"
392392
testns="$1"
393393

394-
ip netns exec "$testns" ip link add "$vxlan" type vxlan id 42 group 239.1.1.1 \
394+
ip -netns "$testns" link add "$vxlan" type vxlan id 42 group 239.1.1.1 \
395395
dev "$devdummy" dstport 4789 2>/dev/null
396396
if [ $? -ne 0 ]; then
397397
echo "FAIL: can't add vxlan interface, skipping test"
398398
return 0
399399
fi
400400
check_err $?
401401

402-
ip netns exec "$testns" ip addr add 10.2.11.49/24 dev "$vxlan"
402+
ip -netns "$testns" addr add 10.2.11.49/24 dev "$vxlan"
403403
check_err $?
404404

405-
ip netns exec "$testns" ip link set up dev "$vxlan"
405+
ip -netns "$testns" link set up dev "$vxlan"
406406
check_err $?
407407

408-
ip netns exec "$testns" ip link add link "$vxlan" name "$vlan" type vlan id 1
408+
ip -netns "$testns" link add link "$vxlan" name "$vlan" type vlan id 1
409409
check_err $?
410410

411411
# changelink testcases
412-
ip netns exec "$testns" ip link set dev "$vxlan" type vxlan vni 43 2>/dev/null
412+
ip -netns "$testns" link set dev "$vxlan" type vxlan vni 43 2>/dev/null
413413
check_fail $?
414414

415-
ip netns exec "$testns" ip link set dev "$vxlan" type vxlan group ffe5::5 dev "$devdummy" 2>/dev/null
415+
ip -netns "$testns" link set dev "$vxlan" type vxlan group ffe5::5 dev "$devdummy" 2>/dev/null
416416
check_fail $?
417417

418-
ip netns exec "$testns" ip link set dev "$vxlan" type vxlan ttl inherit 2>/dev/null
418+
ip -netns "$testns" link set dev "$vxlan" type vxlan ttl inherit 2>/dev/null
419419
check_fail $?
420420

421-
ip netns exec "$testns" ip link set dev "$vxlan" type vxlan ttl 64
421+
ip -netns "$testns" link set dev "$vxlan" type vxlan ttl 64
422422
check_err $?
423423

424-
ip netns exec "$testns" ip link set dev "$vxlan" type vxlan nolearning
424+
ip -netns "$testns" link set dev "$vxlan" type vxlan nolearning
425425
check_err $?
426426

427-
ip netns exec "$testns" ip link set dev "$vxlan" type vxlan proxy 2>/dev/null
427+
ip -netns "$testns" link set dev "$vxlan" type vxlan proxy 2>/dev/null
428428
check_fail $?
429429

430-
ip netns exec "$testns" ip link set dev "$vxlan" type vxlan norsc 2>/dev/null
430+
ip -netns "$testns" link set dev "$vxlan" type vxlan norsc 2>/dev/null
431431
check_fail $?
432432

433-
ip netns exec "$testns" ip link set dev "$vxlan" type vxlan l2miss 2>/dev/null
433+
ip -netns "$testns" link set dev "$vxlan" type vxlan l2miss 2>/dev/null
434434
check_fail $?
435435

436-
ip netns exec "$testns" ip link set dev "$vxlan" type vxlan l3miss 2>/dev/null
436+
ip -netns "$testns" link set dev "$vxlan" type vxlan l3miss 2>/dev/null
437437
check_fail $?
438438

439-
ip netns exec "$testns" ip link set dev "$vxlan" type vxlan external 2>/dev/null
439+
ip -netns "$testns" link set dev "$vxlan" type vxlan external 2>/dev/null
440440
check_fail $?
441441

442-
ip netns exec "$testns" ip link set dev "$vxlan" type vxlan udpcsum 2>/dev/null
442+
ip -netns "$testns" link set dev "$vxlan" type vxlan udpcsum 2>/dev/null
443443
check_fail $?
444444

445-
ip netns exec "$testns" ip link set dev "$vxlan" type vxlan udp6zerocsumtx 2>/dev/null
445+
ip -netns "$testns" link set dev "$vxlan" type vxlan udp6zerocsumtx 2>/dev/null
446446
check_fail $?
447447

448-
ip netns exec "$testns" ip link set dev "$vxlan" type vxlan udp6zerocsumrx 2>/dev/null
448+
ip -netns "$testns" link set dev "$vxlan" type vxlan udp6zerocsumrx 2>/dev/null
449449
check_fail $?
450450

451-
ip netns exec "$testns" ip link set dev "$vxlan" type vxlan remcsumtx 2>/dev/null
451+
ip -netns "$testns" link set dev "$vxlan" type vxlan remcsumtx 2>/dev/null
452452
check_fail $?
453453

454-
ip netns exec "$testns" ip link set dev "$vxlan" type vxlan remcsumrx 2>/dev/null
454+
ip -netns "$testns" link set dev "$vxlan" type vxlan remcsumrx 2>/dev/null
455455
check_fail $?
456456

457-
ip netns exec "$testns" ip link set dev "$vxlan" type vxlan gbp 2>/dev/null
457+
ip -netns "$testns" link set dev "$vxlan" type vxlan gbp 2>/dev/null
458458
check_fail $?
459459

460-
ip netns exec "$testns" ip link set dev "$vxlan" type vxlan gpe 2>/dev/null
460+
ip -netns "$testns" link set dev "$vxlan" type vxlan gpe 2>/dev/null
461461
check_fail $?
462462

463-
ip netns exec "$testns" ip link del "$vxlan"
463+
ip -netns "$testns" link del "$vxlan"
464464
check_err $?
465465

466466
if [ $ret -ne 0 ]; then
@@ -482,19 +482,19 @@ kci_test_encap_fou()
482482
return $ksft_skip
483483
fi
484484

485-
ip netns exec "$testns" ip fou add port 7777 ipproto 47 2>/dev/null
485+
ip -netns "$testns" fou add port 7777 ipproto 47 2>/dev/null
486486
if [ $? -ne 0 ];then
487487
echo "FAIL: can't add fou port 7777, skipping test"
488488
return 1
489489
fi
490490

491-
ip netns exec "$testns" ip fou add port 8888 ipproto 4
491+
ip -netns "$testns" fou add port 8888 ipproto 4
492492
check_err $?
493493

494-
ip netns exec "$testns" ip fou del port 9999 2>/dev/null
494+
ip -netns "$testns" fou del port 9999 2>/dev/null
495495
check_fail $?
496496

497-
ip netns exec "$testns" ip fou del port 7777
497+
ip -netns "$testns" fou del port 7777
498498
check_err $?
499499

500500
if [ $ret -ne 0 ]; then
@@ -517,12 +517,12 @@ kci_test_encap()
517517
return $ksft_skip
518518
fi
519519

520-
ip netns exec "$testns" ip link set lo up
520+
ip -netns "$testns" link set lo up
521521
check_err $?
522522

523-
ip netns exec "$testns" ip link add name "$devdummy" type dummy
523+
ip -netns "$testns" link add name "$devdummy" type dummy
524524
check_err $?
525-
ip netns exec "$testns" ip link set "$devdummy" up
525+
ip -netns "$testns" link set "$devdummy" up
526526
check_err $?
527527

528528
kci_test_encap_vxlan "$testns"
@@ -811,24 +811,24 @@ kci_test_gretap()
811811
fi
812812

813813
# test native tunnel
814-
ip netns exec "$testns" ip link add dev "$DEV_NS" type gretap seq \
814+
ip -netns "$testns" link add dev "$DEV_NS" type gretap seq \
815815
key 102 local 172.16.1.100 remote 172.16.1.200
816816
check_err $?
817817

818-
ip netns exec "$testns" ip addr add dev "$DEV_NS" 10.1.1.100/24
818+
ip -netns "$testns" addr add dev "$DEV_NS" 10.1.1.100/24
819819
check_err $?
820820

821-
ip netns exec "$testns" ip link set dev $DEV_NS up
821+
ip -netns "$testns" link set dev $DEV_NS up
822822
check_err $?
823823

824-
ip netns exec "$testns" ip link del "$DEV_NS"
824+
ip -netns "$testns" link del "$DEV_NS"
825825
check_err $?
826826

827827
# test external mode
828-
ip netns exec "$testns" ip link add dev "$DEV_NS" type gretap external
828+
ip -netns "$testns" link add dev "$DEV_NS" type gretap external
829829
check_err $?
830830

831-
ip netns exec "$testns" ip link del "$DEV_NS"
831+
ip -netns "$testns" link del "$DEV_NS"
832832
check_err $?
833833

834834
if [ $ret -ne 0 ]; then
@@ -861,24 +861,24 @@ kci_test_ip6gretap()
861861
fi
862862

863863
# test native tunnel
864-
ip netns exec "$testns" ip link add dev "$DEV_NS" type ip6gretap seq \
864+
ip -netns "$testns" link add dev "$DEV_NS" type ip6gretap seq \
865865
key 102 local fc00:100::1 remote fc00:100::2
866866
check_err $?
867867

868-
ip netns exec "$testns" ip addr add dev "$DEV_NS" fc00:200::1/96
868+
ip -netns "$testns" addr add dev "$DEV_NS" fc00:200::1/96
869869
check_err $?
870870

871-
ip netns exec "$testns" ip link set dev $DEV_NS up
871+
ip -netns "$testns" link set dev $DEV_NS up
872872
check_err $?
873873

874-
ip netns exec "$testns" ip link del "$DEV_NS"
874+
ip -netns "$testns" link del "$DEV_NS"
875875
check_err $?
876876

877877
# test external mode
878-
ip netns exec "$testns" ip link add dev "$DEV_NS" type ip6gretap external
878+
ip -netns "$testns" link add dev "$DEV_NS" type ip6gretap external
879879
check_err $?
880880

881-
ip netns exec "$testns" ip link del "$DEV_NS"
881+
ip -netns "$testns" link del "$DEV_NS"
882882
check_err $?
883883

884884
if [ $ret -ne 0 ]; then
@@ -910,40 +910,40 @@ kci_test_erspan()
910910
fi
911911

912912
# test native tunnel erspan v1
913-
ip netns exec "$testns" ip link add dev "$DEV_NS" type erspan seq \
913+
ip -netns "$testns" link add dev "$DEV_NS" type erspan seq \
914914
key 102 local 172.16.1.100 remote 172.16.1.200 \
915915
erspan_ver 1 erspan 488
916916
check_err $?
917917

918-
ip netns exec "$testns" ip addr add dev "$DEV_NS" 10.1.1.100/24
918+
ip -netns "$testns" addr add dev "$DEV_NS" 10.1.1.100/24
919919
check_err $?
920920

921-
ip netns exec "$testns" ip link set dev $DEV_NS up
921+
ip -netns "$testns" link set dev $DEV_NS up
922922
check_err $?
923923

924-
ip netns exec "$testns" ip link del "$DEV_NS"
924+
ip -netns "$testns" link del "$DEV_NS"
925925
check_err $?
926926

927927
# test native tunnel erspan v2
928-
ip netns exec "$testns" ip link add dev "$DEV_NS" type erspan seq \
928+
ip -netns "$testns" link add dev "$DEV_NS" type erspan seq \
929929
key 102 local 172.16.1.100 remote 172.16.1.200 \
930930
erspan_ver 2 erspan_dir ingress erspan_hwid 7
931931
check_err $?
932932

933-
ip netns exec "$testns" ip addr add dev "$DEV_NS" 10.1.1.100/24
933+
ip -netns "$testns" addr add dev "$DEV_NS" 10.1.1.100/24
934934
check_err $?
935935

936-
ip netns exec "$testns" ip link set dev $DEV_NS up
936+
ip -netns "$testns" link set dev $DEV_NS up
937937
check_err $?
938938

939-
ip netns exec "$testns" ip link del "$DEV_NS"
939+
ip -netns "$testns" link del "$DEV_NS"
940940
check_err $?
941941

942942
# test external mode
943-
ip netns exec "$testns" ip link add dev "$DEV_NS" type erspan external
943+
ip -netns "$testns" link add dev "$DEV_NS" type erspan external
944944
check_err $?
945945

946-
ip netns exec "$testns" ip link del "$DEV_NS"
946+
ip -netns "$testns" link del "$DEV_NS"
947947
check_err $?
948948

949949
if [ $ret -ne 0 ]; then
@@ -975,41 +975,41 @@ kci_test_ip6erspan()
975975
fi
976976

977977
# test native tunnel ip6erspan v1
978-
ip netns exec "$testns" ip link add dev "$DEV_NS" type ip6erspan seq \
978+
ip -netns "$testns" link add dev "$DEV_NS" type ip6erspan seq \
979979
key 102 local fc00:100::1 remote fc00:100::2 \
980980
erspan_ver 1 erspan 488
981981
check_err $?
982982

983-
ip netns exec "$testns" ip addr add dev "$DEV_NS" 10.1.1.100/24
983+
ip -netns "$testns" addr add dev "$DEV_NS" 10.1.1.100/24
984984
check_err $?
985985

986-
ip netns exec "$testns" ip link set dev $DEV_NS up
986+
ip -netns "$testns" link set dev $DEV_NS up
987987
check_err $?
988988

989-
ip netns exec "$testns" ip link del "$DEV_NS"
989+
ip -netns "$testns" link del "$DEV_NS"
990990
check_err $?
991991

992992
# test native tunnel ip6erspan v2
993-
ip netns exec "$testns" ip link add dev "$DEV_NS" type ip6erspan seq \
993+
ip -netns "$testns" link add dev "$DEV_NS" type ip6erspan seq \
994994
key 102 local fc00:100::1 remote fc00:100::2 \
995995
erspan_ver 2 erspan_dir ingress erspan_hwid 7
996996
check_err $?
997997

998-
ip netns exec "$testns" ip addr add dev "$DEV_NS" 10.1.1.100/24
998+
ip -netns "$testns" addr add dev "$DEV_NS" 10.1.1.100/24
999999
check_err $?
10001000

1001-
ip netns exec "$testns" ip link set dev $DEV_NS up
1001+
ip -netns "$testns" link set dev $DEV_NS up
10021002
check_err $?
10031003

1004-
ip netns exec "$testns" ip link del "$DEV_NS"
1004+
ip -netns "$testns" link del "$DEV_NS"
10051005
check_err $?
10061006

10071007
# test external mode
1008-
ip netns exec "$testns" ip link add dev "$DEV_NS" \
1008+
ip -netns "$testns" link add dev "$DEV_NS" \
10091009
type ip6erspan external
10101010
check_err $?
10111011

1012-
ip netns exec "$testns" ip link del "$DEV_NS"
1012+
ip -netns "$testns" link del "$DEV_NS"
10131013
check_err $?
10141014

10151015
if [ $ret -ne 0 ]; then

0 commit comments

Comments
 (0)