commit b0d0ada02bf14d4bab47d6315441ece2cf4d793e
author Claudine Chiu <cchiu@ciena.com> Mon Jun 06 18:03:09 2016 -0400
committer Gerrit Code Review <gerrit@onlab.us> Wed Jun 15 18:01:43 2016 +0000
tree 78150f062178e1cdfd6ca8184b4d23d4d92c0a26
parent 95b416cd12debb7bfc44c945ce7f850c65f827d1

- bidrectional vnet link creation
- optionally specify expected number of intents in "onos-check-intent"

Change-Id: I523a7fd9e1aaa72b441d2428fb9ebb692b07bdd0

-  bidrectional vnet link creation (when using ssh)
- optionally specify expected number of intents in "onos-check-intent"

Change-Id: I5c6fe1f269eddeaa70dfec819853d42af59fbd8e

tools/test/scenarios/net-teardown-vnets.xml

diff --git a/tools/test/scenarios/net-teardown-vnets.xml b/tools/test/scenarios/net-teardown-vnets.xml
index c030e73..69b7c5c 100644
--- a/tools/test/scenarios/net-teardown-vnets.xml
+++ b/tools/test/scenarios/net-teardown-vnets.xml
@@ -22,11 +22,11 @@
         <step name="Check-Vnet-Link" requires="^"
               exec="onos ${OCI} vnet-links ${networkId}"/>
 
-        <step name="Remove-Link-1" requires="^"
-              exec="onos ${OCI} vnet-remove-link ${networkId} device1 1 device2 2"/>
+        <step name="Remove-Bidirectional-Link" requires="^"
+              exec="onos -f ${OCI} vnet-remove-link --bidirectional ${networkId} device2 2 device1 1"/>
 
-        <step name="Remove-Link-2" requires="^"
-              exec="onos ${OCI} vnet-remove-link ${networkId} device2 2 device1 1"/>
+        <step name="Check-intents-removed" requires="^"
+              exec="onos-check-intent ${OCI} networkId=${networkId} IGNORE_STATE 0"/>
 
         <step name="Ping-hosts-2" requires="^"
               exec="onos-mininet sendAndExpect h4 ping -c1 h9 --expect \ 100% packet loss"/>