홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
32faf2bb 1 parent 11f6d536

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

Change-Id: I1db9084524daa8c5494d0066be30d801e78d0fc3
Expand all
Inline Side-by-side
Showing 3 changed files with 25 additions and 20 deletions
...@@ -6,15 +6,22 @@ ...@@ -6,15 +6,22 @@
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 -onos ${1:-$OCI} "onos:summary" > $aux 9 +for i in {1..10}; do
10 -cat $aux 10 + onos ${1:-$OCI} "onos:summary" > $aux
11 + cat $aux
11 12
12 -let status=0 13 + let status=0
13 -grep -q "nodes=${2:-.*}" $aux || let status=status+1 14 + grep -q "nodes=${2:-.*}" $aux || let status=status+1
14 -grep -q "devices=${3:-.*}" $aux || let status=status+1 15 + grep -q "devices=${3:-.*}" $aux || let status=status+1
15 -grep -q "links=${4:-.*}" $aux || let status=status+1 16 + grep -q "links=${4:-.*}" $aux || let status=status+1
16 -grep -q "hosts=${5:-.*}" $aux || let status=status+1 17 + grep -q "hosts=${5:-.*}" $aux || let status=status+1
17 -grep -q "flows=${6:-.*}" $aux || let status=status+1 18 + grep -q "flows=${6:-.*}" $aux || let status=status+1
18 -grep -q "intents=${7:-.*}" $aux || let status=status+1 19 + grep -q "intents=${7:-.*}" $aux || let status=status+1
20 +
21 + if [ $status -eq 0 ]; then
22 + exit 0;
23 + fi
24 + sleep 1
25 +done
19 26
20 exit $status 27 exit $status
...\ No newline at end of file ...\ No newline at end of file
......
This diff is collapsed. Click to expand it.
...@@ -20,23 +20,21 @@ ...@@ -20,23 +20,21 @@
20 <import file="${ONOS_SCENARIOS}/setup.xml"/> 20 <import file="${ONOS_SCENARIOS}/setup.xml"/>
21 <dependency name="Setup" requires="Prerequisites,Net-Prerequisites"/> 21 <dependency name="Setup" requires="Prerequisites,Net-Prerequisites"/>
22 22
23 - <import file="${ONOS_SCENARIOS}/meta-apps-test.xml"/>
24 - <dependency name="MetaAppReactivated" requires="Setup"/>
25 - <dependency name="MetaAppInactive" requires="Setup"/>
26 - <dependency name="MetaAppInitialVerification" requires="Setup"/>
27 -
28 <import file="${ONOS_SCENARIOS}/net-smoke.xml"/> 23 <import file="${ONOS_SCENARIOS}/net-smoke.xml"/>
29 <dependency name="Net-Smoke" requires="Setup"/> 24 <dependency name="Net-Smoke" requires="Setup"/>
30 25
31 - <import file="${ONOS_SCENARIOS}/archetypes.xml"/> 26 + <import file="${ONOS_SCENARIOS}/meta-apps-test.xml"/>
32 - <dependency name="Archetypes" requires="Setup"/> 27 + <dependency name="Meta-App" requires="Setup,~Net-Smoke"/>
33 28
34 - <import file="${ONOS_SCENARIOS}/drivers-test.xml"/> 29 + <import file="${ONOS_SCENARIOS}/archetypes.xml"/>
35 - <dependency name="Drivers-Test" requires="Setup,Net-Smoke,Archetypes"/> 30 + <dependency name="Archetypes" requires="Setup,~Net-Smoke"/>
36 31
37 <import file="${ONOS_SCENARIOS}/netcfg.xml"/> 32 <import file="${ONOS_SCENARIOS}/netcfg.xml"/>
38 - <dependency name="Netcfg" requires="Setup"/> 33 + <dependency name="Netcfg" requires="Setup,~Meta-App"/>
34 +
35 + <import file="${ONOS_SCENARIOS}/drivers-test.xml"/>
36 + <dependency name="Drivers-Test" requires="Setup,~Net-Smoke,~Archetypes"/>
39 37
40 <import file="${ONOS_SCENARIOS}/wrapup.xml"/> 38 <import file="${ONOS_SCENARIOS}/wrapup.xml"/>
41 - <dependency name="Wrapup" requires="~Archetypes,~Setup,~Net-Smoke,~Drivers-Test,~MetaAppReactivated,~Netcfg"/> 39 + <dependency name="Wrapup" requires="~Archetypes,~Setup,~Net-Smoke,~Drivers-Test,~Meta-App,~Netcfg"/>
42 </scenario> 40 </scenario>
......