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-counter.xml

diff --git a/tools/test/scenarios/dist-counter.xml b/tools/test/scenarios/dist-counter.xml
index aae33b5..83c2742 100644
--- a/tools/test/scenarios/dist-counter.xml
+++ b/tools/test/scenarios/dist-counter.xml
@@ -25,13 +25,13 @@
             exec="onos ${OCI} app activate org.onosproject.distributedprimitives"/>
 
         <step name="Test-Counter-Initial-Value" requires="^"
-              exec="onos-execute-expect ${OCI} counter-test test-counter get --expect 0"/>
+              exec="onos-cluster-execute-expect counter-test test-counter get --expect 0"/>
 
         <step name="Test-Counter-Set" requires="^"
               exec="onos ${OCI} counter-test test-counter set 1"/>
 
         <step name="Test-Counter-Get" requires="^"
-              exec="onos-execute-expect ${OCI} counter-test test-counter get --expect 1"/>
+              exec="onos-cluster-execute-expect counter-test test-counter get --expect 1"/>
 
         <step name="Test-Counter-IncrementAndGet" requires="^"
               exec="onos-execute-expect ${OCI} counter-test test-counter incrementAndGet --expect 2"/>
@@ -40,7 +40,7 @@
               exec="onos-execute-expect ${OCI} counter-test test-counter getAndIncrement --expect 2"/>
 
         <step name="Test-Counter-Incremented" requires="^"
-              exec="onos-execute-expect ${OCI} counter-test test-counter get --expect 3"/>
+              exec="onos-cluster-execute-expect counter-test test-counter get --expect 3"/>
 
         <step name="Test-Counter-AddAndGet" requires="^"
               exec="onos-execute-expect ${OCI} counter-test test-counter addAndGet 10 --expect 13"/>
@@ -49,19 +49,25 @@
               exec="onos-execute-expect ${OCI} counter-test test-counter getAndAdd 10 --expect 13"/>
 
         <step name="Test-Counter-Updated-After-GetAndAdd" requires="^"
-              exec="onos-execute-expect ${OCI} counter-test test-counter get --expect 23"/>
+              exec="onos-cluster-execute-expect counter-test test-counter get --expect 23"/>
 
         <step name="Test-Counter-CompareAndSet-False" requires="^"
               exec="onos-execute-expect ${OCI} counter-test test-counter compareAndSet 1 2 --expect false"/>
 
         <step name="Test-Counter-Not-Updated-After-CAS" requires="^"
-              exec="onos-execute-expect ${OCI} counter-test test-counter get --expect 23"/>
+              exec="onos-cluster-execute-expect counter-test test-counter get --expect 23"/>
 
         <step name="Test-Counter-CompareAndSet-True" requires="^"
               exec="onos-execute-expect ${OCI} counter-test test-counter compareAndSet 23 25 --expect true"/>
 
         <step name="Test-Counter-Updated-After-CAS" requires="^"
-              exec="onos-execute-expect ${OCI} counter-test test-counter get --expect 25"/>
+              exec="onos-cluster-execute-expect counter-test test-counter get --expect 25"/>
+
+        <step name="Test-Counter-Reset" requires="^"
+              exec="onos ${OCI} counter-test test-counter set 0"/>
+
+        <step name="Test-Counter-Get-After-Reset" requires="^"
+              exec="onos-cluster-execute-expect counter-test test-counter get --expect 0"/>
 
         <!--Check with check logs-->
         <step name="Check-Log-Exceptions" requires="^"