Fix up drivers test to not shut down all of ONOS
Change-Id: Id72aa88e9f7bda14324d448232a6677dd8ff3ba1
diff --git a/tools/test/scenarios/netcfg.xml b/tools/test/scenarios/netcfg.xml
index 474079e..caf1e9f 100644
--- a/tools/test/scenarios/netcfg.xml
+++ b/tools/test/scenarios/netcfg.xml
@@ -22,8 +22,16 @@
<step name="Netcfg.Activate-Dhcp"
exec="onos ${OC1} app activate org.onosproject.dhcp"/>
+ <!-- Check that the activation was successful -->
+ <group name="Netcfg.Check-Dhcp-App-Activated" requires="Netcfg.Activate-Dhcp">
+ <parallel var="${OC#}">
+ <step name="Netcfg.Check-Dhcp-App-Activated-${#}" delay="2"
+ exec="onos-check-apps ${OC#} drivers,openflow,proxyarp,dhcp includes"/>
+ </parallel>
+ </group>
+
<!-- Upload the first set of config changes -->
- <step name="Netcfg.Post-1" requires="^"
+ <step name="Netcfg.Post-1" requires="Netcfg.Check-Dhcp-App-Activated"
exec="post-netcfg.py ${OC1} ${ONOS_SCENARIOS}/netcfg-test/dhcp-cfg1.json"/>
<group name="Query1" requires="Netcfg.Post-1">