commit 3880928b6f2c8f369ece50b9c51de9cbf1e0c714
author Ray Milkey <ray@onlab.us> Thu Jul 07 14:36:23 2016 -0700
committer Ray Milkey <ray@onlab.us> Fri Jul 08 10:04:45 2016 -0700
tree aa4bf3eb2039806b82573933b378f3a3bd78afd2
parent da27f529410df067170517c2e678a0ec0940f498

STC stacktrace fixes

- Shut down openflow meta app before driver test,
  was causing port collision issues with openflow server

- Fixed NPE in Network config store

- reordered tests to insure proper sequencing

Change-Id: Ib39330153f543ee960b8631a0dc9246ee4251851

tools/test/scenarios/smoke.xml

diff --git a/tools/test/scenarios/smoke.xml b/tools/test/scenarios/smoke.xml
index 70cd1ce..cc3f662 100644
--- a/tools/test/scenarios/smoke.xml
+++ b/tools/test/scenarios/smoke.xml
@@ -23,18 +23,18 @@
     <import file="${ONOS_SCENARIOS}/net-smoke.xml"/>
     <dependency name="Net-Smoke" requires="Setup"/>
 
-    <import file="${ONOS_SCENARIOS}/meta-apps-test.xml"/>
-    <dependency name="Meta-App" requires="Setup,~Net-Smoke"/>
-
     <import file="${ONOS_SCENARIOS}/archetypes.xml"/>
     <dependency name="Archetypes" requires="Setup,~Net-Smoke"/>
 
-    <import file="${ONOS_SCENARIOS}/netcfg.xml"/>
-    <dependency name="Netcfg" requires="Setup,~Meta-App"/>
-
     <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"/>
+
     <import file="${ONOS_SCENARIOS}/wrapup.xml"/>
     <dependency name="Wrapup" requires="~Archetypes,~Setup,~Net-Smoke,~Drivers-Test,~Meta-App,~Netcfg"/>
 </scenario>