- 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
diff --git a/tools/test/scenarios/net-setup-vnets.xml b/tools/test/scenarios/net-setup-vnets.xml
index 66e5697..55207cc 100644
--- a/tools/test/scenarios/net-setup-vnets.xml
+++ b/tools/test/scenarios/net-setup-vnets.xml
@@ -46,19 +46,14 @@
<step name="Create-Port-2" requires="^"
exec="onos ${OCI} vnet-create-port ${networkId} device2 2 of:0000000000000009 1"/>
- <step name="Create-Link-1" requires="^"
- exec="onos ${OCI} vnet-create-link ${networkId} device1 1 device2 2"/>
+ <step name="Create-Bidirectional-Link" requires="^"
+ exec="onos -f ${OCI} vnet-create-link --bidirectional ${networkId} device2 2 device1 1"/>
- <step name="Create-Link-2" requires="^"
- exec="onos ${OCI} vnet-create-link ${networkId} device2 2 device1 1"/>
+ <step name="Check-intents-installed" requires="^"
+ exec="onos-check-intent ${OCI} networkId=${networkId} INSTALLED 2"/>
- <step name="Check-intents-installed" requires="^" env="~"
- exec="onos-check-intent ${OCI} networkId=${networkId} INSTALLED"/>
- <!-- TODO: ignore return code once intent is working -->
-
- <step name="Ping-hosts-1" requires="^" env="~"
+ <step name="Ping-hosts-1" requires="^"
exec="onos-mininet sendAndExpect h4 ping -c1 h9 --expect \ 0% packet loss"/>
- <!-- TODO: ignore return code once intent is working -->
</group>
</scenario>
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"/>