WIP: mod: scripts/tests/z-wave-stack-binaries-test.sh (phcoval/test/review/main)

Signed-off-by: Philippe Coval <[email protected]>

Author: rzr

scripts/tests/z-wave-stack-binaries-test.sh

@@ -10,12 +10,13 @@ set -e
 set -o pipefail
 
 # Default configuration can be overloaded from env
-CONFIG_S2V2_ENABLED="defined" # TODO: https://github.com/Z-Wave-Alliance/z-wave-stack/pull/700
+CONFIG_PLAY_LOOP=false
+CONFIG_S2V2=true # TODO: https://github.com/Z-Wave-Alliance/z-wave-stack/pull/700
 
 # To be explicilty added to env
 sudo="${sudo:=}"
 
-duration=5 # Allocated time in mins until watchdog quit
+duration=8 # Allocated time in mins until watchdog quit
 
 ZPC_COMMAND="${ZPC_COMMAND:=/usr/bin/zpc}"
 
@@ -97,7 +98,7 @@ log_()
 {
     [ "$debug" != "" ] && echo \
             || clear >/dev/null 2>&1 || reset >/dev/null 2>&1 || :
-    printf "${yellow}info: $@ ${nocol}\n"
+    printf "${nocol}${yellow}info: $@ ${nocol}\n"
 }
 
 
@@ -145,12 +146,14 @@ sub_()
     local sub="#"
     local count=1
     local expect=""
-    local delay=1
+    local delay=0
 
     [ "$1" = "" ] || sub="$1"
     [ "$2" = "" ] || expect="$2"
     [ "$3" = "" ] || count="$3"
     [ "$4" = "" ] || delay="$4"
+    [ "" != "$sub" ] || sub="$pub"
+    [ "" != "$expect" ] || expect="$sub"
 
     printf "${cyan}sub: $sub${nocol} (count=${count})\n"
     mosquitto_sub -v -t "$sub" -C $count | tee "$mqtt_sub_log"
@@ -186,15 +189,17 @@ pubsub_()
     [ "" = "$debug" ] || log_ "pubsub_: $@"
     local pub="$1"
     local message="$2"
-    local sub="$pub"
-    local expect="$sub"
+    local sub=""
+    local expect=""
     local delay=1
     local count=1
 
     [ "$3" = "" ] || sub="$3"
     [ "$4" = "" ] || expect="$4"
     [ "$5" = "" ] || count="$5"
     [ "$6" = "" ] || delay="$6"
+    [ "" != "$sub" ] || sub="$pub"
+    [ "" != "$expect" ] || expect="$sub"
 
     if [ "" != "$pub" ] ; then
         printf "${green}pub: $pub${nocol}\n"
@@ -208,8 +213,9 @@ pubsub_()
     sleep $delay # Needed to dedup
     if [ "" != "$sub" ] ; then
         sub_ "$sub" "$expect" "$count"
+    else
+        sleep 1
     fi
-    sleep 1
     [  "0" = "$code" ] || exit_ $code # Quit on 1st failure
 }
 
