commit 145623d18912efc4fabdc742c5f682603337d727
author Madan Jampani <madan@onlab.us> Fri Jul 22 14:55:57 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Mon Jul 25 20:37:12 2016 +0000
tree 5996274f576856be1cdf52ad3ee9f757cf1dc2d6
parent 6a164354d83e2e7a2719487c9daef730493f695b

Added onos-cluster-execute-expect as a cluster version of onos-execute-expect + updated stc scenarios for dist primitives to use this for verification

Change-Id: Ife3bde21118ebd21e8abf807070a72ac58341120

tools/test/scenarios/dist-leader.xml

diff --git a/tools/test/scenarios/dist-leader.xml b/tools/test/scenarios/dist-leader.xml
index ec774af..3173721 100644
--- a/tools/test/scenarios/dist-leader.xml
+++ b/tools/test/scenarios/dist-leader.xml
@@ -25,7 +25,7 @@
             exec="onos ${OCI} app activate org.onosproject.distributedprimitives"/>
 
         <step name="Test-Initial-No-Leader" requires="^"
-              exec="onos-execute-expect ${OCI} leader-test test-elector show foo --expect leader=none#candidates=none"/>
+              exec="onos-cluster-execute-expect leader-test test-elector show foo --expect leader=none#candidates=none"/>
 
         <step name="Test-Leader-Run" requires="^"
               exec="onos-execute-expect ${OCI} leader-test test-elector run foo --expect leader=${OCI}#term=1#candidates=${OCI}"/>
@@ -34,7 +34,7 @@
               exec="onos ${OCI} leader-test test-elector withdraw foo"/>
 
         <step name="Test-No-Leader-After-Withdraw" requires="^"
-              exec="onos-execute-expect ${OCI} leader-test test-elector show foo --expect leader=none#candidates=none"/>
+              exec="onos-cluster-execute-expect leader-test test-elector show foo --expect leader=none#candidates=none"/>
 
         <!--Check with check logs-->
         <step name="Check-Log-Exceptions" requires="^"