홍길동 / 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 @@ ...@@ -164,8 +164,9 @@
164 com.google.common.*, 164 com.google.common.*,
165 org.onlab.packet.*, 165 org.onlab.packet.*,
166 org.onlab.rest.*, 166 org.onlab.rest.*,
167 - org.onosproject.*, 167 + org.onlab.osgi.*,
168 org.onlab.util.*, 168 org.onlab.util.*,
169 + org.onosproject.*,
169 org.jboss.netty.util.* 170 org.jboss.netty.util.*
170 </Import-Package> 171 </Import-Package>
171 <Web-ContextPath>${web.context}</Web-ContextPath> 172 <Web-ContextPath>${web.context}</Web-ContextPath>
......
...@@ -61,6 +61,7 @@ public class AppUiComponent { ...@@ -61,6 +61,7 @@ public class AppUiComponent {
61 // Application UI extension 61 // Application UI extension
62 protected UiExtension extension = 62 protected UiExtension extension =
63 new UiExtension.Builder(getClass().getClassLoader(), uiViews) 63 new UiExtension.Builder(getClass().getClassLoader(), uiViews)
64 + .resourcePath(VIEW_ID)
64 .messageHandlerFactory(messageHandlerFactory) 65 .messageHandlerFactory(messageHandlerFactory)
65 .build(); 66 .build();
66 67
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
23 <step name="Build-App" requires="Create-App" exec="mvn clean install"/> 23 <step name="Build-App" requires="Create-App" exec="mvn clean install"/>
24 <step name="Install-App" requires="^" 24 <step name="Install-App" requires="^"
25 exec="onos-app ${OCI} install! target/test-app-1.2.3.oar"/> 25 exec="onos-app ${OCI} install! target/test-app-1.2.3.oar"/>
26 - <step name="Verify-App" requires="^" 26 + <step name="Verify-App" requires="^" delay="5"
27 exec="onos-check-components ${OCI} org.test.app.AppComponent"/> 27 exec="onos-check-components ${OCI} org.test.app.AppComponent"/>
28 28
29 <step name="Create-App-CLI-Overlay" requires="Install-App" 29 <step name="Create-App-CLI-Overlay" requires="Install-App"
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
32 exec="mvn clean install"/> 32 exec="mvn clean install"/>
33 <step name="Reinstall-App-With-CLI" requires="^,~Verify-App" 33 <step name="Reinstall-App-With-CLI" requires="^,~Verify-App"
34 exec="onos-app ${OCI} reinstall! target/test-app-1.2.3.oar"/> 34 exec="onos-app ${OCI} reinstall! target/test-app-1.2.3.oar"/>
35 - <step name="Verify-CLI" requires="^" 35 + <step name="Verify-CLI" requires="^" delay="2"
36 exec="onos ${OCI} sample"/> 36 exec="onos ${OCI} sample"/>
37 37
38 <step name="Create-App-UI-Overlay" requires="Reinstall-App-With-CLI" 38 <step name="Create-App-UI-Overlay" requires="Reinstall-App-With-CLI"
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
41 exec="mvn clean install"/> 41 exec="mvn clean install"/>
42 <step name="Reinstall-App-With-UI" requires="^,~Verify-CLI" 42 <step name="Reinstall-App-With-UI" requires="^,~Verify-CLI"
43 exec="onos-app ${OCI} reinstall! target/test-app-1.2.3.oar"/> 43 exec="onos-app ${OCI} reinstall! target/test-app-1.2.3.oar"/>
44 - <step name="Verify-UI" requires="^" 44 + <step name="Verify-UI" requires="^" delay="2"
45 exec="onos-check-views ${OCI} id=sample"/> 45 exec="onos-check-views ${OCI} id=sample"/>
46 46
47 <step name="Create-App-UI-Table-Overlay" requires="Reinstall-App-With-UI" 47 <step name="Create-App-UI-Table-Overlay" requires="Reinstall-App-With-UI"
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
50 exec="mvn clean install"/> 50 exec="mvn clean install"/>
51 <step name="Reinstall-App-With-UI-Table" requires="^,~Verify-UI" 51 <step name="Reinstall-App-With-UI-Table" requires="^,~Verify-UI"
52 exec="onos-app ${OCI} reinstall! target/test-app-1.2.3.oar"/> 52 exec="onos-app ${OCI} reinstall! target/test-app-1.2.3.oar"/>
53 - <step name="Verify-UI-Table" requires="^" 53 + <step name="Verify-UI-Table" requires="^" delay="2"
54 exec="onos-check-views ${OCI} id=sample"/> 54 exec="onos-check-views ${OCI} id=sample"/>
55 55
56 <step name="Create-App-UI-Topo-Overlay" requires="Reinstall-App-With-UI-Table" 56 <step name="Create-App-UI-Topo-Overlay" requires="Reinstall-App-With-UI-Table"
...@@ -59,20 +59,17 @@ ...@@ -59,20 +59,17 @@
59 exec="mvn clean install"/> 59 exec="mvn clean install"/>
60 <step name="Reinstall-App-With-UI-Topo" requires="^,~Verify-UI-Table" 60 <step name="Reinstall-App-With-UI-Topo" requires="^,~Verify-UI-Table"
61 exec="onos-app ${OCI} reinstall! target/test-app-1.2.3.oar"/> 61 exec="onos-app ${OCI} reinstall! target/test-app-1.2.3.oar"/>
62 - <step name="Verify-UI-Topo" requires="^" 62 + <step name="Verify-UI-Topo" requires="^" delay="2"
63 exec="onos-check-views ${OCI} id=sample"/> 63 exec="onos-check-views ${OCI} id=sample"/>
64 64
65 - <step name="Clean-Up-For-REST-App" cwd="${WORKSPACE}/tmp" env="~" requires="Reinstall-App-With-UI-Topo"
66 - exec="rm -r test-app"/>
67 -
68 - <step name="Create-REST-App" cwd="${WORKSPACE}/tmp" requires="^"
69 - exec="onos-create-app app org.test.app test-app 1.2.3 org.test.app -DinteractiveMode=false"/>
70 <step name="Create-REST-Overlay" requires="^" 65 <step name="Create-REST-Overlay" requires="^"
71 exec="onos-create-app rest org.test.app test-app 1.2.3 org.test.app -DinteractiveMode=false"/> 66 exec="onos-create-app rest org.test.app test-app 1.2.3 org.test.app -DinteractiveMode=false"/>
72 <step name="Build-REST-App" requires="^" 67 <step name="Build-REST-App" requires="^"
73 exec="mvn clean install"/> 68 exec="mvn clean install"/>
74 <step name="Install-REST-App" requires="^,~Verify-UI-Topo" 69 <step name="Install-REST-App" requires="^,~Verify-UI-Topo"
75 exec="onos-app ${OCI} reinstall! target/test-app-1.2.3.oar"/> 70 exec="onos-app ${OCI} reinstall! target/test-app-1.2.3.oar"/>
71 + <step name="Verify-REST-CLI" requires="^" delay="2"
72 + exec="onos ${OCI} sample"/>
76 <step name="Verify-REST-App" requires="^" delay="2" 73 <step name="Verify-REST-App" requires="^" delay="2"
77 exec="curl --fail -isS --user ${ONOS_WEB_USER}:${ONOS_WEB_PASS} http://${OCI}:8181/onos/test-app/sample"/> 74 exec="curl --fail -isS --user ${ONOS_WEB_USER}:${ONOS_WEB_PASS} http://${OCI}:8181/onos/test-app/sample"/>
78 75
......
...@@ -33,15 +33,16 @@ ...@@ -33,15 +33,16 @@
33 <step name="Wait-for-Start-${#}" exec="onos-wait-for-start ${OC#}" 33 <step name="Wait-for-Start-${#}" exec="onos-wait-for-start ${OC#}"
34 requires="Install-${#},~Secure-SSH"/> 34 requires="Install-${#},~Secure-SSH"/>
35 35
36 - <step name="Check-Nodes-${#}" exec="onos-check-nodes ${OC#}" 36 + <step name="Check-Nodes-${#}" exec="onos-check-nodes ${OC#}" delay="3"
37 requires="~Wait-for-Start-${#}"/> 37 requires="~Wait-for-Start-${#}"/>
38 - <step name="Check-Logs-${#}" exec="onos-check-logs ${OC#}" 38 + <step name="Check-Components-${#}" delay="5"
39 - requires="~Wait-for-Start-${#}"/>
40 - <step name="Check-Components-${#}"
41 exec="onos-check-components ${OC#}" 39 exec="onos-check-components ${OC#}"
42 - requires="~Wait-for-Start-${#},"/>
43 - <step name="Check-Apps-${#}" exec="onos-check-apps ${OC#} ${ONOS_APPS} includes"
44 requires="~Wait-for-Start-${#}"/> 40 requires="~Wait-for-Start-${#}"/>
41 +
42 + <step name="Check-Logs-${#}" exec="onos-check-logs ${OC#}"
43 + requires="~Check-Components-${#}"/>
44 + <step name="Check-Apps-${#}" exec="onos-check-apps ${OC#} ${ONOS_APPS} includes"
45 + requires="~Check-Components-${#}"/>
45 </parallel> 46 </parallel>
46 </group> 47 </group>
47 </scenario> 48 </scenario>
......