commit 4d5310c42a4083265ff00480ae5413c2bb23a76f
author Thomas Vachuska <tom@onlab.us> Thu Jul 14 12:48:39 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Thu Jul 14 20:13:48 2016 +0000
tree 91aa4cb62bc69a3d7b4d01494b18599d061c9696
parent 6c728a946a374649d19c9761a3bd8f0533294503

Improving stw and adding ability to clean-up mininet properly between runs.

Change-Id: Idb163bfa0cfd13b0ed7b9e4715ca7a2c0ffe69f6

tools/test/scenarios/smoke.xml

diff --git a/tools/test/scenarios/smoke.xml b/tools/test/scenarios/smoke.xml
index cc3f662..dbca608 100644
--- a/tools/test/scenarios/smoke.xml
+++ b/tools/test/scenarios/smoke.xml
@@ -20,21 +20,13 @@
     <import file="${ONOS_SCENARIOS}/setup.xml"/>
     <dependency name="Setup" requires="Prerequisites,Net-Prerequisites"/>
 
-    <import file="${ONOS_SCENARIOS}/net-smoke.xml"/>
+    <import file="${ONOS_SCENARIOS}/smoke-internal.xml"/>
     <dependency name="Net-Smoke" requires="Setup"/>
-
-    <import file="${ONOS_SCENARIOS}/archetypes.xml"/>
-    <dependency name="Archetypes" requires="Setup,~Net-Smoke"/>
-
-    <import file="${ONOS_SCENARIOS}/drivers-test.xml"/>
-    <dependency name="Drivers-Test" requires="Setup,~Net-Smoke,~Archetypes"/>
-
-    <import file="${ONOS_SCENARIOS}/meta-apps-test.xml"/>
-    <dependency name="Meta-App" requires="Setup,~Net-Smoke,~Drivers-Test"/>
-
-    <import file="${ONOS_SCENARIOS}/netcfg.xml"/>
-    <dependency name="Netcfg" requires="Setup,~Meta-App"/>
+    <dependency name="Archetypes" requires="Setup"/>
+    <dependency name="Drivers-Test" requires="Setup"/>
+    <dependency name="Meta-App" requires="Setup"/>
+    <dependency name="Netcfg" requires="Setup"/>
 
     <import file="${ONOS_SCENARIOS}/wrapup.xml"/>
-    <dependency name="Wrapup" requires="~Archetypes,~Setup,~Net-Smoke,~Drivers-Test,~Meta-App,~Netcfg"/>
+    <dependency name="Wrapup" requires="~Setup,~Net-Smoke,~Archetypes,~Drivers-Test,~Meta-App,~Netcfg"/>
 </scenario>