Enhancing ONOS mininet topology approach to remove boilerplate and simplify testing and demos.
Change-Id: Id8ab2bfa74254560714f4c27a9342693d1dc9788
diff --git a/tools/test/scenarios/net-setup.xml b/tools/test/scenarios/net-setup.xml
index 702480e..6599d39 100644
--- a/tools/test/scenarios/net-setup.xml
+++ b/tools/test/scenarios/net-setup.xml
@@ -34,13 +34,7 @@
<step name="Wait-For-Mininet" requires="Start-Mininet"
exec="onos-mininet wait 10"/>
- <step name="Show-Network" requires="Wait-For-Mininet"
- exec="onos-mininet sendAndExpect net --expect ."/>
-
- <step name="Discover-Hosts" requires="Show-Network"
- exec="onos-mininet sendAndExpect py [ h.cmd('arping -U -c 1 ' + h.IP()) for h in net.hosts ] --expect ."/>
-
- <step name="Check-Summary" requires="Discover-Hosts"
+ <step name="Check-Summary" requires="~Wait-For-Mininet"
exec="onos-check-summary ${OC1} [0-9]* 25 140 25"/>
<step name="Balance-Masters" requires="~Check-Summary" if="${OC2}"