commit eb135649140e2c03a23315bf993b249735fbc1b2
author Thomas Vachuska <tom@onlab.us> Thu Jul 23 17:35:37 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Fri Jul 24 00:36:06 2015 +0000
tree e710d1292b081409c43c4ab3a09ae007a337999c
parent 5e1f1291757f14795fb3b57b56a490b2cd797930

Adding check for pending flows to net-setup scenario.

Change-Id: Ib01ff566cd45dc7ba211c479d05a63c9444864bb

tools/test/bin/onos-check-flows

diff --git a/tools/test/bin/onos-check-flows b/tools/test/bin/onos-check-flows
new file mode 100755
index 0000000..6bfca16
--- /dev/null
+++ b/tools/test/bin/onos-check-flows
@@ -0,0 +1,15 @@
+#!/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:flows" > $aux
+cat $aux
+
+let status=0
+grep "PENDING_" $aux && let status=status+1
+
+exit $status
\ No newline at end of file

tools/test/scenarios/net-setup.xml

diff --git a/tools/test/scenarios/net-setup.xml b/tools/test/scenarios/net-setup.xml
index 8a2fd33..63cd9c3 100644
--- a/tools/test/scenarios/net-setup.xml
+++ b/tools/test/scenarios/net-setup.xml
@@ -34,6 +34,9 @@
         <step name="Check-Summary" requires="Wait-For-Mininet"
               exec="onos-check-summary ${OC1} [0-9]* 25 140 0"/>
 
+        <step name="Check-Flows" requires="Wait-For-Mininet"
+              exec="onos-check-flows ${OC1}"/>
+
         <step name="Balance-Masters" requires="Check-Summary"
               exec="onos ${OC1} balance-masters"/>