Move optical-model dependency to openflow-base
- move optical dependency from openflow meta app to openflow-base
Change-Id: Ibbfdb88b252dd77e103eec7d776f4fde9b33bcab
diff --git a/providers/openflow/app/BUCK b/providers/openflow/app/BUCK
index 2cad2e4..3e082c6 100644
--- a/providers/openflow/app/BUCK
+++ b/providers/openflow/app/BUCK
@@ -1,5 +1,4 @@
APPS = [
- 'org.onosproject.optical-model',
'org.onosproject.openflow-base',
'org.onosproject.hostprovider',
'org.onosproject.lldpprovider',
diff --git a/providers/openflow/app/pom.xml b/providers/openflow/app/pom.xml
index 989be48..70bf396 100644
--- a/providers/openflow/app/pom.xml
+++ b/providers/openflow/app/pom.xml
@@ -33,7 +33,6 @@
<onos.app.title>OpenFlow Meta App</onos.app.title>
<onos.app.category>Provider</onos.app.category>
<onos.app.requires>
- org.onosproject.optical-model,
org.onosproject.openflow-base,
org.onosproject.hostprovider,
org.onosproject.lldpprovider
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,
)
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>