commit da9fd4a436de30cf05f62fbfc3d4ca93325b0f15
author Jon Hall <jhall@ciena.com> Thu Feb 16 14:23:38 2017 -0800
committer Ray Milkey <ray@onlab.us> Tue Feb 21 18:56:26 2017 +0000
tree 1651d1a84c09df9ae524ca7116a4a917e82ceaf9
parent 3120778d81d0247de6fdde72a5b07db707b3cb7a

Create setup and cleanup tests for stc dist tests

Change-Id: Ie977697a645be82e26ebf13d2510eb891a7c8b8c
(cherry picked from commit 4ad86cfda8f0dc2e87a1ef2ec0a48506c09274a0)

tools/test/scenarios/dist-leader.xml

diff --git a/tools/test/scenarios/dist-leader.xml b/tools/test/scenarios/dist-leader.xml
index 5de4ff3..832390d 100644
--- a/tools/test/scenarios/dist-leader.xml
+++ b/tools/test/scenarios/dist-leader.xml
@@ -18,27 +18,27 @@
           description="ONOS LeaderElector distributed primitive Test">
     <group name="Distributed-Primitive-Leader">
 
-        <step name="Distributed-Primitive-Leader.Activate-Distributed-Primitives-App"
-            exec="onos ${OCI} app activate org.onosproject.distributedprimitives"/>
-
-        <step name="Distributed-Primitive-Leader.Test-Initial-No-Leader" requires="Distributed-Primitive-Leader.Activate-Distributed-Primitives-App"
+        <step name="Distributed-Primitive-Leader.Test-Initial-No-Leader"
+              requires="Distributed-Primitives-Setup"
               exec="onos-cluster-execute-expect leader-test test-elector show foo --expect leader=none#candidates=none"/>
 
-        <step name="Distributed-Primitive-Leader.Test-Leader-Run" requires="Distributed-Primitive-Leader.Test-Initial-No-Leader"
+        <step name="Distributed-Primitive-Leader.Test-Leader-Run"
+              requires="Distributed-Primitive-Leader.Test-Initial-No-Leader"
               exec="onos-execute-expect ${OCI} leader-test test-elector run foo --expect leader=${OCI}#term=[0-9][0-9]*#candidates=${OCI}"/>
 
-        <step name="Distributed-Primitive-Leader.Test-Leader-Withdraw" requires="Distributed-Primitive-Leader.Test-Leader-Run"
+        <step name="Distributed-Primitive-Leader.Test-Leader-Withdraw"
+              requires="Distributed-Primitive-Leader.Test-Leader-Run"
               exec="onos ${OCI} leader-test test-elector withdraw foo"/>
 
-        <step name="Distributed-Primitive-Leader.Test-No-Leader-After-Withdraw" requires="Distributed-Primitive-Leader.Test-Leader-Withdraw"
+        <step name="Distributed-Primitive-Leader.Test-No-Leader-After-Withdraw"
+              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"
+        <step name="Distributed-Primitive-Leader.Check-Log-Exceptions"
+            requires="Distributed-Primitive-Leader.Test-No-Leader-After-Withdraw"
               exec="onos-check-logs ${OCI}"/>
 
-        <step name="Distributed-Primitive-Leader.Teardown-Distributed-Primitives-Test-App" requires="Distributed-Primitive-Leader.Check-Log-Exceptions"
-              exec="onos ${OCI} app deactivate org.onosproject.distributedprimitives"/>
     </group>
 </scenario>