From ebe42a5b1f3725f33666e5c19afa492906a3fba9 Mon Sep 17 00:00:00 2001 From: Thomas Vachuska Date: Wed, 10 Jun 2015 12:05:50 -0700 Subject: [PATCH] Fixed onos-wait-for-start to time-out with error. Fixed beast-5 cell. Change-Id: I0cda404628a1f2d42814032abd6e3ee5fec125cb --- tools/test/bin/onos-wait-for-start | 4 +++- tools/test/cells/beast-5 | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/test/bin/onos-wait-for-start b/tools/test/bin/onos-wait-for-start index 93500f51d7..030e5ccbcd 100755 --- a/tools/test/bin/onos-wait-for-start +++ b/tools/test/bin/onos-wait-for-start @@ -10,7 +10,7 @@ remote=$ONOS_USER@${1:-$OCI} ssh -t $remote " # Wait until we reach the run-level 100 - for i in \$(seq 1 30); do + for i in \$(seq 1 20); do $ONOS_INSTALL_DIR/bin/onos bundle:list 2>/dev/null | \ grep -q 'START LEVEL 100' && break || sleep 2 done @@ -20,4 +20,6 @@ ssh -t $remote " grep -q \" ApplicationManager .* Started\" \ $ONOS_INSTALL_DIR/log/karaf.log && break || sleep 1 done + + grep -q \" ApplicationManager .* Started\" $ONOS_INSTALL_DIR/log/karaf.log " diff --git a/tools/test/cells/beast-5 b/tools/test/cells/beast-5 index 8e959c58b4..e23f077104 100644 --- a/tools/test/cells/beast-5 +++ b/tools/test/cells/beast-5 @@ -6,6 +6,8 @@ export ONOS_NIC="10.254.1.*" # ONOS Test proxy export OCT=10.254.1.200 +export OCN=10.254.1.200 + # Use the 1G NICs for external access export OC1=10.254.1.201 export OC2=10.254.1.202 @@ -13,4 +15,4 @@ export OC3=10.254.1.203 export OC4=10.254.1.204 export OC5=10.254.1.205 -export ONOS_APPS="drivers,null,intentperf" +export ONOS_APPS="drivers,openflow,proxyarp,fwd"