홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
4b84baff 1 parent 82e95a5d

Fixed a few onos-check-* tools. 

Change-Id: I2bda9677aec461c091c6e24c5ba0fd6f6dacfff9
Inline Side-by-side
Showing 6 changed files with 12 additions and 11 deletions
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
9 aux=/tmp/stc-$$.log 9 aux=/tmp/stc-$$.log
10 trap "rm -f $aux $aux.1 $aux.2 2>/dev/null" EXIT 10 trap "rm -f $aux $aux.1 $aux.2 2>/dev/null" EXIT
11 11
12 -onos ${1:-$OCI} "onos:apps -s -a" > $aux 12 +onos ${1:-$OCI} "onos:apps -s -a" | grep -v /bin/client > $aux
13 cat $aux 13 cat $aux
14 14
15 # Normalize the installed apps 15 # Normalize the installed apps
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 # ----------------------------------------------------------------------------- 4 # -----------------------------------------------------------------------------
5 5
6 aux=/tmp/stc-$$.log 6 aux=/tmp/stc-$$.log
7 -trap "rm -f $aux $aux.1 $aux.2 2>/dev/null" EXIT 7 +trap "rm -f $aux 2>/dev/null" EXIT
8 8
9 onos ${1:-$OCI} "onos:flows" > $aux 9 onos ${1:-$OCI} "onos:flows" > $aux
10 cat $aux 10 cat $aux
......
...@@ -6,15 +6,14 @@ ...@@ -6,15 +6,14 @@
6 aux=/tmp/stc-$$.log 6 aux=/tmp/stc-$$.log
7 trap "rm -f $aux $aux.1 $aux.2 2>/dev/null" EXIT 7 trap "rm -f $aux $aux.1 $aux.2 2>/dev/null" EXIT
8 8
9 -onos ${1:-$OCI} "onos:nodes" > $aux 9 +onos ${1:-$OCI} "onos:nodes" | grep -v /bin/client > $aux
10 cat $aux 10 cat $aux
11 11
12 # Normalize the nodes 12 # Normalize the nodes
13 cut -d= -f3 $aux | cut -d: -f1 | sort > $aux.1 13 cut -d= -f3 $aux | cut -d: -f1 | sort > $aux.1
14 14
15 -# Normalize the expected apps 15 +# Normalize the expected nodes
16 -ONOS_NODES=$(env | egrep "OC[0-9]*=" | cut -d= -f2 | sort) 16 +nodes=${2:-$ONOS_INSTANCES}
17 -nodes=${2:-$ONOS_NODES}
18 (for node in $nodes; do echo $node; done) | sort > $aux.2 17 (for node in $nodes; do echo $node; done) | sort > $aux.2
19 18
20 # Check for differences 19 # Check for differences
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 # ----------------------------------------------------------------------------- 4 # -----------------------------------------------------------------------------
5 5
6 aux=/tmp/stc-$$.log 6 aux=/tmp/stc-$$.log
7 -trap "rm -f $aux $aux.1 $aux.2 2>/dev/null" EXIT 7 +trap "rm -f $aux 2>/dev/null" EXIT
8 8
9 onos ${1:-$OCI} "onos:summary" > $aux 9 onos ${1:-$OCI} "onos:summary" > $aux
10 cat $aux 10 cat $aux
......
...@@ -7,11 +7,11 @@ ...@@ -7,11 +7,11 @@
7 . $ONOS_ROOT/tools/build/envDefaults 7 . $ONOS_ROOT/tools/build/envDefaults
8 8
9 aux=/tmp/stc-$$.log 9 aux=/tmp/stc-$$.log
10 -trap "rm -f $aux $aux.1 $aux.2 2>/dev/null" EXIT 10 +trap "rm -f $aux 2>/dev/null" EXIT
11 11
12 -onos ${1} "onos:ui-views" > $aux 12 +onos ${1:-$OCI} "onos:ui-views" > $aux
13 cat $aux 13 cat $aux
14 14
15 -shift 15 +[ $# -gt 0 ] && shift
16 16
17 -grep "$@" $aux
...\ No newline at end of file ...\ No newline at end of file
17 +grep "${@:-topo}" $aux
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -33,6 +33,8 @@ ...@@ -33,6 +33,8 @@
33 <step name="Wait-for-Start-${#}" exec="onos-wait-for-start ${OC#}" 33 <step name="Wait-for-Start-${#}" exec="onos-wait-for-start ${OC#}"
34 requires="Install-${#},~Secure-SSH"/> 34 requires="Install-${#},~Secure-SSH"/>
35 35
36 + <step name="Check-Nodes-${#}" exec="onos-check-nodes ${OC#}"
37 + requires="~Wait-for-Start-${#}"/>
36 <step name="Check-Logs-${#}" exec="onos-check-logs ${OC#}" 38 <step name="Check-Logs-${#}" exec="onos-check-logs ${OC#}"
37 requires="~Wait-for-Start-${#}"/> 39 requires="~Wait-for-Start-${#}"/>
38 <step name="Check-Components-${#}" 40 <step name="Check-Components-${#}"
......