[ONOS-4513] Slice optical-model into separate bundle (1/3)
- net and cli bundle has dependency to optical-model bundle,
which should be removed in the longer run. (ONOS-4626)
Change-Id: Ieff43ef2002ee21f4578a6e2a729cd35ce3eae3d
diff --git a/drivers/ciena/BUCK b/drivers/ciena/BUCK
index 57e0ff6..5eba907 100644
--- a/drivers/ciena/BUCK
+++ b/drivers/ciena/BUCK
@@ -4,6 +4,7 @@
'//utils/rest:onlab-rest',
'//drivers/utilities:onos-drivers-utilities',
'//protocols/rest/api:onos-protocols-rest-api',
+ '//apps/optical-model:onos-apps-optical-model',
]
TEST_DEPS = [
@@ -30,5 +31,5 @@
url = 'http://onosproject.org',
description = 'ONOS Ciena Device Drivers application.',
included_bundles = BUNDLES,
- required_apps = [ 'org.onosproject.restsb' ],
+ required_apps = [ 'org.onosproject.restsb', 'org.onosproject.optical-model' ],
)
diff --git a/drivers/ciena/pom.xml b/drivers/ciena/pom.xml
index fb43a4e..4d571e3 100644
--- a/drivers/ciena/pom.xml
+++ b/drivers/ciena/pom.xml
@@ -37,13 +37,20 @@
<onos.app.category>Drivers</onos.app.category>
<onos.app.url>http://onosproject.org</onos.app.url>
<onos.app.requires>
- org.onosproject.restsb
+ org.onosproject.restsb,
+ org.onosproject.optical-model
</onos.app.requires>
</properties>
<dependencies>
<dependency>
<groupId>org.onosproject</groupId>
+ <artifactId>onos-optical-model</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
<artifactId>onos-drivers-utilities</artifactId>
<version>${project.version}</version>
</dependency>
@@ -54,4 +61,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/drivers/fujitsu/BUCK b/drivers/fujitsu/BUCK
index 4890811..2ab5166 100644
--- a/drivers/fujitsu/BUCK
+++ b/drivers/fujitsu/BUCK
@@ -4,6 +4,7 @@
'//protocols/netconf/api:onos-protocols-netconf-api',
'//lib:org.apache.karaf.shell.console',
'//cli:onos-cli',
+ '//apps/optical-model:onos-apps-optical-model',
]
TEST_DEPS = [
@@ -30,5 +31,5 @@
url = 'http://onosproject.org',
description = 'ONOS Fujitsu device drivers application.',
included_bundles = BUNDLES,
- required_apps = [ 'org.onosproject.netconf' ],
+ required_apps = [ 'org.onosproject.netconf', 'org.onosproject.optical-model' ],
)
diff --git a/drivers/fujitsu/pom.xml b/drivers/fujitsu/pom.xml
index 323c51e..431ef9f 100644
--- a/drivers/fujitsu/pom.xml
+++ b/drivers/fujitsu/pom.xml
@@ -37,13 +37,20 @@
<onos.app.title>Fujitsu Device Drivers</onos.app.title>
<onos.app.url>http://onosproject.org</onos.app.url>
<onos.app.requires>
- org.onosproject.netconf
+ org.onosproject.netconf,
+ org.onosproject.optical-model
</onos.app.requires>
</properties>
<dependencies>
<dependency>
<groupId>org.onosproject</groupId>
+ <artifactId>onos-optical-model</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
<artifactId>onos-netconf-api</artifactId>
<version>${project.version}</version>
</dependency>
@@ -64,4 +71,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/drivers/lumentum/BUCK b/drivers/lumentum/BUCK
index 0025279..0feb6ee 100644
--- a/drivers/lumentum/BUCK
+++ b/drivers/lumentum/BUCK
@@ -4,6 +4,7 @@
'//drivers/utilities:onos-drivers-utilities',
'//protocols/snmp/api:onos-protocols-snmp-api',
'//incubator/api:onos-incubator-api',
+ '//apps/optical-model:onos-apps-optical-model',
]
TEST_DEPS = [
@@ -24,5 +25,5 @@
category = 'Drivers',
url = 'http://onosproject.org',
description = 'ONOS Lumentum Device Drivers application.',
- required_apps = [ 'org.onosproject.snmp', 'org.onosproject.faultmanagement' ],
+ required_apps = [ 'org.onosproject.snmp', 'org.onosproject.faultmanagement', 'org.onosproject.optical-model' ],
)
diff --git a/drivers/lumentum/pom.xml b/drivers/lumentum/pom.xml
index 22b0ea6..9a2c4eb 100644
--- a/drivers/lumentum/pom.xml
+++ b/drivers/lumentum/pom.xml
@@ -37,12 +37,19 @@
<onos.app.url>http://onosproject.org</onos.app.url>
<onos.app.requires>
org.onosproject.snmp,
- org.onosproject.faultmanagement
+ org.onosproject.faultmanagement,
+ org.onosproject.optical-model
</onos.app.requires>
</properties>
<dependencies>
<dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-optical-model</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.snmp4j</artifactId>
<version>2.3.4_1</version>
@@ -53,4 +60,4 @@
<version>${project.version}</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/drivers/optical/BUCK b/drivers/optical/BUCK
index 4519263..3515382 100644
--- a/drivers/optical/BUCK
+++ b/drivers/optical/BUCK
@@ -3,6 +3,7 @@
'//lib:openflowj',
'//protocols/openflow/api:onos-protocols-openflow-api',
'//drivers/default:onos-drivers-default',
+ '//apps/optical-model:onos-apps-optical-model',
]
TEST_DEPS = [
@@ -23,5 +24,5 @@
category = 'Drivers',
url = 'http://onosproject.org',
description = 'ONOS other optical Device Drivers application.',
- required_apps = [ 'org.onosproject.drivers' ],
+ required_apps = [ 'org.onosproject.drivers', 'org.onosproject.optical-model' ],
)
diff --git a/drivers/optical/pom.xml b/drivers/optical/pom.xml
index 64e7153..ebcee1c 100644
--- a/drivers/optical/pom.xml
+++ b/drivers/optical/pom.xml
@@ -37,11 +37,17 @@
<onos.app.title>Other optical Device Drivers</onos.app.title>
<onos.app.url>http://onosproject.org</onos.app.url>
<onos.app.requires>
- org.onosproject.drivers
+ org.onosproject.drivers,
+ org.onosproject.optical-model
</onos.app.requires>
</properties>
<dependencies>
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-optical-model</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.onosproject</groupId>
diff --git a/drivers/utilities/pom.xml b/drivers/utilities/pom.xml
index 10881f9..ef1b012 100644
--- a/drivers/utilities/pom.xml
+++ b/drivers/utilities/pom.xml
@@ -30,4 +30,4 @@
<artifactId>onos-drivers-utilities</artifactId>
<packaging>bundle</packaging>
-</project>
\ No newline at end of file
+</project>