Adding topology overlay support for the server-side topo layout app.
Also:
- parametrized access network layout in preparation for multiple variants
- removed WS authentication code temporarily until proper forced-logout is implemented
- updated STC warden environment (test only)
Change-Id: I0adbe60737828db79350e7eb2fc72cf313b78a28
diff --git a/tools/dev/bash_profile b/tools/dev/bash_profile
index 9820b32..ab95905 100644
--- a/tools/dev/bash_profile
+++ b/tools/dev/bash_profile
@@ -64,6 +64,9 @@
alias op='onos-package'
alias ot='onos-test'
+alias obr='while ! ob; do echo "retrying"; done'
+alias opr='while ! op; do echo "retrying"; done'
+
alias deprecatedAlias='echo "This alias has been deprecated."'
alias obi=deprecatedAlias
alias obs=deprecatedAlias
@@ -195,9 +198,13 @@
done
}
-# ON.Lab shared test cell warden address
+# Open Networking Foundation shared test cell warden address
export CELL_WARDEN="10.192.19.72"
-export CELL_SLAVES="$CELL_WARDEN 10.192.19.71 10.192.19.70"
+export CELL_SLAVE_1=$CELL_WARDEN
+export CELL_SLAVE_2="10.192.19.71"
+export CELL_SLAVE_3="10.192.19.70"
+export CELL_SLAVE_4="10.192.19.77"
+export CELL_SLAVES="$CELL_SLAVE_1 $CELL_SLAVE_2 $CELL_SLAVE_3 $CELL_SLAVE_4"
# Clears cell environment
function clearCell {
diff --git a/tools/test/bin/stc-warden b/tools/test/bin/stc-warden
index 20baff2..24a924a 100755
--- a/tools/test/bin/stc-warden
+++ b/tools/test/bin/stc-warden
@@ -11,6 +11,10 @@
for slave in $CELL_SLAVES; do
echo "========================================================"
echo "$slave:"
+ ssh sdn@$slave "touch foo && echo 'Disk OK' || echo 'Disk READ-ONLY'"
+ let ok=ok+$?
+ ssh sdn@$slave "df -h /"
+ let ok=ok+$?
ssh sdn@$slave sudo lxc-ls --fancy
let ok=ok+$?
done