commit c7f35cfe24cfaf2352e11c9aca4888304b0d8605
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Wed Aug 03 13:57:30 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Thu Aug 04 00:41:19 2016 +0000
tree 0bfa3bcef1f1c8bb4ecfb4afde1d439a8d952c5e
parent 7f2c6f9b250070555c020e7800883c43d3fa889a

Move optical-model dependency to openflow-base

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

Change-Id: Ibbfdb88b252dd77e103eec7d776f4fde9b33bcab

providers/openflow/base/BUCK

diff --git a/providers/openflow/base/BUCK b/providers/openflow/base/BUCK
index 417d09f..46844fc 100644
--- a/providers/openflow/base/BUCK
+++ b/providers/openflow/base/BUCK
@@ -9,6 +9,10 @@
     '//providers/openflow/meter:onos-providers-openflow-meter',
 ]
 
+APPS = [
+    'org.onosproject.optical-model',
+]
+
 onos_app (
     app_name = 'org.onosproject.openflow-base',
     title = 'OpenFlow Provider',
@@ -16,4 +20,5 @@
     url = 'http://onosproject.org',
     description = 'OpenFlow protocol southbound providers.',
     included_bundles = BUNDLES,
+    required_apps = APPS,
 )

providers/openflow/base/app.xml

diff --git a/providers/openflow/base/app.xml b/providers/openflow/base/app.xml
index 06b41c6..a372932 100644
--- a/providers/openflow/base/app.xml
+++ b/providers/openflow/base/app.xml
@@ -17,7 +17,7 @@
 <app name="org.onosproject.openflow-base" origin="ON.Lab" version="${project.version}"
      category="Provider" url="http://onosproject.org" title="OpenFlow Provider"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
-     features="${project.artifactId}">
+     features="${project.artifactId}" apps="org.onosproject.optical-model">
     <description>${project.description}</description>
     <artifact>mvn:${project.groupId}/onos-of-api/${project.version}</artifact>
     <artifact>mvn:${project.groupId}/onos-of-ctl/${project.version}</artifact>