홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
Committed by Gerrit Code Review
731193d2 1 parent c4178ccc

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

Change-Id: Iab60f4cd07b59e1750ef0733883f4f7ecd0b3b46
Inline Side-by-side
Showing 6 changed files with 17 additions and 17 deletions
......@@ -164,8 +164,9 @@
com.google.common.*,
org.onlab.packet.*,
org.onlab.rest.*,
org.onosproject.*,
org.onlab.osgi.*,
org.onlab.util.*,
org.onosproject.*,
org.jboss.netty.util.*
</Import-Package>
<Web-ContextPath>${web.context}</Web-ContextPath>
......
......@@ -61,6 +61,7 @@ public class AppUiComponent {
// Application UI extension
protected UiExtension extension =
new UiExtension.Builder(getClass().getClassLoader(), uiViews)
.resourcePath(VIEW_ID)
.messageHandlerFactory(messageHandlerFactory)
.build();
......
......@@ -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"/>
......
......@@ -33,15 +33,16 @@
<step name="Wait-for-Start-${#}" exec="onos-wait-for-start ${OC#}"
requires="Install-${#},~Secure-SSH"/>
<step name="Check-Nodes-${#}" exec="onos-check-nodes ${OC#}"
<step name="Check-Nodes-${#}" exec="onos-check-nodes ${OC#}" delay="3"
requires="~Wait-for-Start-${#}"/>
<step name="Check-Logs-${#}" exec="onos-check-logs ${OC#}"
requires="~Wait-for-Start-${#}"/>
<step name="Check-Components-${#}"
<step name="Check-Components-${#}" delay="5"
exec="onos-check-components ${OC#}"
requires="~Wait-for-Start-${#},"/>
<step name="Check-Apps-${#}" exec="onos-check-apps ${OC#} ${ONOS_APPS} includes"
requires="~Wait-for-Start-${#}"/>
<step name="Check-Logs-${#}" exec="onos-check-logs ${OC#}"
requires="~Check-Components-${#}"/>
<step name="Check-Apps-${#}" exec="onos-check-apps ${OC#} ${ONOS_APPS} includes"
requires="~Check-Components-${#}"/>
</parallel>
</group>
</scenario>
......