Adding ability to test all UI archetypes.

Change-Id: I3096c51acb59c64388d48dce6e14d2284c7af23f
diff --git a/tools/dev/bin/onos-create-app b/tools/dev/bin/onos-create-app
index cbae101..454bcd6 100755
--- a/tools/dev/bin/onos-create-app
+++ b/tools/dev/bin/onos-create-app
@@ -11,7 +11,7 @@
 [ $type = app ] && archetype=bundle || archetype=$type
 
 if [ "$1" = "-?" -o "$1" = "-h" -o "$1" = "--help" ]; then
-    echo "usage: $(basename $0) {app|bundle|ui|uitab|cli|api} groupId artifactId version package mvn-options"
+    echo "usage: $(basename $0) {app|bundle|ui|uitab|uitopo|cli|api} groupId artifactId version package mvn-options"
     echo "        All arguments are optional"
     exit 1
 fi
diff --git a/tools/test/scenarios/archetypes.xml b/tools/test/scenarios/archetypes.xml
index 277a5a1..5440b55 100644
--- a/tools/test/scenarios/archetypes.xml
+++ b/tools/test/scenarios/archetypes.xml
@@ -53,6 +53,14 @@
         <step name="Verify-UI-Table" requires="^"
               exec="onos-check-views ${OCI} id=sample"/>
 
+        <step name="Create-App-UI-Topo-Overlay" requires="Reinstall-App-With-UI-Table"
+              exec="onos-create-app uitopo org.test.app test-app 1.2.3 org.test.app -DinteractiveMode=false"/>
+        <step name="Build-App-With-UI-Topo" requires="^"
+              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="^"
+              exec="onos-check-views ${OCI} id=sample"/>
 
         <step name="Uninstall-App" requires="^"
               exec="onos-app ${OCI} uninstall org.foo.app"/>