Adding more patience to onos-check-summary and changing sequencing of smoke.xml scenario.

Change-Id: I1db9084524daa8c5494d0066be30d801e78d0fc3

@@ -6,15 +6,22 @@
 aux=/tmp/stc-$$.log
 trap "rm -f $aux 2>/dev/null" EXIT
 
-onos ${1:-$OCI} "onos:summary" > $aux
-cat $aux
+for i in {1..10}; do
+    onos ${1:-$OCI} "onos:summary" > $aux
+    cat $aux
 
-let status=0
-grep -q "nodes=${2:-.*}" $aux || let status=status+1
-grep -q "devices=${3:-.*}" $aux || let status=status+1
-grep -q "links=${4:-.*}" $aux || let status=status+1
-grep -q "hosts=${5:-.*}" $aux || let status=status+1
-grep -q "flows=${6:-.*}" $aux || let status=status+1
-grep -q "intents=${7:-.*}" $aux || let status=status+1
+    let status=0
+    grep -q "nodes=${2:-.*}" $aux || let status=status+1
+    grep -q "devices=${3:-.*}" $aux || let status=status+1
+    grep -q "links=${4:-.*}" $aux || let status=status+1
+    grep -q "hosts=${5:-.*}" $aux || let status=status+1
+    grep -q "flows=${6:-.*}" $aux || let status=status+1
+    grep -q "intents=${7:-.*}" $aux || let status=status+1
+
+    if [ $status -eq 0 ]; then
+        exit 0;
+    fi
+    sleep 1
+done
 
 exit $status
\ No newline at end of file

@@ -20,23 +20,21 @@
     <import file="${ONOS_SCENARIOS}/setup.xml"/>
     <dependency name="Setup" requires="Prerequisites,Net-Prerequisites"/>
 
-    <import file="${ONOS_SCENARIOS}/meta-apps-test.xml"/>
-    <dependency name="MetaAppReactivated" requires="Setup"/>
-    <dependency name="MetaAppInactive" requires="Setup"/>
-    <dependency name="MetaAppInitialVerification" requires="Setup"/>
-
     <import file="${ONOS_SCENARIOS}/net-smoke.xml"/>
     <dependency name="Net-Smoke" requires="Setup"/>
 
-    <import file="${ONOS_SCENARIOS}/archetypes.xml"/>
-    <dependency name="Archetypes" requires="Setup"/>
+    <import file="${ONOS_SCENARIOS}/meta-apps-test.xml"/>
+    <dependency name="Meta-App" requires="Setup,~Net-Smoke"/>
 
-    <import file="${ONOS_SCENARIOS}/drivers-test.xml"/>
-    <dependency name="Drivers-Test" requires="Setup,Net-Smoke,Archetypes"/>
+    <import file="${ONOS_SCENARIOS}/archetypes.xml"/>
+    <dependency name="Archetypes" requires="Setup,~Net-Smoke"/>
 
     <import file="${ONOS_SCENARIOS}/netcfg.xml"/>
-    <dependency name="Netcfg" requires="Setup"/>
+    <dependency name="Netcfg" requires="Setup,~Meta-App"/>
+
+    <import file="${ONOS_SCENARIOS}/drivers-test.xml"/>
+    <dependency name="Drivers-Test" requires="Setup,~Net-Smoke,~Archetypes"/>
 
     <import file="${ONOS_SCENARIOS}/wrapup.xml"/>
-    <dependency name="Wrapup" requires="~Archetypes,~Setup,~Net-Smoke,~Drivers-Test,~MetaAppReactivated,~Netcfg"/>
+    <dependency name="Wrapup" requires="~Archetypes,~Setup,~Net-Smoke,~Drivers-Test,~Meta-App,~Netcfg"/>
 </scenario>