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
diff --git a/tools/test/scenarios/drivers-test.xml b/tools/test/scenarios/drivers-test.xml
index 1514014..f3488a7 100644
--- a/tools/test/scenarios/drivers-test.xml
+++ b/tools/test/scenarios/drivers-test.xml
@@ -27,6 +27,10 @@
<step name="DriversTest.CheckDefault" requires="^"
exec="test '${defaultDriver}' != ''"/>
+ <!-- Deactivate openfow app - prevents spawning multiple controllers -->
+ <step name="DriversTest.DeactivateOpenflowApp" requires="^"
+ exec="onos ${OCI} onos:app deactivate org.onosproject.openflow"/>
+
<!-- Deactivate drivers app -->
<step name="DriversTest.DeactivateDriversApp" requires="^"
exec="onos ${OCI} onos:app deactivate org.onosproject.drivers"/>
@@ -37,6 +41,10 @@
<step name="DriversTest.AfterDeactivateFindDefault" requires="^"
exec="onos-find-driver ${OC1} default defaultInactive" env="!"/>
+ <!-- Reactivate openflow apps -->
+ <step name="DriversTest.ActivateOpenflowApp" requires="^"
+ exec="onos ${OCI} onos:app activate org.onosproject.openflow"/>
+
<!-- Reactivate all drivers -->
<step name="DriversTest.ActivateDriversApp" requires="^"
exec="onos ${OCI} onos:app activate org.onosproject.drivers"/>