홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Yuta HIGUCHI
Committed by Gerrit Code Review
c7f35cfe 1 parent 7f2c6f9b

Move optical-model dependency to openflow-base 

- move optical dependency from openflow meta app to openflow-base

Change-Id: Ibbfdb88b252dd77e103eec7d776f4fde9b33bcab
Inline Side-by-side
Showing 4 changed files with 6 additions and 3 deletions
1 APPS = [ 1 APPS = [
2 - 'org.onosproject.optical-model',
3 'org.onosproject.openflow-base', 2 'org.onosproject.openflow-base',
4 'org.onosproject.hostprovider', 3 'org.onosproject.hostprovider',
5 'org.onosproject.lldpprovider', 4 'org.onosproject.lldpprovider',
......
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
33 <onos.app.title>OpenFlow Meta App</onos.app.title> 33 <onos.app.title>OpenFlow Meta App</onos.app.title>
34 <onos.app.category>Provider</onos.app.category> 34 <onos.app.category>Provider</onos.app.category>
35 <onos.app.requires> 35 <onos.app.requires>
36 - org.onosproject.optical-model,
37 org.onosproject.openflow-base, 36 org.onosproject.openflow-base,
38 org.onosproject.hostprovider, 37 org.onosproject.hostprovider,
39 org.onosproject.lldpprovider 38 org.onosproject.lldpprovider
......
...@@ -9,6 +9,10 @@ BUNDLES = [ ...@@ -9,6 +9,10 @@ BUNDLES = [
9 '//providers/openflow/meter:onos-providers-openflow-meter', 9 '//providers/openflow/meter:onos-providers-openflow-meter',
10 ] 10 ]
11 11
12 +APPS = [
13 + 'org.onosproject.optical-model',
14 +]
15 +
12 onos_app ( 16 onos_app (
13 app_name = 'org.onosproject.openflow-base', 17 app_name = 'org.onosproject.openflow-base',
14 title = 'OpenFlow Provider', 18 title = 'OpenFlow Provider',
...@@ -16,4 +20,5 @@ onos_app ( ...@@ -16,4 +20,5 @@ onos_app (
16 url = 'http://onosproject.org', 20 url = 'http://onosproject.org',
17 description = 'OpenFlow protocol southbound providers.', 21 description = 'OpenFlow protocol southbound providers.',
18 included_bundles = BUNDLES, 22 included_bundles = BUNDLES,
23 + required_apps = APPS,
19 ) 24 )
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
17 <app name="org.onosproject.openflow-base" origin="ON.Lab" version="${project.version}" 17 <app name="org.onosproject.openflow-base" origin="ON.Lab" version="${project.version}"
18 category="Provider" url="http://onosproject.org" title="OpenFlow Provider" 18 category="Provider" url="http://onosproject.org" title="OpenFlow Provider"
19 featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features" 19 featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
20 - features="${project.artifactId}"> 20 + features="${project.artifactId}" apps="org.onosproject.optical-model">
21 <description>${project.description}</description> 21 <description>${project.description}</description>
22 <artifact>mvn:${project.groupId}/onos-of-api/${project.version}</artifact> 22 <artifact>mvn:${project.groupId}/onos-of-api/${project.version}</artifact>
23 <artifact>mvn:${project.groupId}/onos-of-ctl/${project.version}</artifact> 23 <artifact>mvn:${project.groupId}/onos-of-ctl/${project.version}</artifact>
......