홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
Committed by Gerrit Code Review
db7467ac 1 parent 624f13a9

Separating onos-drivers to be delivered as a separate app from onos-openflow. Ap… 

…ps activated by default (via onos-setup-karaf or onos-install/onos-config)  are now onos-drivers and onos-openflow.

Change-Id: I35c7cca79a4b72e966cbc2cebe72b109f2d92706
Inline Side-by-side
Showing 9 changed files with 72 additions and 31 deletions
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.drivers" origin="ON.Lab" version="${feature.version}"
18 + featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
19 + features="${project.artifactId}">
20 + <description>${project.description}</description>
21 + <artifact>mvn:${project.groupId}/${project.artifactId}/${project.version}</artifact>
22 +</app>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
30 <artifactId>onos-drivers</artifactId> 30 <artifactId>onos-drivers</artifactId>
31 <packaging>bundle</packaging> 31 <packaging>bundle</packaging>
32 32
33 - <description>ONOS Default Device Drivers</description> 33 + <description>Builtin device drivers</description>
34 34
35 <dependencies> 35 <dependencies>
36 <dependency> 36 <dependency>
...@@ -66,7 +66,10 @@ ...@@ -66,7 +66,10 @@
66 <groupId>org.apache.felix</groupId> 66 <groupId>org.apache.felix</groupId>
67 <artifactId>maven-bundle-plugin</artifactId> 67 <artifactId>maven-bundle-plugin</artifactId>
68 </plugin> 68 </plugin>
69 - 69 + <plugin>
70 + <groupId>org.onosproject</groupId>
71 + <artifactId>onos-maven-plugin</artifactId>
72 + </plugin>
70 </plugins> 73 </plugins>
71 </build> 74 </build>
72 </project> 75 </project>
......
...@@ -68,9 +68,10 @@ ...@@ -68,9 +68,10 @@
68 </feature> 68 </feature>
69 69
70 <feature name="onos-thirdparty-web" version="@FEATURE-VERSION" 70 <feature name="onos-thirdparty-web" version="@FEATURE-VERSION"
71 - description="ONOS 3rd party dependencies"> 71 + description="ONOS 3rd party dependencies for web apps">
72 <feature>war</feature> 72 <feature>war</feature>
73 <feature>onos-thirdparty-base</feature> 73 <feature>onos-thirdparty-base</feature>
74 + <!-- FIXME: we should upgrade our jersey eventually -->
74 <bundle>mvn:com.sun.jersey/jersey-core/1.19</bundle> 75 <bundle>mvn:com.sun.jersey/jersey-core/1.19</bundle>
75 <bundle>mvn:com.sun.jersey/jersey-server/1.19</bundle> 76 <bundle>mvn:com.sun.jersey/jersey-server/1.19</bundle>
76 <bundle>mvn:com.sun.jersey/jersey-servlet/1.19</bundle> 77 <bundle>mvn:com.sun.jersey/jersey-servlet/1.19</bundle>
...@@ -120,29 +121,9 @@ ...@@ -120,29 +121,9 @@
120 <bundle>mvn:org.onosproject/onos-cli/@ONOS-VERSION</bundle> 121 <bundle>mvn:org.onosproject/onos-cli/@ONOS-VERSION</bundle>
121 </feature> 122 </feature>
122 123
123 - <!-- ONOS OpenFlow provider app features -->
124 -
125 - <feature name="onos-openflow" version="@FEATURE-VERSION"
126 - description="ONOS OpenFlow API, Controller &amp; Providers">
127 - <feature>onos-api</feature>
128 - <bundle>mvn:io.netty/netty/3.9.2.Final</bundle>
129 - <bundle>mvn:org.onosproject/onos-of-api/@ONOS-VERSION</bundle>
130 - <bundle>mvn:org.onosproject/onos-of-drivers/@ONOS-VERSION</bundle>
131 - <bundle>mvn:org.onosproject/onos-of-ctl/@ONOS-VERSION</bundle>
132 - <bundle>mvn:org.onosproject/onos-drivers/@ONOS-VERSION</bundle>
133 -
134 - <bundle>mvn:org.onosproject/onos-lldp-provider/@ONOS-VERSION</bundle>
135 - <bundle>mvn:org.onosproject/onos-host-provider/@ONOS-VERSION</bundle>
136 - <bundle>mvn:org.onosproject/onos-of-provider-device/@ONOS-VERSION</bundle>
137 - <bundle>mvn:org.onosproject/onos-of-provider-packet/@ONOS-VERSION</bundle>
138 - <bundle>mvn:org.onosproject/onos-of-provider-flow/@ONOS-VERSION</bundle>
139 - <bundle>mvn:org.onosproject/onos-of-provider-group/@ONOS-VERSION</bundle>
140 - </feature>
141 -
142 <!-- Deprecated! For standalone testing only. --> 124 <!-- Deprecated! For standalone testing only. -->
143 -
144 <feature name="onos-core-trivial" version="@FEATURE-VERSION" 125 <feature name="onos-core-trivial" version="@FEATURE-VERSION"
145 - description="ONOS core components"> 126 + description="ONOS trivial core components">
146 <feature>onos-api</feature> 127 <feature>onos-api</feature>
147 <bundle>mvn:org.onosproject/onos-core-net/@ONOS-VERSION</bundle> 128 <bundle>mvn:org.onosproject/onos-core-net/@ONOS-VERSION</bundle>
148 <bundle>mvn:org.onosproject/onos-core-common/@ONOS-VERSION</bundle> 129 <bundle>mvn:org.onosproject/onos-core-common/@ONOS-VERSION</bundle>
......
...@@ -15,8 +15,9 @@ ...@@ -15,8 +15,9 @@
15 ~ limitations under the License. 15 ~ limitations under the License.
16 --> 16 -->
17 <app name="org.onosproject.openflow" origin="ON.Lab" version="${feature.version}" 17 <app name="org.onosproject.openflow" origin="ON.Lab" version="${feature.version}"
18 - features="onos-openflow"> 18 + featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
19 - <description>OpenFlow protocol southbound providers</description> 19 + features="${project.artifactId}">
20 + <description>${project.description}</description>
20 21
21 <artifact>mvn:${project.groupId}/onos-of-api/${project.version}</artifact> 22 <artifact>mvn:${project.groupId}/onos-of-api/${project.version}</artifact>
22 <artifact>mvn:${project.groupId}/onos-of-drivers/${project.version}</artifact> 23 <artifact>mvn:${project.groupId}/onos-of-drivers/${project.version}</artifact>
......
1 +<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
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 +<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${feature.version}">
18 + <repository>mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features</repository>
19 + <feature name="${project.artifactId}" version="${feature.version}"
20 + description="${project.description}">
21 + <feature>onos-api</feature>
22 + <bundle>mvn:io.netty/netty/3.9.2.Final</bundle>
23 + <bundle>mvn:${project.groupId}/onos-of-api/${project.version}</bundle>
24 + <bundle>mvn:${project.groupId}/onos-of-drivers/${project.version}</bundle>
25 + <bundle>mvn:${project.groupId}/onos-of-ctl/${project.version}</bundle>
26 + <bundle>mvn:${project.groupId}/onos-drivers/${project.version}</bundle>
27 +
28 + <bundle>mvn:${project.groupId}/onos-lldp-provider/${project.version}</bundle>
29 + <bundle>mvn:${project.groupId}/onos-host-provider/${project.version}</bundle>
30 + <bundle>mvn:${project.groupId}/onos-of-provider-device/${project.version}</bundle>
31 + <bundle>mvn:${project.groupId}/onos-of-provider-packet/${project.version}</bundle>
32 + <bundle>mvn:${project.groupId}/onos-of-provider-flow/${project.version}</bundle>
33 + <bundle>mvn:${project.groupId}/onos-of-provider-group/${project.version}</bundle>
34 + </feature>
35 +</features>
...@@ -26,10 +26,10 @@ ...@@ -26,10 +26,10 @@
26 <relativePath>../pom.xml</relativePath> 26 <relativePath>../pom.xml</relativePath>
27 </parent> 27 </parent>
28 28
29 - <artifactId>onos-of-providers-app</artifactId> 29 + <artifactId>onos-openflow</artifactId>
30 <packaging>pom</packaging> 30 <packaging>pom</packaging>
31 31
32 - <description>ONOS OpenFlow providers app</description> 32 + <description>OpenFlow protocol southbound providers</description>
33 33
34 <dependencies> 34 <dependencies>
35 <dependency> 35 <dependency>
......
...@@ -70,7 +70,6 @@ ...@@ -70,7 +70,6 @@
70 <groupId>org.apache.felix</groupId> 70 <groupId>org.apache.felix</groupId>
71 <artifactId>maven-bundle-plugin</artifactId> 71 <artifactId>maven-bundle-plugin</artifactId>
72 </plugin> 72 </plugin>
73 -
74 <plugin> 73 <plugin>
75 <groupId>org.onosproject</groupId> 74 <groupId>org.onosproject</groupId>
76 <artifactId>onos-maven-plugin</artifactId> 75 <artifactId>onos-maven-plugin</artifactId>
......
...@@ -12,7 +12,7 @@ remote=$ONOS_USER@${1:-$OCI} ...@@ -12,7 +12,7 @@ remote=$ONOS_USER@${1:-$OCI}
12 export ONOS_BOOT_FEATURES="${ONOS_BOOT_FEATURES:-webconsole,onos-api,onos-core,onos-cli,onos-rest,onos-gui}" 12 export ONOS_BOOT_FEATURES="${ONOS_BOOT_FEATURES:-webconsole,onos-api,onos-core,onos-cli,onos-rest,onos-gui}"
13 13
14 # ONOS builtin apps and providers ignited by default 14 # ONOS builtin apps and providers ignited by default
15 -export ONOS_APPS="${ONOS_APPS:-openflow}" 15 +export ONOS_APPS="${ONOS_APPS:-drivers,openflow}"
16 16
17 # Generate a cluster.json from the ON* environment variables 17 # Generate a cluster.json from the ON* environment variables
18 CDEF_FILE=/tmp/${remote}.cluster.json 18 CDEF_FILE=/tmp/${remote}.cluster.json
......
...@@ -94,6 +94,6 @@ rm -fr $STAGE/apps ...@@ -94,6 +94,6 @@ rm -fr $STAGE/apps
94 onos-stage-apps $STAGE/apps $KARAF_ROOT/system 94 onos-stage-apps $STAGE/apps $KARAF_ROOT/system
95 95
96 echo "Customizing apps to be auto-activated..." 96 echo "Customizing apps to be auto-activated..."
97 -for app in $(echo ${ONOS_APPS:-openflow} | tr ',' ' '); do 97 +for app in $(echo ${ONOS_APPS:-drivers,openflow} | tr ',' ' '); do
98 touch $STAGE/apps/org.onosproject.$app/active 98 touch $STAGE/apps/org.onosproject.$app/active
99 done 99 done
......