Skip to content

Commit dc8eb10

Browse files
geliangtangkuba-moo
authored andcommitted
selftests: mptcp: add testcases for setting the address ID
Since the address ID can be set from user-space, some of the tests in pm_netlink.sh will fail. This patch fixed the failures, and add the testcases for setting the address ID. Signed-off-by: Geliang Tang <[email protected]> Signed-off-by: Mat Martineau <[email protected]> Signed-off-by: Jakub Kicinski <[email protected]>
1 parent efd5a4c commit dc8eb10

File tree

1 file changed

+39
-2
lines changed

1 file changed

+39
-2
lines changed

tools/testing/selftests/net/mptcp/pm_netlink.sh

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ id 3 flags signal,backup 10.0.1.3" "dump addrs after del"
9191
ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.3
9292
check "ip netns exec $ns1 ./pm_nl_ctl get 4" "" "duplicate addr"
9393

94-
ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.4 id 10 flags signal
94+
ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.4 flags signal
9595
check "ip netns exec $ns1 ./pm_nl_ctl get 4" "id 4 flags signal 10.0.1.4" "id addr increment"
9696

9797
for i in `seq 5 9`; do
@@ -102,9 +102,10 @@ check "ip netns exec $ns1 ./pm_nl_ctl get 10" "" "above hard addr limit"
102102

103103
for i in `seq 9 256`; do
104104
ip netns exec $ns1 ./pm_nl_ctl del $i
105-
ip netns exec $ns1 ./pm_nl_ctl add 10.0.0.9
105+
ip netns exec $ns1 ./pm_nl_ctl add 10.0.0.9 id $((i+1))
106106
done
107107
check "ip netns exec $ns1 ./pm_nl_ctl dump" "id 1 flags 10.0.1.1
108+
id 2 flags 10.0.0.9
108109
id 3 flags signal,backup 10.0.1.3
109110
id 4 flags signal 10.0.1.4
110111
id 5 flags signal 10.0.1.5
@@ -127,4 +128,40 @@ ip netns exec $ns1 ./pm_nl_ctl limits 8 8
127128
check "ip netns exec $ns1 ./pm_nl_ctl limits" "accept 8
128129
subflows 8" "set limits"
129130

131+
ip netns exec $ns1 ./pm_nl_ctl flush
132+
ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.1
133+
ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.2
134+
ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.3 id 100
135+
ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.4
136+
ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.5 id 254
137+
ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.6
138+
ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.7
139+
ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.8
140+
check "ip netns exec $ns1 ./pm_nl_ctl dump" "id 1 flags 10.0.1.1
141+
id 2 flags 10.0.1.2
142+
id 3 flags 10.0.1.7
143+
id 4 flags 10.0.1.8
144+
id 100 flags 10.0.1.3
145+
id 101 flags 10.0.1.4
146+
id 254 flags 10.0.1.5
147+
id 255 flags 10.0.1.6" "set ids"
148+
149+
ip netns exec $ns1 ./pm_nl_ctl flush
150+
ip netns exec $ns1 ./pm_nl_ctl add 10.0.0.1
151+
ip netns exec $ns1 ./pm_nl_ctl add 10.0.0.2 id 254
152+
ip netns exec $ns1 ./pm_nl_ctl add 10.0.0.3
153+
ip netns exec $ns1 ./pm_nl_ctl add 10.0.0.4
154+
ip netns exec $ns1 ./pm_nl_ctl add 10.0.0.5 id 253
155+
ip netns exec $ns1 ./pm_nl_ctl add 10.0.0.6
156+
ip netns exec $ns1 ./pm_nl_ctl add 10.0.0.7
157+
ip netns exec $ns1 ./pm_nl_ctl add 10.0.0.8
158+
check "ip netns exec $ns1 ./pm_nl_ctl dump" "id 1 flags 10.0.0.1
159+
id 2 flags 10.0.0.4
160+
id 3 flags 10.0.0.6
161+
id 4 flags 10.0.0.7
162+
id 5 flags 10.0.0.8
163+
id 253 flags 10.0.0.5
164+
id 254 flags 10.0.0.2
165+
id 255 flags 10.0.0.3" "wrap-around ids"
166+
130167
exit $ret

0 commit comments

Comments
 (0)