commit 731193d2f6a6fcf6790950c40b091ffd46d92b1a
author Thomas Vachuska <tom@onlab.us> Thu Dec 10 11:41:46 2015 -0800
committer Gerrit Code Review <gerrit@onlab.us> Thu Dec 10 20:27:21 2015 +0000
tree 99285b4dc20fcbb3df0d3a8ab2c193ac7333e6bc
parent c4178ccc5e9fdf9f3ff34b0e0a1b4359e8667442

Fixing archetypes so that the REST overlay works together with UI overlays.

Change-Id: Iab60f4cd07b59e1750ef0733883f4f7ecd0b3b46

tools/test/scenarios/archetypes.xml

diff --git a/tools/test/scenarios/archetypes.xml b/tools/test/scenarios/archetypes.xml
index 307a206..790b334 100644
--- a/tools/test/scenarios/archetypes.xml
+++ b/tools/test/scenarios/archetypes.xml
@@ -23,7 +23,7 @@
         <step name="Build-App" requires="Create-App" exec="mvn clean install"/>
         <step name="Install-App" requires="^"
               exec="onos-app ${OCI} install! target/test-app-1.2.3.oar"/>
-        <step name="Verify-App" requires="^"
+        <step name="Verify-App" requires="^" delay="5"
               exec="onos-check-components ${OCI} org.test.app.AppComponent"/>
 
         <step name="Create-App-CLI-Overlay" requires="Install-App"
@@ -32,7 +32,7 @@
               exec="mvn clean install"/>
         <step name="Reinstall-App-With-CLI" requires="^,~Verify-App"
               exec="onos-app ${OCI} reinstall! target/test-app-1.2.3.oar"/>
-        <step name="Verify-CLI" requires="^"
+        <step name="Verify-CLI" requires="^" delay="2"
               exec="onos ${OCI} sample"/>
 
         <step name="Create-App-UI-Overlay" requires="Reinstall-App-With-CLI"
@@ -41,7 +41,7 @@
               exec="mvn clean install"/>
         <step name="Reinstall-App-With-UI" requires="^,~Verify-CLI"
               exec="onos-app ${OCI} reinstall! target/test-app-1.2.3.oar"/>
-        <step name="Verify-UI" requires="^"
+        <step name="Verify-UI" requires="^" delay="2"
               exec="onos-check-views ${OCI} id=sample"/>
 
         <step name="Create-App-UI-Table-Overlay" requires="Reinstall-App-With-UI"
@@ -50,7 +50,7 @@
               exec="mvn clean install"/>
         <step name="Reinstall-App-With-UI-Table" requires="^,~Verify-UI"
               exec="onos-app ${OCI} reinstall! target/test-app-1.2.3.oar"/>
-        <step name="Verify-UI-Table" requires="^"
+        <step name="Verify-UI-Table" requires="^" delay="2"
               exec="onos-check-views ${OCI} id=sample"/>
 
         <step name="Create-App-UI-Topo-Overlay" requires="Reinstall-App-With-UI-Table"
@@ -59,20 +59,17 @@
               exec="mvn clean install"/>
         <step name="Reinstall-App-With-UI-Topo" requires="^,~Verify-UI-Table"
               exec="onos-app ${OCI} reinstall! target/test-app-1.2.3.oar"/>
-        <step name="Verify-UI-Topo" requires="^"
+        <step name="Verify-UI-Topo" requires="^" delay="2"
               exec="onos-check-views ${OCI} id=sample"/>
 
-        <step name="Clean-Up-For-REST-App" cwd="${WORKSPACE}/tmp" env="~" requires="Reinstall-App-With-UI-Topo"
-              exec="rm -r test-app"/>
-
-        <step name="Create-REST-App" cwd="${WORKSPACE}/tmp" requires="^"
-              exec="onos-create-app app org.test.app test-app 1.2.3 org.test.app -DinteractiveMode=false"/>
         <step name="Create-REST-Overlay" requires="^"
               exec="onos-create-app rest org.test.app test-app 1.2.3 org.test.app -DinteractiveMode=false"/>
         <step name="Build-REST-App" requires="^"
               exec="mvn clean install"/>
         <step name="Install-REST-App" requires="^,~Verify-UI-Topo"
               exec="onos-app ${OCI} reinstall! target/test-app-1.2.3.oar"/>
+        <step name="Verify-REST-CLI" requires="^" delay="2"
+              exec="onos ${OCI} sample"/>
         <step name="Verify-REST-App" requires="^" delay="2"
               exec="curl --fail -isS --user ${ONOS_WEB_USER}:${ONOS_WEB_PASS} http://${OCI}:8181/onos/test-app/sample"/>