From e8d06bf283ab1fb9dc41fcc222ed1a7232eb06d4 Mon Sep 17 00:00:00 2001
From: Jon Hall <jhall@ciena.com>
Date: Tue, 14 Mar 2017 13:25:53 -0700
Subject: [PATCH] Fix stc dependencies on external scenarios

 - also only install test application once in dist-test-seq

Change-Id: I4a002cd900e8133ad2163fb6b946e082174fcf85
---
 tools/test/scenarios/dist-counter.xml    |  1 -
 tools/test/scenarios/dist-leader.xml     |  1 -
 tools/test/scenarios/dist-map.xml        |  1 -
 tools/test/scenarios/dist-test-seq.xml   | 12 ++++++------
 tools/test/scenarios/dist-test.xml       |  2 +-
 tools/test/scenarios/dist-value.xml      |  1 -
 tools/test/scenarios/dist-work-queue.xml |  1 -
 7 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/tools/test/scenarios/dist-counter.xml b/tools/test/scenarios/dist-counter.xml
index 1892b18707..64ce7d5925 100644
--- a/tools/test/scenarios/dist-counter.xml
+++ b/tools/test/scenarios/dist-counter.xml
@@ -19,7 +19,6 @@
     <group name="Distributed-Primitive-Counter">
 
         <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"
diff --git a/tools/test/scenarios/dist-leader.xml b/tools/test/scenarios/dist-leader.xml
index a83ea46aa4..1c63dfd664 100644
--- a/tools/test/scenarios/dist-leader.xml
+++ b/tools/test/scenarios/dist-leader.xml
@@ -19,7 +19,6 @@
     <group name="Distributed-Primitive-Leader">
 
         <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"
diff --git a/tools/test/scenarios/dist-map.xml b/tools/test/scenarios/dist-map.xml
index 786ca95fd0..196f061b38 100644
--- a/tools/test/scenarios/dist-map.xml
+++ b/tools/test/scenarios/dist-map.xml
@@ -19,7 +19,6 @@
     <group name="Distributed-Primitive-Map">
 
         <step name="Distributed-Primitive-Map.Test-Map-Get"
-              requires="Distributed-Primitives-Setup"
               exec="onos-cluster-execute-expect map-test foo get a --expect null"/>
 
         <step name="Distributed-Primitive-Map.Test-Map-Put"
diff --git a/tools/test/scenarios/dist-test-seq.xml b/tools/test/scenarios/dist-test-seq.xml
index 4b6a16210f..15627d1869 100644
--- a/tools/test/scenarios/dist-test-seq.xml
+++ b/tools/test/scenarios/dist-test-seq.xml
@@ -22,17 +22,17 @@
         <!--<import file="${ONOS_SCENARIOS}/setup.xml"/>
         <dependency name="Setup" requires="Prerequisites"/>-->
 
-        <sequential var="${OC#}" starts="Distributed-App-${#}" ends="Check-Distributed-Exceptions-${#-1}">
-            <step name="Distributed-App-${#}"
-                  requires="Setup"
-                  exec="onos ${OC#} app activate org.onosproject.distributedprimitives"/>
+        <step name="Distributed-App-Activate"
+              exec="onos ${OC1} app activate org.onosproject.distributedprimitives"/>
+
+        <sequential var="${OC#}" starts="Test-Counter-Increment-${#}" ends="Check-Distributed-Exceptions-${#-1}">
 
             <step name="Test-Counter-Increment-${#}"
-                  requires="Distributed-App-${#}"
+                  requires="Distributed-App-Activate"
                   exec="onos-execute-expect ${OC#} counter-test-increment fooCounter 5 --expect updated"/>
 
             <step name="Test-Add-${#}"
-                  requires="Distributed-App-${#}"
+                  requires="Test-Counter-Increment-${#}"
                   exec="onos-execute-expect ${OC#} set-test-add fooSet foo --expect added"/>
 
             <step name="Test-Get-${#}"
diff --git a/tools/test/scenarios/dist-test.xml b/tools/test/scenarios/dist-test.xml
index 6788d62983..7386a93b82 100644
--- a/tools/test/scenarios/dist-test.xml
+++ b/tools/test/scenarios/dist-test.xml
@@ -19,7 +19,7 @@
     <group name="Distributed-Primitives">
 
         <import file="${ONOS_SCENARIOS}/dist-setup.xml"/>
-        <dependency name="Distributed-Primitives-Setup" requires="Setup"/>
+        <dependency name="Distributed-Primitives-Setup"/>
 
         <group name="Distributed-Primitives-Internal" requires="Distributed-Primitives-Setup">
 
diff --git a/tools/test/scenarios/dist-value.xml b/tools/test/scenarios/dist-value.xml
index eb927d045a..f371d919d4 100644
--- a/tools/test/scenarios/dist-value.xml
+++ b/tools/test/scenarios/dist-value.xml
@@ -19,7 +19,6 @@
     <group name="Distributed-Primitive-Value">
 
         <step name="Distributed-Primitive-Value.Test-Value-Initial-Value"
-              requires="Distributed-Primitives-Setup"
               exec="onos-cluster-execute-expect value-test test-value get --expect null"/>
 
         <step name="Distributed-Primitive-Value.Test-Value-Set"
diff --git a/tools/test/scenarios/dist-work-queue.xml b/tools/test/scenarios/dist-work-queue.xml
index 7823ce3513..7a9b414905 100644
--- a/tools/test/scenarios/dist-work-queue.xml
+++ b/tools/test/scenarios/dist-work-queue.xml
@@ -19,7 +19,6 @@
     <group name="Distributed-Primitive-WorkQueue">
 
         <step name="Distributed-Primitive-WorkQueue.Test-Queue-AddOne"
-              requires="Distributed-Primitives-Setup"
               exec="onos-execute-expect ${OCI} work-queue-test stc-test-work-queue add foo --expect Done"/>
 
         <step name="Distributed-Primitive-WorkQueue.Test-Queue-Check-Pending-1"