commit e76f653a89e880e06164f7ccac958171780f58b0
author Thomas Vachuska <tom@onlab.us> Wed Jul 08 09:40:53 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Thu Jul 09 06:47:53 2015 +0000
tree 7a6bb8edc525b5f7911b884ff689c951f2aa9780
parent dbe6703bb2090927bba013c76e25085891a03803

Improving net test tools and scenarios.

Change-Id: I2b53fa7b28e1135d2356ae58d4ee8ac35184d9b8

tools/test/scenarios/smoke.xml

diff --git a/tools/test/scenarios/smoke.xml b/tools/test/scenarios/smoke.xml
index 27818ee..1614f78 100644
--- a/tools/test/scenarios/smoke.xml
+++ b/tools/test/scenarios/smoke.xml
@@ -14,17 +14,17 @@
   ~ limitations under the License.
   -->
 <scenario name="smoke-test" description="ONOS smoke test">
-    <import file="${ONOS_ROOT}/tools/test/scenarios/prerequisites.xml"/>
+    <import file="${ONOS_SCENARIOS}/prerequisites.xml"/>
 
-    <import file="${ONOS_ROOT}/tools/test/scenarios/setup.xml"/>
+    <import file="${ONOS_SCENARIOS}/setup.xml"/>
     <dependency name="Setup" requires="Prerequisites"/>
 
-    <import file="${ONOS_ROOT}/tools/test/scenarios/basic-net.xml"/>
-    <dependency name="Basic-Net" requires="Setup"/>
+    <import file="${ONOS_SCENARIOS}/net-smoke.xml"/>
+    <dependency name="Net-Smoke" requires="Setup"/>
 
-    <import file="${ONOS_ROOT}/tools/test/scenarios/archetypes.xml"/>
-    <dependency name="Archetypes" requires="~Basic-Net,Setup"/>
+    <import file="${ONOS_SCENARIOS}/archetypes.xml"/>
+    <dependency name="Archetypes" requires="~Net-Smoke,Setup"/>
 
-    <import file="${ONOS_ROOT}/tools/test/scenarios/wrapup.xml"/>
-    <dependency name="Wrapup" requires="~Archetypes,~Setup,~Basic-Net"/>
+    <import file="${ONOS_SCENARIOS}/wrapup.xml"/>
+    <dependency name="Wrapup" requires="~Archetypes,~Setup,~Net-Smoke"/>
 </scenario>