Fixing & enhancing STC test scenarios.
Change-Id: Ieff7ce5350a69d8ebb215a2344c67e41479cf371
diff --git a/tools/test/bin/onos-mininet b/tools/test/bin/onos-mininet
index 44d489b..ef2c8ea 100755
--- a/tools/test/bin/onos-mininet
+++ b/tools/test/bin/onos-mininet
@@ -6,7 +6,7 @@
[ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
. $ONOS_ROOT/tools/build/envDefaults
-export MAX_WAIT=45
+export MAX_WAIT=60
cmd="$1" && shift
log="screenlog.0"
diff --git a/tools/test/scenarios/net-pingall.xml b/tools/test/scenarios/net-pingall.xml
index 49ed6e6..41d7354 100644
--- a/tools/test/scenarios/net-pingall.xml
+++ b/tools/test/scenarios/net-pingall.xml
@@ -16,8 +16,14 @@
<scenario name="net-pingall" description="Network pingall test">
<!-- TODO: parametrize this via recipes -->
<group name="Net-Pingall">
- <step name="Ping-All-And-Verify"
- exec="onos-mininet sendAndExpect py net.pingAll(1) --expect Results: [0-5]% dropped"/>
+ <step name="Install-Apps"
+ exec="onos ${OC1} app activate org.onosproject.openflow org.onosproject.proxyarp org.onosproject.fwd"/>
+
+ <step name="Check-Apps" requires="Install-Apps"
+ exec="onos-check-apps ${OC1} drivers,openflow,proxyarp,fwd"/>
+
+ <step name="Ping-All-And-Verify" requires="Check-Apps"
+ exec="onos-mininet sendAndExpect py net.pingAll(1) --expect Results: .% dropped"/>
<step name="Check-Summary-For-Hosts" requires="~Ping-All-And-Verify"
exec="onos-check-summary ${OC1} [0-9]* 25 140 25"/>
diff --git a/tools/test/scenarios/net-setup.xml b/tools/test/scenarios/net-setup.xml
index 6df7aa3..8a2fd33 100644
--- a/tools/test/scenarios/net-setup.xml
+++ b/tools/test/scenarios/net-setup.xml
@@ -19,13 +19,7 @@
<step name="Push-Topos" exec="onos-push-topos ${OCN}"/>
<step name="Stop-Mininet-If-Needed" env="~" exec="onos-mininet stop"/>
- <step name="Install-Apps"
- exec="onos ${OC1} app activate org.onosproject.openflow org.onosproject.proxyarp org.onosproject.fwd"/>
-
- <step name="Check-Apps" requires="Install-Apps"
- exec="onos-check-apps ${OC1} drivers,openflow,proxyarp,fwd"/>
-
- <step name="Wipe-Out-Data-Before" requires="~Check-Apps" exec="onos-wipe-out"/>
+ <step name="Wipe-Out-Data-Before" exec="onos-wipe-out"/>
<step name="Initial-Summary-Check" requires="~Wipe-Out-Data-Before"
exec="onos-check-summary ${OC1} [0-9]* 0 0 0"/>
@@ -42,5 +36,8 @@
<step name="Balance-Masters" requires="Check-Summary"
exec="onos ${OC1} balance-masters"/>
+
+ <step name="Pause-For-Masters" requires="Balance-Masters"
+ exec="sleep 10"/>
</group>
</scenario>
\ No newline at end of file