@@ -344,7 +350,7 @@ zpc_cli_()
         for (( i=0; i<${#string}; i++ )); do
             char="${string:$i:1}"
             screen -S "$name" -p "zpc" -t zpc -X stuff "$char"
-            sleep .1
+            sleep .01
         done
         screen -S "$name" -p "zpc" -t zpc -X stuff "^M"
         sleep 1
@@ -358,27 +364,27 @@ play_net_add_node_()
     node="soc_switch_on_off"
     [ -z $1 ] || node="$1"
 
-    [ 0 -eq 0$nodeid ] || exit_ 21
-
     command="add_node"
-    log_ "net: $command: (node should be set in learn mode)"
+    log_ "net: $command: Node should not be included: $node"
     node_cli_ "$node" H
+    [ 0 -eq 0$nodeid ] || exit_ 21
 
+    log_ "net: Find controller"
     controller_cli_ H
     controller_cli_ n
 
+    log_ "net: $command: Find controller: $contid"
     sub="ucl/by-unid/$contunid/State"
     json='{"MaximumCommandDelay":0,"NetworkList":[""],"NetworkStatus":"Online functional","Security":"Z-Wave S2 Access Control"}'
     expect=$(echo "$json" | sed 's/\[/\\[/g; s/\]/\\]/g')
     sub_ "$sub" "$expect"
 
-    log_ "net: ${command}: node: Set to learn mode"
+    log_ "net: ${command}: node: Set to learn mode: $nodeid: $node"
     node_cli_ "$node" n
     [ 0 -eq 0$nodeid ] || exit_ 16
     node_cli_ "$node" l
-    node_cli_ "$node" n
 
-    log_ "net: cont: Add node"
+    log_ "net: ${command}: inclusion: $nodeid into ${homeid}"
     pub="ucl/by-unid/$contunid/ProtocolController/NetworkManagement/Write"
     message='{"State":"add node"}'
     sub="ucl/by-unid/+/State/SupportedCommands"
@@ -390,16 +396,16 @@ play_net_add_node_()
     node_cli_ "$node" n # Should not be 0
     pub=''
     sub=$(echo "$sub" | sed -e "s|/+/|/$nodeunid/|g")
-    pubsub_ "$pub" "$message" "$sub" "$sub"
+    pubsub_ "$pub" "$message" "$sub"
 
     node_cli_ "$node" d
     node_cli_ "$node" n
 
-    log_ "Takes time from interviewing to functional"
+    log_ "net: ${command}: Pass SecurityCode=${SecurityCode} of $node to controller"
     pub="ucl/by-unid/$contunid/ProtocolController/NetworkManagement/Write"
     message='{"State":"add node","StateParameters":{"UserAccept":true,"SecurityCode":"'${SecurityCode}'","AllowMultipleInclusions":false}}'
     sub="ucl/by-unid/$nodeunid/State"
-    pub_ "$pub" "$message"
+    pubsub_ "$pub" "$message" "$sub"
 
     NetworkStatus='.*' # Match: [ "Online interviewing", "Online functional" ]
     MaximumCommandDelay='.*' # Variable: 1, 300
@@ -414,19 +420,11 @@ play_net_add_node_()
     over_expect=$(echo "$json" | sed 's/\[/\\[/g; s/\]/\\]/g')
     over_expect="$sub $over_expect"
     over=false
-    while ! $over ; do # Multiple steps: "Online interviewing"+
+    while ! $over ; do # Multiple steps: "Online interviewing"+ 
         sub_ "$sub" "$expect"
-        # "Z-Wave S2 Authenticated"
-        grep -E "$over_expect" "$mqtt_sub_log" && over=true ||:
+        grep -E "$over_expect" "$mqtt_sub_log" && over=true || sleep 5
     done
 
-    sub="ucl/by-unid/+/State/Attributes/EndpointIdList/Reported"
-    sub=$(echo "$sub "| sed -e "s|/+/|/$nodeunid/|g")
-    json='{"value":[0]}'
-    expect=$(echo "$json" | sed 's/\[/\\[/g; s/\]/\\]/g')
-    expect="$sub $expect"
-    # sub_ "$sub" "$expect"
-
     node_cli_ "$node" H # expected on 1st time
     [ $conthomeid = $nodehomeid ] || exit_ 17
     node_cli_ "$node" n # 2 expected on 1st time
@@ -465,88 +463,98 @@ play_node_soc_switch_on_off_()
     echo
     node="soc_switch_on_off"
     type="OnOff"
+
     node_cli_ "$node" n
     log_ "$type: Play on $nodeunid ~T738437 ~T738442"
     attribute="$type"
 
     message="{}"
     sub="ucl/by-unid/$nodeunid/ep0/$type/Attributes/$attribute/Reported"
-    expect="$sub "'{"value":false}'
+    json='{"value":false}'
+    expect="$sub $json"
     sub_ "$sub" "$expect"
 
     command="ForceReadAttributes"
     message="{ \"value\": [\"OnOff\"] }"
     pub="ucl/by-unid/$nodeunid/ep0/$type/Commands/$command"
     sub="ucl/by-unid/$nodeunid/ep0/$type/Attributes/$attribute/Reported"
-    expect="$sub "'{"value":false}'
     pubsub_ "$pub" "$message" "$sub" "$expect"
 
     command="Toggle" # T738442
     message="{}"
     pub="ucl/by-unid/$nodeunid/ep0/$type/Commands/$command"
     sub="ucl/by-unid/$nodeunid/ep0/$type/Attributes/$attribute/Reported"
-    expect="$sub "'{"value":true}'
+    json='{"value":true}'
+    expect="$sub $json"
     pubsub_ "$pub" "$message" "$sub" "$expect"
 
-    expect="$sub "'{"value":false}'
+    json='{"value":false}'
+    expect="$sub $json"
     pubsub_ "$pub" "$message" "$sub" "$expect"
 
     command="On" # T738437
     pub="ucl/by-unid/$nodeunid/ep0/$type/Commands/$command"
-    expect="$sub "'{"value":true}'
+    json='{"value":true}'
+    expect="$sub $json"
     pubsub_ "$pub" "$message" "$sub" "$expect"
 
     command="Off" # T738437
     pub="ucl/by-unid/$nodeunid/ep0/$type/Commands/$command"
-    expect="$sub "'{"value":false}'
+    json='{"value":false}'
+    expect="$sub $json"
     pubsub_ "$pub" "$message" "$sub" "$expect"
 
-    log_ "$type: Events from device $nodeunid"
+    log_ "$type: Events from device $nodeunid: $node"
     node_cli_ "$node" 1 # From Off to On
-    expect="$sub "'{"value":true}'
+    json='{"value":true}'
+    expect="$sub $json"
     sub_ "$sub" "$expect"
     node_cli_ "$node" 1 # From On to Off
-    expect="$sub "'{"value":false}'
+    json='{"value":false}'
+    expect="$sub $json"
     sub_ "$sub" "$expect"
 }
 
 
 play_node_soc_multilevel_sensor_()
 {
-    local app="soc_multilevel_sensor"
+    local node="soc_multilevel_sensor"
     node_cli_ "$node" n
-    log_ "$app:: Play on $nodeid ~T738437 ~T738442"
-
-    log_ "$app: Initial state reported after inclusion"
+    log_ "$node: Play on $nodeid" # ~T738437 ~T738442
 
-    key='value' ; key='"'$key'"' # JSON quoted string
+    log_ "$node: Initial state reported after inclusion"
 
     ep="ep0/Basic/Attributes/PowerSource/Reported"
     sub="ucl/by-unid/${nodeunid}/$ep"
+    key="value" ; key='"'$key'"' # JSON string
     value='Battery' ; value='"'$value'"'
-    expect='{'$key':'$value'}'
-    expect="$sub $expect"
+    json='{'$key':'$value'}'
+    expect="$sub $json"
     sub_ "$sub" "$expect"
 
     ep='ep0/TemperatureMeasurement/Attributes/MeasuredValue/Reported'
     sub="ucl/by-unid/${nodeunid}/$ep"
     value=322
-    expect='{'$key':'$value'}'
-    expect="$sub $expect"
+    json='{'$key':'$value'}'
+    expect="$sub $json"
     sub_ "$sub" "$expect"
 
     ep='ep0/RelativityHumidity/Attributes/MeasuredValue/Reported'
     sub="ucl/by-unid/${nodeunid}/$ep"
     value=8
-    expect='{'$key':'$value'}'
-    expect="$sub $expect"
+    json='{'$key':'$value'}'
+    expect="$sub $json"
     sub_ "$sub" "$expect"
 
     ep="ep0/PowerConfiguration/Attributes/BatteryPercentageRemaining/Reported"
     sub="ucl/by-unid/${nodeunid}/$ep"
     value=100
-    expect='{'$key':'$value'}'
-    expect="$sub $expect"
+    json='{'$key':'$value'}'
+    expect="$sub $json"
+    sub_ "$sub" "$expect"
+
+    log_ "$type: Events from device $nodeunid: $node"
+    node_cli_ "$node" 1
     sub_ "$sub" "$expect"
 }
 
@@ -599,7 +607,7 @@ play_node_()
         play_node_${node}_
         play_net_remove_node_ $node
     fi
-    if [ ! -z ${CONFIG_S2V2_ENABLED} ]; then
+    if ${CONFIG_S2V2} ; then
         play_net_add_node_ $node
         play_node_s2v2_
         play_net_remove_node_ $node
@@ -616,7 +624,9 @@ play_nodes_()
         soc_multilevel_sensor
     )
     for node in ${nodes[@]} ; do
-        play_node_ $node
+        node_cli_ $node h
+        play_node_ $node || code=$?
+        [ 0$code -eq 0 ] || break
     done
 }
 
