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-odtn-smoke.xml b/tools/test/scenarios/net-odtn-smoke.xml
index e49ca73..f1e1f7d 100644
--- a/tools/test/scenarios/net-odtn-smoke.xml
+++ b/tools/test/scenarios/net-odtn-smoke.xml
@@ -14,24 +14,10 @@
~ limitations under the License.
-->
-
-<scenario name="net-odtn-smoke"
- description="ODTN test steps">
-
- <import file="${ONOS_SCENARIOS}/net-setup-odtn.xml"/>
-
- <!--TODO check proper topology-->
- <!--<step name="Net-ODTN-Smoke.Check-Summary"
- requires="ODTN-Net-Setup.Verify-Logs-2" delay="5"
- exec="onos-check-summary ${OC1} [0-9]* 4 8 0 112"/>-->
-
- <import file="${ONOS_SCENARIOS}/net-odtn-restconf.xml"/>
- <dependency name="Net-ODTN-Restconf" requires="ODTN-Net-Setup"/>
-
- <import file="${ONOS_SCENARIOS}/net-teardown-odtn.xml"/>
- <dependency name="Net-Teardown-ODTN" requires="Net-ODTN-Restconf"/>
-
- <import file="${ONOS_SCENARIOS}/shutdown.xml"/>
- <dependency name="Shutdown-ONOS" requires="Net-Teardown-ODTN"/>
-
+<scenario name="net-odtn-smoke" description="ODTN test steps">
+ <import file="${ONOS_SCENARIOS}/net-setup-odtn.xml"/>
+ <import file="${ONOS_SCENARIOS}/net-odtn-restconf.xml"/>
+ <dependency name="Net-ODTN-Restconf" requires="ODTN-Net-Setup"/>
+ <import file="${ONOS_SCENARIOS}/net-teardown-odtn.xml"/>
+ <dependency name="Net-Teardown-ODTN" requires="Net-ODTN-Restconf"/>
</scenario>