Changes to docker file and cluster creation, complete stc test on single instance, but not yet on multi-instances Alao, we add detailed checking for every step in ODTN testing.
Change-Id: Id074e2db89a8892ed263880cfa670c4861e011b9
diff --git a/tools/test/scenarios/net-teardown-odtn.xml b/tools/test/scenarios/net-teardown-odtn.xml
index be063c1..be78544 100644
--- a/tools/test/scenarios/net-teardown-odtn.xml
+++ b/tools/test/scenarios/net-teardown-odtn.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<!--
~ Copyright 2015-present Open Networking Foundation
~
@@ -14,11 +15,8 @@
~ limitations under the License.
-->
<scenario name="net-teardown-odtn" description="Network teardown steps">
- <group name="Net-Teardown-ODTN">
- <!-- TODO remove docker simulators docker stop $(docker ps -aq) -->
- <group name="ODTN-Net-Teardown.Deactivate-Apps-2">
- <step name="App-Dectivate-Odtn-Service"
- exec="onos ${OCI} app deactivate org.onosproject.odtn-service"/>
- </group>
- </group>
-</scenario>
\ No newline at end of file
+ <group name="Net-Teardown-ODTN">
+ <step name="App-Dectivate-Odtn-Service" exec="onos ${OCI} app deactivate org.onosproject.odtn-service"/>
+ <step name="Remove-onos-images-stop-emulators" requires="App-Dectivate-Odtn-Service" exec="${ONOS_SCENARIOS}/odtn/destroyOdtnCell.sh"/>
+ </group>
+</scenario>