[cli] support joiner discerner (#5298)

This commit adds support joiner discerner in CLI. The format of joiner
discerner is `number/length`. For example `0xabc/12` means the discerner
value is `0xabc` and the length is `12`.

tests/scripts/expect/_common.exp

@@ -27,7 +27,7 @@
 #  POSSIBILITY OF SUCH DAMAGE.
 #
 
-proc wait_for {command expected} {
+proc wait_for {command success {failure {[\r\n]FAILURE_NOT_EXPECTED[\r\n]}}} {
     set result 0
     set timeout 1
     for {set i 0} {$i < 20} {incr i} {
@@ -36,9 +36,12 @@ proc wait_for {command expected} {
         }
 
         expect {
-            -re $expected {
+            -re $success {
                 set result 1
             }
+            -re $failure {
+                exit 1
+            }
             timeout {
                 # Do nothing
             }
@@ -64,9 +67,38 @@ proc spawn_node {id} {
     return $spawn_id
 }
 
+proc setup_leader {} {
+    # Sets up a Thread network spawn_1 as the leader.
+    global spawn_1
+    global spawn_id
+    global env
+
+    set spawn_1 [spawn_node 1]
+
+    set spawn_id $spawn_1
+    send "dataset init new\n"
+    expect "Done"
+    send "dataset commit active\n"
+    expect "Done"
+    send "ifconfig up\n"
+    expect "Done"
+    send "thread start\n"
+    expect "Done"
+    wait_for "state" "leader"
+    expect "Done"
+}
+
 proc dispose {} {
     send "\x04"
     expect eof
 }
 
+proc dispose_leader {} {
+    global spawn_1
+    global spawn_id
+
+    set spawn_id $spawn_1
+    dispose
+}
+
 set timeout 10

tests/scripts/expect/_multinode.exp

@@ -38,7 +38,6 @@ proc setup_nodes {} {
     global spawn_id
     global env
 
-    set spawn_1 [spawn_node 1]
     set spawn_2 [spawn_node 2]
     set psk "J01NME"
 
@@ -48,17 +47,9 @@ proc setup_nodes {} {
     set eui64 $expect_out(1,string)
     expect "Done"
 
+    setup_leader
+
     set spawn_id $spawn_1
-    send "dataset init new\n"
-    expect "Done"
-    send "dataset commit active\n"
-    expect "Done"
-    send "ifconfig up\n"
-    expect "Done"
-    send "thread start\n"
-    expect "Done"
-    wait_for "state" "leader"
-    expect "Done"
     send "commissioner start\n"
     expect "Done"
     expect "Commissioner: active"
@@ -84,12 +75,10 @@ proc setup_nodes {} {
 }
 
 proc dispose_nodes {} {
-    global spawn_1
     global spawn_2
     global spawn_id
 
-    set spawn_id $spawn_1
-    dispose
+    dispose_leader
     set spawn_id $spawn_2
     dispose
 }

tests/scripts/expect/cli-discerner.exp

@@ -0,0 +1,85 @@
+#!/usr/bin/expect -f
+#
+#  Copyright (c) 2020, The OpenThread Authors.
+#  All rights reserved.
+#
+#  Redistribution and use in source and binary forms, with or without
+#  modification, are permitted provided that the following conditions are met:
+#  1. Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#  2. Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#  3. Neither the name of the copyright holder nor the
+#     names of its contributors may be used to endorse or promote products
+#     derived from this software without specific prior written permission.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+#  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+#  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+#  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+#  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+#  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+#  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+#  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+#  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#  POSSIBILITY OF SUCH DAMAGE.
+#
+
+source "tests/scripts/expect/_common.exp"
+
+setup_leader
+
+set pskd "J01NME"
+set discerner "0xabc/12"
+
+send "commissioner start\n"
+expect "Done"
+expect "Commissioner: active"
+send "commissioner joiner add 1/0 $pskd\n"
+expect "InvalidArgs"
+send "commissioner joiner add $discerner $pskd\n"
+expect "Done"
+
+set spawn_2 [spawn_node 2]
+
+set spawn_id $spawn_2
+send "mode rs\n"
+expect "Done"
+send "ifconfig up\n"
+expect "Done"
+send "joiner discerner\n"
+expect "NotFound"
+send "joiner discerner 1/1 2\n"
+expect "InvalidArgs"
+send "joiner discerner 1\n"
+expect "InvalidArgs"
+send "joiner discerner 1/\n"
+expect "InvalidArgs"
+send "joiner discerner 1/128\n"
+expect "InvalidArgs"
+send "joiner discerner 1/-1\n"
+expect "InvalidArgs"
+send "joiner discerner 1/0\n"
+expect "InvalidArgs"
+send "joiner discerner invalid/20\n"
+expect "InvalidArgs"
+send "joiner discerner clear\n"
+expect "Done"
+send "joiner discerner $discerner\n"
+expect "Done"
+send "joiner discerner\n"
+expect "$discerner"
+expect "Done"
+send "joiner start $pskd\n"
+expect "Done"
+wait_for "" "Join success" "Join failed"
+send "thread start\n"
+expect "Done"
+wait_for "state" "child"
+expect "Done"
+
+dispose
+
+dispose_leader