홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Ray Milkey
Committed by Gerrit Code Review
407ef253 1 parent b0d0ada0

STC - check that flows are installed before checking pings 

Change-Id: Ia2853932db8e27bd1447d225b160c8e583d7df61
Inline Side-by-side
Showing 2 changed files with 5 additions and 1 deletions
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 aux=/tmp/stc-$$.log 6 aux=/tmp/stc-$$.log
7 trap "rm -f $aux 2>/dev/null" EXIT 7 trap "rm -f $aux 2>/dev/null" EXIT
8 8
9 -for i in {1..5}; do 9 +for i in {1..6}; do
10 onos ${1:-$OCI} "onos:flows" > $aux 10 onos ${1:-$OCI} "onos:flows" > $aux
11 if grep "PENDING_" $aux; then 11 if grep "PENDING_" $aux; then
12 sleep 5 12 sleep 5
......
...@@ -54,6 +54,10 @@ ...@@ -54,6 +54,10 @@
54 <step name="Net-Create-Flows.Host-to-4" requires="^" 54 <step name="Net-Create-Flows.Host-to-4" requires="^"
55 exec="create-flow.py ${OC1} f10 of:0000000000000004 3 1"/> 55 exec="create-flow.py ${OC1} f10 of:0000000000000004 3 1"/>
56 56
57 + <!-- Make sure all flows are added -->
58 + <step name="Net-Create-Flows.Check-Flows-Added" requires="^"
59 + exec="onos-check-flows ${OC1}"/>
60 +
57 <!-- Check that connectivity was established --> 61 <!-- Check that connectivity was established -->
58 <step name="Net-Create-Flows.Ping-XY" requires="^" 62 <step name="Net-Create-Flows.Ping-XY" requires="^"
59 exec="onos-mininet sendAndExpect h1 ping -c1 h4 --expect \ 0% packet loss"/> 63 exec="onos-mininet sendAndExpect h1 ping -c1 h4 --expect \ 0% packet loss"/>
......