홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
c8100c1c 1 parent dff91af6

Simplifying the net-pingall scenario. 

Change-Id: Ifd152a8b93d06290aff58c7322d3b6687e4c6580
Inline Side-by-side
Showing 1 changed file with 3 additions and 7 deletions
...@@ -18,17 +18,13 @@ ...@@ -18,17 +18,13 @@
18 <group name="Net-Pingall"> 18 <group name="Net-Pingall">
19 <step name="Install-Apps" 19 <step name="Install-Apps"
20 exec="onos ${OC1} app activate org.onosproject.openflow org.onosproject.proxyarp org.onosproject.fwd"/> 20 exec="onos ${OC1} app activate org.onosproject.openflow org.onosproject.proxyarp org.onosproject.fwd"/>
21 - <step name="Check-Apps" requires="^" 21 + <step name="Check-Apps" requires="Install-Apps"
22 exec="onos-check-apps ${OC1} drivers,openflow,proxyarp,fwd includes"/> 22 exec="onos-check-apps ${OC1} drivers,openflow,proxyarp,fwd includes"/>
23 23
24 - <!-- TODO: take this out when initial pingall sweep is 100% --> 24 + <step name="Ping-All" requires="Check-Apps"
25 - <step name="Initial-Ping-All" requires="Check-Apps" unless="${ONOS_RF_BUG_FIXED}"
26 - exec="onos-mininet sendAndExpect py net.pingAll(1) --expect received"/>
27 -
28 - <step name="Ping-All-And-Verify" requires="Check-Apps,Initial-Ping-All"
29 exec="onos-mininet sendAndExpect py net.pingAll(1) --expect 600/600 received"/> 25 exec="onos-mininet sendAndExpect py net.pingAll(1) --expect 600/600 received"/>
30 26
31 - <step name="Check-Summary-For-Hosts" requires="~Ping-All-And-Verify" 27 + <step name="Check-Summary-For-Hosts" requires="~Ping-All"
32 exec="onos-check-summary ${OC1} [0-9]* 25 140 25"/> 28 exec="onos-check-summary ${OC1} [0-9]* 25 140 25"/>
33 </group> 29 </group>
34 </scenario> 30 </scenario>
......