Let MultiNode API calls express their own results

calls to sync, wait and send are no longer hidden behind a
lava-test-case, results are reported directly.

Change-Id: I1cc5fdbf337f274b9678e16dd61e1d491fb2dbfe

3 files changed, 18 insertions, 9 deletions

diff --git a/lava-test-shell/multi-node/multinode01.yaml b/lava-test-shell/multi-node/multinode01.yaml
index 5202f2a..555a0eb 100644
--- a/lava-test-shell/multi-node/multinode01.yaml
+++ b/lava-test-shell/multi-node/multinode01.yaml
@@ -19,12 +19,15 @@ metadata:
 # changes in the output of the relevant commands. Custom scripts are
 # needed which understand the tools within the target image.
 
+# calls to sync, wait and send are no longer hidden behind a
+# lava-test-case, results are reported directly.
+
 run:
     steps:
         - lava-test-case multinode-role-output --shell lava-role
-        - lava-test-case multinode-send-message --shell lava-send sending source=$(lava-self) role=$(lava-role) hostname=$(hostname -f) kernver=$(uname -r) kernhost=$(uname -n)
-        - lava-test-case multinode-wait-message --shell lava-wait-all sending
-        - lava-test-case multinode-sync --shell lava-sync running
+        - lava-send sending source=$(lava-self) role=$(lava-role) hostname=$(hostname -f) kernver=$(uname -r) kernhost=$(uname -n)
+        - lava-wait-all sending
+        - lava-sync running
         - lava-test-case multinode-group --shell lava-group
         - lava-test-case linux-linaro-ubuntu-netstat --shell netstat -an
         - lava-test-case linux-linaro-ubuntu-ifconfig-dump --shell ifconfig -a
diff --git a/lava-test-shell/multi-node/multinode02.yaml b/lava-test-shell/multi-node/multinode02.yaml
index a66cfd8..37aa6e0 100644
--- a/lava-test-shell/multi-node/multinode02.yaml
+++ b/lava-test-shell/multi-node/multinode02.yaml
@@ -19,16 +19,19 @@ metadata:
 # changes in the output of the relevant commands. Custom scripts are
 # needed which understand the tools within the target image.
 
+# calls to sync, wait and send are no longer hidden behind a
+# lava-test-case, results are reported directly.
+
 run:
     steps:
         - lava-test-case multinode-role-output --shell lava-role
-        - lava-test-case multinode-sync --shell lava-sync running
-        - lava-test-case multinode-send-message --shell lava-send sending source=$(lava-self) role=$(lava-role) hostname=$(hostname -f) kernver=$(uname -r) kernhost=$(uname -n)
+        - lava-sync running
+        - lava-send sending source=$(lava-self) role=$(lava-role) hostname=$(hostname -f) kernver=$(uname -r) kernhost=$(uname -n)
         - lava-test-case multinode-group --shell lava-group
         - lava-test-case linux-linaro-ubuntu-netstat --shell netstat -an
         - lava-test-case linux-linaro-ubuntu-ifconfig-dump --shell ifconfig -a
         - lava-test-case linux-linaro-ubuntu-route-dump-a --shell route
-        - lava-test-case multinode-wait-all --shell lava-wait-all sending
+        - lava-wait-all sending
         - lava-test-case ntpdate-check --shell ntpdate-debian
         - lava-test-case direct-update --shell apt-get update
         - lava-test-case direct-install --shell apt-get -y install curl
diff --git a/lava-test-shell/multi-node/multinode03.yaml b/lava-test-shell/multi-node/multinode03.yaml
index cb54a70..c1d0822 100644
--- a/lava-test-shell/multi-node/multinode03.yaml
+++ b/lava-test-shell/multi-node/multinode03.yaml
@@ -28,18 +28,21 @@ install:
 # changes in the output of the relevant commands. Custom scripts are
 # needed which understand the tools within the target image.
 
+# calls to sync, wait and send are no longer hidden behind a
+# lava-test-case, results are reported directly.
+
 run:
     steps:
         - lava-test-case multinode-role-output --shell lava-role
-        - lava-test-case multinode-sync --shell lava-sync running
-        - lava-test-case multinode-send-message --shell lava-send sending source=$(lava-self) role=$(lava-role) hostname=$(hostname -f) kernver=$(uname -r) kernhost=$(uname -n)
+        - lava-sync running
+        - lava-send sending source=$(lava-self) role=$(lava-role) hostname=$(hostname -f) kernver=$(uname -r) kernhost=$(uname -n)
         - lava-test-case multinode-group --shell lava-group
         - lava-test-case linux-linaro-ubuntu-netstat --shell netstat -an
         - lava-test-case linux-linaro-ubuntu-ifconfig-dump --shell ifconfig -a
         - lava-test-case linux-linaro-ubuntu-route-dump-a --shell route
         - lava-test-case linux-linaro-ubuntu-route-ifconfig-up-lo --shell ifconfig lo up
         - lava-test-case linux-linaro-ubuntu-route-dump-b --shell route
-        - lava-test-case multinode-wait --shell lava-wait-all sending
+        - lava-wait-all sending
         - lava-test-case ntpdate-check --shell ntpdate-debian
         - lava-test-case curl-http --shell curl -o img.tar.gz http://images.validation.linaro.org/lava-masters/dynamic/cubietruck/cbtruck_img.tar.gz
         - lava-test-case tar-tgz --shell tar -tzf img.tar.gz