[ONOS-4513] Slice optical-model into separate bundle
- 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 6537ee6..a5524e1 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',
]
osgi_jar_with_tests (
diff --git a/drivers/ciena/pom.xml b/drivers/ciena/pom.xml
index 6c72920..517968d 100644
--- a/drivers/ciena/pom.xml
+++ b/drivers/ciena/pom.xml
@@ -44,6 +44,12 @@
<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>
diff --git a/drivers/fujitsu/BUCK b/drivers/fujitsu/BUCK
index 0ea201d..69b62c1 100644
--- a/drivers/fujitsu/BUCK
+++ b/drivers/fujitsu/BUCK
@@ -2,6 +2,7 @@
'//lib:CORE_DEPS',
'//drivers/utilities:onos-drivers-utilities',
'//protocols/netconf/api:onos-protocols-netconf-api',
+ '//apps/optical-model:onos-apps-optical-model',
]
osgi_jar_with_tests (
diff --git a/drivers/fujitsu/pom.xml b/drivers/fujitsu/pom.xml
index 4e68f17..5b7fd51 100644
--- a/drivers/fujitsu/pom.xml
+++ b/drivers/fujitsu/pom.xml
@@ -44,6 +44,12 @@
<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>
diff --git a/drivers/lumentum/BUCK b/drivers/lumentum/BUCK
index 768feac..7fadd55 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',
]
osgi_jar_with_tests (
diff --git a/drivers/lumentum/pom.xml b/drivers/lumentum/pom.xml
index fef1cab..c2ca1fe 100644
--- a/drivers/lumentum/pom.xml
+++ b/drivers/lumentum/pom.xml
@@ -43,6 +43,12 @@
<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>
diff --git a/drivers/optical/BUCK b/drivers/optical/BUCK
index 23ee9b7..13a5adf 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',
]
osgi_jar_with_tests (
diff --git a/drivers/optical/pom.xml b/drivers/optical/pom.xml
index ad9a9e7..25b9d1d 100644
--- a/drivers/optical/pom.xml
+++ b/drivers/optical/pom.xml
@@ -42,6 +42,11 @@
</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 a112ffe..7c22941 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>