Create setup and cleanup tests for stc dist tests
Change-Id: Ie977697a645be82e26ebf13d2510eb891a7c8b8c
(cherry picked from commit 4ad86cfda8f0dc2e87a1ef2ec0a48506c09274a0)
diff --git a/tools/test/scenarios/dist-counter.xml b/tools/test/scenarios/dist-counter.xml
index ca3c6b1..57ba15f 100644
--- a/tools/test/scenarios/dist-counter.xml
+++ b/tools/test/scenarios/dist-counter.xml
@@ -18,60 +18,71 @@
description="ONOS AtomicCounter distributed primitive Test">
<group name="Distributed-Primitive-Counter">
- <step name="Distributed-Primitive-Counter.Activate-Distributed-Primitives-App"
- exec="onos ${OCI} app activate org.onosproject.distributedprimitives"/>
-
- <step name="Distributed-Primitive-Counter.Test-Counter-Initial-Value" requires="Distributed-Primitive-Counter.Activate-Distributed-Primitives-App"
+ <step name="Distributed-Primitive-Counter.Test-Counter-Initial-Value"
+ requires="Distributed-Primitives-Setup"
exec="onos-cluster-execute-expect counter-test test-counter get --expect 0"/>
- <step name="Distributed-Primitive-Counter.Test-Counter-Set" requires="Distributed-Primitive-Counter.Test-Counter-Initial-Value"
+ <step name="Distributed-Primitive-Counter.Test-Counter-Set"
+ requires="Distributed-Primitive-Counter.Test-Counter-Initial-Value"
exec="onos ${OCI} counter-test test-counter set 1"/>
- <step name="Distributed-Primitive-Counter.Test-Counter-Get" requires="Distributed-Primitive-Counter.Test-Counter-Set"
+ <step name="Distributed-Primitive-Counter.Test-Counter-Get"
+ requires="Distributed-Primitive-Counter.Test-Counter-Set"
exec="onos-cluster-execute-expect counter-test test-counter get --expect 1"/>
- <step name="Distributed-Primitive-Counter.Test-Counter-IncrementAndGet" requires="Distributed-Primitive-Counter.Test-Counter-Get"
+ <step name="Distributed-Primitive-Counter.Test-Counter-IncrementAndGet"
+ requires="Distributed-Primitive-Counter.Test-Counter-Get"
exec="onos-execute-expect ${OCI} counter-test test-counter incrementAndGet --expect 2"/>
- <step name="Distributed-Primitive-Counter.Test-Counter-GetAndIncrement" requires="Distributed-Primitive-Counter.Test-Counter-IncrementAndGet"
+ <step name="Distributed-Primitive-Counter.Test-Counter-GetAndIncrement"
+ requires="Distributed-Primitive-Counter.Test-Counter-IncrementAndGet"
exec="onos-execute-expect ${OCI} counter-test test-counter getAndIncrement --expect 2"/>
- <step name="Distributed-Primitive-Counter.Test-Counter-Incremented" requires="Distributed-Primitive-Counter.Test-Counter-GetAndIncrement"
+ <step name="Distributed-Primitive-Counter.Test-Counter-Incremented"
+ requires="Distributed-Primitive-Counter.Test-Counter-GetAndIncrement"
exec="onos-cluster-execute-expect counter-test test-counter get --expect 3"/>
- <step name="Distributed-Primitive-Counter.Test-Counter-AddAndGet" requires="Distributed-Primitive-Counter.Test-Counter-Incremented"
+ <step name="Distributed-Primitive-Counter.Test-Counter-AddAndGet"
+ requires="Distributed-Primitive-Counter.Test-Counter-Incremented"
exec="onos-execute-expect ${OCI} counter-test test-counter addAndGet 10 --expect 13"/>
- <step name="Distributed-Primitive-Counter.Test-Counter-GetAndAdd" requires="Distributed-Primitive-Counter.Test-Counter-AddAndGet"
+ <step name="Distributed-Primitive-Counter.Test-Counter-GetAndAdd"
+ requires="Distributed-Primitive-Counter.Test-Counter-AddAndGet"
exec="onos-execute-expect ${OCI} counter-test test-counter getAndAdd 10 --expect 13"/>
- <step name="Distributed-Primitive-Counter.Test-Counter-Updated-After-GetAndAdd" requires="Distributed-Primitive-Counter.Test-Counter-GetAndAdd"
+ <step name="Distributed-Primitive-Counter.Test-Counter-Updated-After-GetAndAdd"
+ requires="Distributed-Primitive-Counter.Test-Counter-GetAndAdd"
exec="onos-cluster-execute-expect counter-test test-counter get --expect 23"/>
- <step name="Distributed-Primitive-Counter.Test-Counter-CompareAndSet-False" requires="Distributed-Primitive-Counter.Test-Counter-Updated-After-GetAndAdd"
+ <step name="Distributed-Primitive-Counter.Test-Counter-CompareAndSet-False"
+ requires="Distributed-Primitive-Counter.Test-Counter-Updated-After-GetAndAdd"
exec="onos-execute-expect ${OCI} counter-test test-counter compareAndSet 1 2 --expect false"/>
- <step name="Distributed-Primitive-Counter.Test-Counter-Not-Updated-After-CAS" requires="Distributed-Primitive-Counter.Test-Counter-CompareAndSet-False"
+ <step name="Distributed-Primitive-Counter.Test-Counter-Not-Updated-After-CAS"
+ requires="Distributed-Primitive-Counter.Test-Counter-CompareAndSet-False"
exec="onos-cluster-execute-expect counter-test test-counter get --expect 23"/>
- <step name="Distributed-Primitive-Counter.Test-Counter-CompareAndSet-True" requires="Distributed-Primitive-Counter.Test-Counter-Not-Updated-After-CAS"
+ <step name="Distributed-Primitive-Counter.Test-Counter-CompareAndSet-True"
+ requires="Distributed-Primitive-Counter.Test-Counter-Not-Updated-After-CAS"
exec="onos-execute-expect ${OCI} counter-test test-counter compareAndSet 23 25 --expect true"/>
- <step name="Distributed-Primitive-Counter.Test-Counter-Updated-After-CAS" requires="Distributed-Primitive-Counter.Test-Counter-CompareAndSet-True"
+ <step name="Distributed-Primitive-Counter.Test-Counter-Updated-After-CAS"
+ requires="Distributed-Primitive-Counter.Test-Counter-CompareAndSet-True"
exec="onos-cluster-execute-expect counter-test test-counter get --expect 25"/>
- <step name="Distributed-Primitive-Counter.Test-Counter-Reset" requires="Distributed-Primitive-Counter.Test-Counter-Updated-After-CAS"
+ <step name="Distributed-Primitive-Counter.Test-Counter-Reset"
+ requires="Distributed-Primitive-Counter.Test-Counter-Updated-After-CAS"
exec="onos ${OCI} counter-test test-counter set 0"/>
- <step name="Distributed-Primitive-Counter.Test-Counter-Get-After-Reset" requires="Distributed-Primitive-Counter.Test-Counter-Reset"
+ <step name="Distributed-Primitive-Counter.Test-Counter-Get-After-Reset"
+ 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"
+ <step name="Distributed-Primitive-Counter.Check-Log-Exceptions"
+ requires="Distributed-Primitive-Counter.Test-Counter-Get-After-Reset"
exec="onos-check-logs ${OCI}"/>
- <step name="Distributed-Primitive-Counter.Teardown-Distributed-Primitives-Test-App" requires="Distributed-Primitive-Counter.Check-Log-Exceptions"
- exec="onos ${OCI} app deactivate org.onosproject.distributedprimitives"/>
</group>
</scenario>