Enhancing STC and cleaning up various test topos.
Change-Id: I7f5b349835ebf3d7da824be0aa2cddd860631f84
diff --git a/tools/test/bin/onos-check-apps b/tools/test/bin/onos-check-apps
index db5a473..8dfe9f0 100755
--- a/tools/test/bin/onos-check-apps
+++ b/tools/test/bin/onos-check-apps
@@ -3,6 +3,9 @@
# Checks whether all and only the ONOS apps configured in ONOS_APPS are active.
# -----------------------------------------------------------------------------
+[ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
+. $ONOS_ROOT/tools/build/envDefaults
+
aux=/tmp/stc-$$.log
trap "rm -f $aux $aux.1 $aux.2 2>/dev/null" EXIT
diff --git a/tools/test/bin/onos-check-summary b/tools/test/bin/onos-check-summary
new file mode 100755
index 0000000..daa5253
--- /dev/null
+++ b/tools/test/bin/onos-check-summary
@@ -0,0 +1,18 @@
+#!/bin/bash
+# -----------------------------------------------------------------------------
+# Checks ONOS summary data
+# -----------------------------------------------------------------------------
+
+aux=/tmp/stc-$$.log
+trap "rm -f $aux $aux.1 $aux.2 2>/dev/null" EXIT
+
+onos ${1:-$OCI} "onos:summary" > $aux
+cat $aux
+
+let status=0
+grep -q "nodes=$2" $aux || let status=status+1
+grep -q "devices=$3" $aux || let status=status+1
+grep -q "links=$4" $aux || let status=status+1
+grep -q "hosts=$5" $aux || let status=status+1
+
+exit $status
\ No newline at end of file
diff --git a/tools/test/bin/onos-check-views b/tools/test/bin/onos-check-views
new file mode 100755
index 0000000..9b43414
--- /dev/null
+++ b/tools/test/bin/onos-check-views
@@ -0,0 +1,17 @@
+#!/bin/bash
+# -----------------------------------------------------------------------------
+# Checks whether all and only the ONOS apps configured in ONOS_APPS are active.
+# -----------------------------------------------------------------------------
+
+[ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
+. $ONOS_ROOT/tools/build/envDefaults
+
+aux=/tmp/stc-$$.log
+trap "rm -f $aux $aux.1 $aux.2 2>/dev/null" EXIT
+
+onos ${1} "onos:ui-views" > $aux
+cat $aux
+
+shift
+
+grep "$@" $aux
\ No newline at end of file
diff --git a/tools/test/bin/onos-wait-for-start b/tools/test/bin/onos-wait-for-start
index 106165a..93500f5 100755
--- a/tools/test/bin/onos-wait-for-start
+++ b/tools/test/bin/onos-wait-for-start
@@ -10,10 +10,14 @@
ssh -t $remote "
# Wait until we reach the run-level 100
- running=""
- while [ -z \$running ]; do
+ for i in \$(seq 1 30); do
$ONOS_INSTALL_DIR/bin/onos bundle:list 2>/dev/null | \
- grep -q 'START LEVEL 100' && running=1 || sleep 2
+ grep -q 'START LEVEL 100' && break || sleep 2
done
+ # Wait until ApplicationManager is available
+ for i in \$(seq 1 5); do
+ grep -q \" ApplicationManager .* Started\" \
+ $ONOS_INSTALL_DIR/log/karaf.log && break || sleep 1
+ done
"