Check logs on all nodes in stc dist tests
Change-Id: Ia98536940dc3d08b810a98f94f69fdc309d3fe67
diff --git a/tools/test/scenarios/dist-counter.xml b/tools/test/scenarios/dist-counter.xml
index 57ba15f..1892b18 100644
--- a/tools/test/scenarios/dist-counter.xml
+++ b/tools/test/scenarios/dist-counter.xml
@@ -78,10 +78,13 @@
requires="Distributed-Primitive-Counter.Test-Counter-Reset"
exec="onos-cluster-execute-expect counter-test test-counter get --expect 0"/>
- <!--Check with check logs-->
- <step name="Distributed-Primitive-Counter.Check-Log-Exceptions"
- requires="Distributed-Primitive-Counter.Test-Counter-Get-After-Reset"
- exec="onos-check-logs ${OCI}"/>
+ <group name="Distributed-Primitive-Counter.Check-Log-Exceptions"
+ requires="Distributed-Primitive-Counter.Test-Counter-Get-After-Reset">
+ <parallel var="${OC#}">
+ <step name="Distributed-Primitive-Counter.Check-Log-Exceptions-${#}"
+ exec="onos-check-logs ${OC#}"/>
+ </parallel>
+ </group>
</group>
</scenario>
diff --git a/tools/test/scenarios/dist-leader.xml b/tools/test/scenarios/dist-leader.xml
index 832390d..a83ea46 100644
--- a/tools/test/scenarios/dist-leader.xml
+++ b/tools/test/scenarios/dist-leader.xml
@@ -34,10 +34,13 @@
requires="Distributed-Primitive-Leader.Test-Leader-Withdraw"
exec="onos-cluster-execute-expect leader-test test-elector show foo --expect leader=none#candidates=none"/>
- <!--Check with check logs-->
- <step name="Distributed-Primitive-Leader.Check-Log-Exceptions"
- requires="Distributed-Primitive-Leader.Test-No-Leader-After-Withdraw"
- exec="onos-check-logs ${OCI}"/>
+ <group name="Distributed-Primitive-Leader.Check-Log-Exceptions"
+ requires="Distributed-Primitive-Leader.Test-No-Leader-After-Withdraw">
+ <parallel var="${OC#}">
+ <step name="Distributed-Primitive-Leader.Check-Log-Exceptions-${#}"
+ exec="onos-check-logs ${OC#}"/>
+ </parallel>
+ </group>
</group>
</scenario>
diff --git a/tools/test/scenarios/dist-map.xml b/tools/test/scenarios/dist-map.xml
index 631bd68..786ca95 100644
--- a/tools/test/scenarios/dist-map.xml
+++ b/tools/test/scenarios/dist-map.xml
@@ -98,10 +98,13 @@
requires="Distributed-Primitive-Map.Test-Map-Clear"
exec="onos-execute-expect ${OCI} map-test foo isEmpty --expect true"/>
- <!--Check with check logs-->
- <step name="Distributed-Primitive-Map.Check-Log-Exceptions"
- requires="Distributed-Primitive-Map.Test-Map-Cleared"
- exec="onos-check-logs ${OCI}"/>
+ <group name="Distributed-Primitive-Map.Check-Log-Exceptions"
+ requires="Distributed-Primitive-Map.Test-Map-Cleared">
+ <parallel var="${OC#}">
+ <step name="Distributed-Primitive-Map.Check-Log-Exceptions-${#}"
+ exec="onos-check-logs ${OC#}"/>
+ </parallel>
+ </group>
</group>
</scenario>
diff --git a/tools/test/scenarios/dist-value.xml b/tools/test/scenarios/dist-value.xml
index 5b26d90e..eb927d0 100644
--- a/tools/test/scenarios/dist-value.xml
+++ b/tools/test/scenarios/dist-value.xml
@@ -50,10 +50,13 @@
requires="Distributed-Primitive-Value.Test-Value-Updated-After-CAS"
exec="onos ${OCI} value-test test-value set null"/>
- <!--Check with check logs-->
- <step name="Distributed-Primitive-Value.Check-Log-Exceptions"
- requires="Distributed-Primitive-Value.Destroy-Value"
- exec="onos-check-logs ${OCI}"/>
+ <group name="Distributed-Primitive-Value.Check-Log-Exceptions"
+ requires="Distributed-Primitive-Value.Destroy-Value">
+ <parallel var="${OC#}">
+ <step name="Distributed-Primitive-Value.Check-Log-Exceptions-${#}"
+ exec="onos-check-logs ${OC#}"/>
+ </parallel>
+ </group>
</group>
</scenario>
diff --git a/tools/test/scenarios/dist-work-queue.xml b/tools/test/scenarios/dist-work-queue.xml
index c0b4529..7823ce3 100644
--- a/tools/test/scenarios/dist-work-queue.xml
+++ b/tools/test/scenarios/dist-work-queue.xml
@@ -58,10 +58,13 @@
requires="^"
exec="onos ${OCI} work-queue-test stc-test-work-queue destroy"/>
- <!--Check with check logs-->
- <step name="Distributed-Primitive-WorkQueue.Check-Log-Exceptions"
- requires="^"
- exec="onos-check-logs ${OCI}"/>
+ <group name="Distributed-Primitive-WorkQueue.Check-Log-Exceptions"
+ requires="Distributed-Primitive-WorkQueue.Test-Queue-Destroy">
+ <parallel var="${OC#}">
+ <step name="Distributed-Primitive-WorkQueue.Check-Log-Exceptions-${#}"
+ exec="onos-check-logs ${OC#}"/>
+ </parallel>
+ </group>
</group>
</scenario>