홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
Committed by Brian O'Connor
b7a54f2c 1 parent 50e28e85

Fixed onos-wait-for-start to time-out with error. 

Fixed beast-5 cell.

Change-Id: I0cda404628a1f2d42814032abd6e3ee5fec125cb
Inline Side-by-side
Showing 2 changed files with 6 additions and 2 deletions
...@@ -10,7 +10,7 @@ remote=$ONOS_USER@${1:-$OCI} ...@@ -10,7 +10,7 @@ remote=$ONOS_USER@${1:-$OCI}
10 10
11 ssh -t $remote " 11 ssh -t $remote "
12 # Wait until we reach the run-level 100 12 # Wait until we reach the run-level 100
13 - for i in \$(seq 1 30); do 13 + for i in \$(seq 1 20); do
14 $ONOS_INSTALL_DIR/bin/onos bundle:list 2>/dev/null | \ 14 $ONOS_INSTALL_DIR/bin/onos bundle:list 2>/dev/null | \
15 grep -q 'START LEVEL 100' && break || sleep 2 15 grep -q 'START LEVEL 100' && break || sleep 2
16 done 16 done
...@@ -20,4 +20,6 @@ ssh -t $remote " ...@@ -20,4 +20,6 @@ ssh -t $remote "
20 grep -q \" ApplicationManager .* Started\" \ 20 grep -q \" ApplicationManager .* Started\" \
21 $ONOS_INSTALL_DIR/log/karaf.log && break || sleep 1 21 $ONOS_INSTALL_DIR/log/karaf.log && break || sleep 1
22 done 22 done
23 +
24 + grep -q \" ApplicationManager .* Started\" $ONOS_INSTALL_DIR/log/karaf.log
23 " 25 "
......
...@@ -6,6 +6,8 @@ export ONOS_NIC="10.254.1.*" ...@@ -6,6 +6,8 @@ export ONOS_NIC="10.254.1.*"
6 # ONOS Test proxy 6 # ONOS Test proxy
7 export OCT=10.254.1.200 7 export OCT=10.254.1.200
8 8
9 +export OCN=10.254.1.200
10 +
9 # Use the 1G NICs for external access 11 # Use the 1G NICs for external access
10 export OC1=10.254.1.201 12 export OC1=10.254.1.201
11 export OC2=10.254.1.202 13 export OC2=10.254.1.202
...@@ -13,4 +15,4 @@ export OC3=10.254.1.203 ...@@ -13,4 +15,4 @@ export OC3=10.254.1.203
13 export OC4=10.254.1.204 15 export OC4=10.254.1.204
14 export OC5=10.254.1.205 16 export OC5=10.254.1.205
15 17
16 -export ONOS_APPS="drivers,null,intentperf" 18 +export ONOS_APPS="drivers,openflow,proxyarp,fwd"
......