Thomas Vachuska

Adding more app.xml files.

Upgrading app.xml versions.
Cleaned-up features.xml.

Change-Id: I7c5a85480568ffe35281286aefc9aa4e1b3b2afd
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 ~ See the License for the specific language governing permissions and 14 ~ See the License for the specific language governing permissions and
15 ~ limitations under the License. 15 ~ limitations under the License.
16 --> 16 -->
17 -<app name="org.onosproject.app.metrics.intent" origin="ON.Lab" version="1.1.0" 17 +<app name="org.onosproject.bgprouter" origin="ON.Lab" version="1.2.0"
18 - features="onos-app-metrics-intent"> 18 + features="onos-app-bgprouter">
19 - <description>ONOS intent metrics test application</description> 19 + <description>ONOS BGP router application</description>
20 </app> 20 </app>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 ~ See the License for the specific language governing permissions and 14 ~ See the License for the specific language governing permissions and
15 ~ limitations under the License. 15 ~ limitations under the License.
16 --> 16 -->
17 -<app name="org.onosproject.app.config" origin="ON.Lab" version="1.1.0" 17 +<app name="org.onosproject.config" origin="ON.Lab" version="1.2.0"
18 features="onos-app-config"> 18 features="onos-app-config">
19 <description>ONOS network configuration application</description> 19 <description>ONOS network configuration application</description>
20 </app> 20 </app>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 ~ See the License for the specific language governing permissions and 14 ~ See the License for the specific language governing permissions and
15 ~ limitations under the License. 15 ~ limitations under the License.
16 --> 16 -->
17 -<app name="org.onosproject.app.fwd" origin="ON.Lab" version="1.1.0" 17 +<app name="org.onosproject.fwd" origin="ON.Lab" version="1.2.0"
18 features="onos-app-fwd"> 18 features="onos-app-fwd">
19 <description>ONOS Reactive forwarding application using flow subsystem</description> 19 <description>ONOS Reactive forwarding application using flow subsystem</description>
20 </app> 20 </app>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 ~ See the License for the specific language governing permissions and 14 ~ See the License for the specific language governing permissions and
15 ~ limitations under the License. 15 ~ limitations under the License.
16 --> 16 -->
17 -<app name="org.onosproject.app.metrics.topology" origin="ON.Lab" version="1.1.0" 17 +<app name="org.onosproject.metrics" origin="ON.Lab" version="1.2.0"
18 - features="onos-app-metrics-topology"> 18 + features="onos-app-config">
19 - <description>ONOS topology metrics test application</description> 19 + <description>ONOS performance metrics collection</description>
20 </app> 20 </app>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 ~ See the License for the specific language governing permissions and 14 ~ See the License for the specific language governing permissions and
15 ~ limitations under the License. 15 ~ limitations under the License.
16 --> 16 -->
17 -<app name="org.onosproject.app.mobility" origin="ON.Lab" version="1.1.0" 17 +<app name="org.onosproject.mobility" origin="ON.Lab" version="1.2.0"
18 features="onos-app-mobility"> 18 features="onos-app-mobility">
19 <description>ONOS host mobility application</description> 19 <description>ONOS host mobility application</description>
20 </app> 20 </app>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 ~ See the License for the specific language governing permissions and 14 ~ See the License for the specific language governing permissions and
15 ~ limitations under the License. 15 ~ limitations under the License.
16 --> 16 -->
17 -<app name="org.onosproject.app.optical" origin="ON.Lab" version="1.1.0" 17 +<app name="org.onosproject.optical" origin="ON.Lab" version="1.2.0"
18 features="onos-app-optical"> 18 features="onos-app-optical">
19 <description>ONOS Packet/Optical use-case application</description> 19 <description>ONOS Packet/Optical use-case application</description>
20 </app> 20 </app>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 ~ See the License for the specific language governing permissions and 14 ~ See the License for the specific language governing permissions and
15 ~ limitations under the License. 15 ~ limitations under the License.
16 --> 16 -->
17 -<app name="org.onosproject.app.proxyarp" origin="ON.Lab" version="1.1.0" 17 +<app name="org.onosproject.proxyarp" origin="ON.Lab" version="1.2.0"
18 features="onos-app-proxyarp"> 18 features="onos-app-proxyarp">
19 - <description>ONOS proxy ARP application</description> 19 + <description>ONOS proxy ARP/NDP application</description>
20 </app> 20 </app>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 ~ See the License for the specific language governing permissions and 14 ~ See the License for the specific language governing permissions and
15 ~ limitations under the License. 15 ~ limitations under the License.
16 --> 16 -->
17 -<app name="org.onosproject.app.sdnip" origin="ON.Lab" version="1.1.0" 17 +<app name="org.onosproject.sdnip" origin="ON.Lab" version="1.2.0"
18 features="onos-app-sdnip"> 18 features="onos-app-sdnip">
19 <description>ONOS SDN/IP use-case application</description> 19 <description>ONOS SDN/IP use-case application</description>
20 </app> 20 </app>
......
1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<!--
3 + ~ Copyright 2015 Open Networking Laboratory
4 + ~
5 + ~ Licensed under the Apache License, Version 2.0 (the "License");
6 + ~ you may not use this file except in compliance with the License.
7 + ~ You may obtain a copy of the License at
8 + ~
9 + ~ http://www.apache.org/licenses/LICENSE-2.0
10 + ~
11 + ~ Unless required by applicable law or agreed to in writing, software
12 + ~ distributed under the License is distributed on an "AS IS" BASIS,
13 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14 + ~ See the License for the specific language governing permissions and
15 + ~ limitations under the License.
16 + -->
17 +<app name="org.onosproject.election" origin="ON.Lab" version="1.2.0"
18 + features="onos-app-metrics">
19 + <description>ONOS master election test application</description>
20 +</app>
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
155 <bundle>mvn:org.onosproject/onos-of-provider-group/@ONOS-VERSION</bundle> 155 <bundle>mvn:org.onosproject/onos-of-provider-group/@ONOS-VERSION</bundle>
156 </feature> 156 </feature>
157 157
158 - <!-- ONOS built-in apps --> 158 + <!-- ONOS built-in app features -->
159 159
160 <feature name="onos-app-fwd" version="@FEATURE-VERSION" 160 <feature name="onos-app-fwd" version="@FEATURE-VERSION"
161 description="ONOS sample forwarding application"> 161 description="ONOS sample forwarding application">
...@@ -225,7 +225,23 @@ ...@@ -225,7 +225,23 @@
225 <bundle>mvn:org.onosproject/onos-app-metrics-topology/@ONOS-VERSION</bundle> 225 <bundle>mvn:org.onosproject/onos-app-metrics-topology/@ONOS-VERSION</bundle>
226 </feature> 226 </feature>
227 227
228 - <!-- Sample apps: to be moved to a different repo --> 228 +
229 + <!-- ONOS test app features -->
230 +
231 + <feature name="onos-app-intent-perf" version="@FEATURE-VERSION"
232 + description="ONOS intent perf applications">
233 + <feature>onos-api</feature>
234 + <bundle>mvn:org.onosproject/onos-app-intent-perf/@ONOS-VERSION</bundle>
235 + </feature>
236 +
237 + <feature name="onos-app-election" version="@FEATURE-VERSION"
238 + description="ONOS app leadership election test">
239 + <feature>onos-api</feature>
240 + <bundle>mvn:org.onosproject/onos-app-election/@ONOS-VERSION</bundle>
241 + </feature>
242 +
243 +
244 + <!-- ONOS sample app features: to be moved to a different repo -->
229 245
230 <feature name="onos-app-tvue" version="@FEATURE-VERSION" 246 <feature name="onos-app-tvue" version="@FEATURE-VERSION"
231 description="ONOS sample topology viewer application"> 247 description="ONOS sample topology viewer application">
...@@ -248,24 +264,12 @@ ...@@ -248,24 +264,12 @@
248 <bundle>mvn:org.onosproject/onos-app-demo/@ONOS-VERSION</bundle> 264 <bundle>mvn:org.onosproject/onos-app-demo/@ONOS-VERSION</bundle>
249 </feature> 265 </feature>
250 266
251 - <feature name="onos-app-intent-perf" version="@FEATURE-VERSION"
252 - description="ONOS intent perf applications">
253 - <feature>onos-api</feature>
254 - <bundle>mvn:org.onosproject/onos-app-intent-perf/@ONOS-VERSION</bundle>
255 - </feature>
256 -
257 <feature name="onos-app-database-perf" version="@FEATURE-VERSION" 267 <feature name="onos-app-database-perf" version="@FEATURE-VERSION"
258 description="ONOS partitioned database perf application"> 268 description="ONOS partitioned database perf application">
259 <feature>onos-api</feature> 269 <feature>onos-api</feature>
260 <bundle>mvn:org.onosproject/onos-app-database-perf/@ONOS-VERSION</bundle> 270 <bundle>mvn:org.onosproject/onos-app-database-perf/@ONOS-VERSION</bundle>
261 </feature> 271 </feature>
262 272
263 - <feature name="onos-app-election" version="@FEATURE-VERSION"
264 - description="ONOS app leadership election test">
265 - <feature>onos-api</feature>
266 - <bundle>mvn:org.onosproject/onos-app-election/@ONOS-VERSION</bundle>
267 - </feature>
268 -
269 <feature name="onos-app-calendar" version="@FEATURE-VERSION" 273 <feature name="onos-app-calendar" version="@FEATURE-VERSION"
270 description="REST interface for scheduling intents from an external calendar"> 274 description="REST interface for scheduling intents from an external calendar">
271 <feature>onos-api</feature> 275 <feature>onos-api</feature>
......
1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<!--
3 + ~ Copyright 2015 Open Networking Laboratory
4 + ~
5 + ~ Licensed under the Apache License, Version 2.0 (the "License");
6 + ~ you may not use this file except in compliance with the License.
7 + ~ You may obtain a copy of the License at
8 + ~
9 + ~ http://www.apache.org/licenses/LICENSE-2.0
10 + ~
11 + ~ Unless required by applicable law or agreed to in writing, software
12 + ~ distributed under the License is distributed on an "AS IS" BASIS,
13 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14 + ~ See the License for the specific language governing permissions and
15 + ~ limitations under the License.
16 + -->
17 +<app name="org.onosproject.null" origin="ON.Lab" version="1.2.0"
18 + features="onos-null">
19 + <description>ONOS null southbound providers for testing</description>
20 +</app>
1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<!--
3 + ~ Copyright 2015 Open Networking Laboratory
4 + ~
5 + ~ Licensed under the Apache License, Version 2.0 (the "License");
6 + ~ you may not use this file except in compliance with the License.
7 + ~ You may obtain a copy of the License at
8 + ~
9 + ~ http://www.apache.org/licenses/LICENSE-2.0
10 + ~
11 + ~ Unless required by applicable law or agreed to in writing, software
12 + ~ distributed under the License is distributed on an "AS IS" BASIS,
13 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14 + ~ See the License for the specific language governing permissions and
15 + ~ limitations under the License.
16 + -->
17 +<app name="org.onosproject.openflow" origin="ON.Lab" version="1.2.0"
18 + features="onos-openflow">
19 + <description>ONOS OpenFlow protocol southbound providers</description>
20 +</app>