@@ -640,8 +650,11 @@ play_()
     expect=$(echo "$json" | sed 's/\[/\\[/g; s/\]/\\]/g')
     sub_ "$sub" "$expect"
 
-    play_nodes_ || code=$?
-
+    until ! ${CONFIG_PLAY_LOOP} ; do
+        play_nodes_ || code=$?
+        [ 0$code -eq 0 ] || break
+    done
+    
     exit_ 0$code
 }
 
@@ -683,35 +696,32 @@ default_()
 
     log_ "z-wave-stack-binaries: Check presence in ${z_wave_stack_binaries_bin_dir}"
     file -E "${z_wave_stack_binaries_bin_dir}/"*"REALTIME"*".elf"
-    sleep 2
-
+    sleep 1
+    
     cat <<EOF | tee "$file"
 # https://www.gnu.org/software/screen/manual/screen.html#Command-Summary
 
 hardstatus alwayslastline
-
 split -v
-screen -t "ncp_serial_api_controller" "1" $0 run_app_ ncp_serial_api_controller
-sleep 1
+focus left
 
 split
-focus down
+focus up
+screen -t "ncp_serial_api_controller" "1" $0 run_app_ ncp_serial_api_controller
+
+split -v
+focus right
 screen -t "soc_switch_on_off" "2" $0 run_app_ soc_switch_on_off
-sleep 1
 
-split
-focus down
+split -v
+focus right
 screen -t "soc_multilevel_sensor" "3" $0 run_app_ soc_multilevel_sensor
-sleep 1
 
-split
 focus down
-screen -t "zpc" "7" $0 run_ zpc
-sleep 2
+screen -t "zpc" "0" $0 run_ zpc
 
 focus right
 screen -t "mqtt" "8" $0 run_ mqtt
-sleep 1
 
 split
 focus down