[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/BUCK b/BUCK
index e138ae3..35809ea 100644
--- a/BUCK
+++ b/BUCK
@@ -120,6 +120,7 @@
'//apps/mobility:onos-apps-mobility-oar',
'//apps/optical:onos-apps-optical-oar',
'//apps/newoptical:onos-apps-newoptical-oar',
+ '//apps/optical-model:onos-apps-optical-model-oar',
'//apps/pathpainter:onos-apps-pathpainter-oar',
'//apps/pcep-api:onos-apps-pcep-api-oar',
'//apps/pim:onos-apps-pim-oar',
diff --git a/apps/newoptical/BUCK b/apps/newoptical/BUCK
index c21f807..bb8f2d5 100644
--- a/apps/newoptical/BUCK
+++ b/apps/newoptical/BUCK
@@ -2,6 +2,7 @@
'//lib:CORE_DEPS',
'//lib:org.apache.karaf.shell.console',
'//cli:onos-cli',
+ '//apps/optical-model:onos-apps-optical-model',
]
osgi_jar_with_tests (
diff --git a/apps/newoptical/pom.xml b/apps/newoptical/pom.xml
index 1ca4f0d..52cf0e9 100644
--- a/apps/newoptical/pom.xml
+++ b/apps/newoptical/pom.xml
@@ -47,6 +47,12 @@
<dependency>
<groupId>org.onosproject</groupId>
+ <artifactId>onos-optical-model</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
<artifactId>onos-core-dist</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/apps/optical-model/BUCK b/apps/optical-model/BUCK
new file mode 100644
index 0000000..337e340
--- /dev/null
+++ b/apps/optical-model/BUCK
@@ -0,0 +1,22 @@
+COMPILE_DEPS = [
+ '//lib:CORE_DEPS',
+ '//incubator/api:onos-incubator-api',
+]
+
+TEST_DEPS = [
+ '//lib:TEST',
+]
+
+
+osgi_jar_with_tests (
+ deps = COMPILE_DEPS,
+ test_deps = TEST_DEPS,
+)
+
+onos_app (
+ title = 'Optical infromation model',
+ category = 'Optical',
+ url = 'http://onosproject.org',
+ description = 'ONOS optical infromation model.',
+ required_apps = [ ],
+)
diff --git a/apps/optical-model/features.xml b/apps/optical-model/features.xml
new file mode 100644
index 0000000..c16534a
--- /dev/null
+++ b/apps/optical-model/features.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ ~ Copyright 2016-present Open Networking Laboratory
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.1" name="${project.artifactId}-${project.version}">
+ <feature name="${project.artifactId}" version="${project.version}"
+ description="${project.description}">
+ <feature>onos-api</feature>
+ <bundle>mvn:${project.groupId}/${project.artifactId}/${project.version}</bundle>
+ </feature>
+</features>
diff --git a/apps/optical-model/pom.xml b/apps/optical-model/pom.xml
new file mode 100644
index 0000000..6540a48
--- /dev/null
+++ b/apps/optical-model/pom.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright 2016-present Open Networking Laboratory
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>onos-apps</artifactId>
+ <groupId>org.onosproject</groupId>
+ <version>1.6.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>onos-optical-model</artifactId>
+ <packaging>bundle</packaging>
+
+ <description>ONOS Optical Model extensions</description>
+
+ <properties>
+ <onos.app.name>org.onosproject.apps.optical-model</onos.app.name>
+ <onos.app.origin>ON.Lab</onos.app.origin>
+ <onos.app.category>Optical</onos.app.category>
+ <onos.app.title>Optical information model</onos.app.title>
+ <onos.app.url>http://onosproject.org</onos.app.url>
+ <onos.app.requires>
+ </onos.app.requires>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onlab-junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava-testlib</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+</project>
diff --git a/core/api/src/main/java/org/onosproject/net/optical/DefaultOpticalDevice.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/DefaultOpticalDevice.java
similarity index 100%
rename from core/api/src/main/java/org/onosproject/net/optical/DefaultOpticalDevice.java
rename to apps/optical-model/src/main/java/org/onosproject/net/optical/DefaultOpticalDevice.java
diff --git a/core/api/src/main/java/org/onosproject/net/optical/OchPort.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/OchPort.java
similarity index 100%
rename from core/api/src/main/java/org/onosproject/net/optical/OchPort.java
rename to apps/optical-model/src/main/java/org/onosproject/net/optical/OchPort.java
diff --git a/core/api/src/main/java/org/onosproject/net/optical/OduCltPort.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/OduCltPort.java
similarity index 100%
rename from core/api/src/main/java/org/onosproject/net/optical/OduCltPort.java
rename to apps/optical-model/src/main/java/org/onosproject/net/optical/OduCltPort.java
diff --git a/core/api/src/main/java/org/onosproject/net/optical/OmsPort.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/OmsPort.java
similarity index 100%
rename from core/api/src/main/java/org/onosproject/net/optical/OmsPort.java
rename to apps/optical-model/src/main/java/org/onosproject/net/optical/OmsPort.java
diff --git a/core/api/src/main/java/org/onosproject/net/optical/OpticalDevice.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/OpticalDevice.java
similarity index 100%
rename from core/api/src/main/java/org/onosproject/net/optical/OpticalDevice.java
rename to apps/optical-model/src/main/java/org/onosproject/net/optical/OpticalDevice.java
diff --git a/core/api/src/main/java/org/onosproject/net/optical/OtuPort.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/OtuPort.java
similarity index 100%
rename from core/api/src/main/java/org/onosproject/net/optical/OtuPort.java
rename to apps/optical-model/src/main/java/org/onosproject/net/optical/OtuPort.java
diff --git a/core/api/src/main/java/org/onosproject/net/optical/device/OchPortHelper.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/device/OchPortHelper.java
similarity index 100%
rename from core/api/src/main/java/org/onosproject/net/optical/device/OchPortHelper.java
rename to apps/optical-model/src/main/java/org/onosproject/net/optical/device/OchPortHelper.java
diff --git a/core/api/src/main/java/org/onosproject/net/optical/device/OduCltPortHelper.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/device/OduCltPortHelper.java
similarity index 100%
rename from core/api/src/main/java/org/onosproject/net/optical/device/OduCltPortHelper.java
rename to apps/optical-model/src/main/java/org/onosproject/net/optical/device/OduCltPortHelper.java
diff --git a/core/api/src/main/java/org/onosproject/net/optical/device/OmsPortHelper.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/device/OmsPortHelper.java
similarity index 100%
rename from core/api/src/main/java/org/onosproject/net/optical/device/OmsPortHelper.java
rename to apps/optical-model/src/main/java/org/onosproject/net/optical/device/OmsPortHelper.java
diff --git a/core/api/src/main/java/org/onosproject/net/optical/device/OpticalDeviceServiceView.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/device/OpticalDeviceServiceView.java
similarity index 100%
rename from core/api/src/main/java/org/onosproject/net/optical/device/OpticalDeviceServiceView.java
rename to apps/optical-model/src/main/java/org/onosproject/net/optical/device/OpticalDeviceServiceView.java
diff --git a/core/api/src/main/java/org/onosproject/net/optical/device/OtuPortHelper.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/device/OtuPortHelper.java
similarity index 100%
rename from core/api/src/main/java/org/onosproject/net/optical/device/OtuPortHelper.java
rename to apps/optical-model/src/main/java/org/onosproject/net/optical/device/OtuPortHelper.java
diff --git a/core/api/src/main/java/org/onosproject/net/optical/device/package-info.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/device/package-info.java
similarity index 100%
rename from core/api/src/main/java/org/onosproject/net/optical/device/package-info.java
rename to apps/optical-model/src/main/java/org/onosproject/net/optical/device/package-info.java
diff --git a/core/api/src/main/java/org/onosproject/net/optical/device/port/AbstractPortMapper.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/device/port/AbstractPortMapper.java
similarity index 100%
rename from core/api/src/main/java/org/onosproject/net/optical/device/port/AbstractPortMapper.java
rename to apps/optical-model/src/main/java/org/onosproject/net/optical/device/port/AbstractPortMapper.java
diff --git a/core/api/src/main/java/org/onosproject/net/optical/device/port/IdentityMapper.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/device/port/IdentityMapper.java
similarity index 100%
rename from core/api/src/main/java/org/onosproject/net/optical/device/port/IdentityMapper.java
rename to apps/optical-model/src/main/java/org/onosproject/net/optical/device/port/IdentityMapper.java
diff --git a/core/api/src/main/java/org/onosproject/net/optical/device/port/OchPortMapper.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/device/port/OchPortMapper.java
similarity index 100%
rename from core/api/src/main/java/org/onosproject/net/optical/device/port/OchPortMapper.java
rename to apps/optical-model/src/main/java/org/onosproject/net/optical/device/port/OchPortMapper.java
diff --git a/core/api/src/main/java/org/onosproject/net/optical/device/port/OduCltPortMapper.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/device/port/OduCltPortMapper.java
similarity index 100%
rename from core/api/src/main/java/org/onosproject/net/optical/device/port/OduCltPortMapper.java
rename to apps/optical-model/src/main/java/org/onosproject/net/optical/device/port/OduCltPortMapper.java
diff --git a/core/api/src/main/java/org/onosproject/net/optical/device/port/OmsPortMapper.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/device/port/OmsPortMapper.java
similarity index 100%
rename from core/api/src/main/java/org/onosproject/net/optical/device/port/OmsPortMapper.java
rename to apps/optical-model/src/main/java/org/onosproject/net/optical/device/port/OmsPortMapper.java
diff --git a/core/api/src/main/java/org/onosproject/net/optical/device/port/OtuPortMapper.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/device/port/OtuPortMapper.java
similarity index 100%
rename from core/api/src/main/java/org/onosproject/net/optical/device/port/OtuPortMapper.java
rename to apps/optical-model/src/main/java/org/onosproject/net/optical/device/port/OtuPortMapper.java
diff --git a/core/api/src/main/java/org/onosproject/net/optical/device/port/PortMapper.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/device/port/PortMapper.java
similarity index 100%
rename from core/api/src/main/java/org/onosproject/net/optical/device/port/PortMapper.java
rename to apps/optical-model/src/main/java/org/onosproject/net/optical/device/port/PortMapper.java
diff --git a/core/api/src/main/java/org/onosproject/net/optical/device/port/package-info.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/device/port/package-info.java
similarity index 100%
rename from core/api/src/main/java/org/onosproject/net/optical/device/port/package-info.java
rename to apps/optical-model/src/main/java/org/onosproject/net/optical/device/port/package-info.java
diff --git a/core/api/src/main/java/org/onosproject/net/optical/impl/DefaultOchPort.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/impl/DefaultOchPort.java
similarity index 100%
rename from core/api/src/main/java/org/onosproject/net/optical/impl/DefaultOchPort.java
rename to apps/optical-model/src/main/java/org/onosproject/net/optical/impl/DefaultOchPort.java
diff --git a/core/api/src/main/java/org/onosproject/net/optical/impl/DefaultOduCltPort.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/impl/DefaultOduCltPort.java
similarity index 100%
rename from core/api/src/main/java/org/onosproject/net/optical/impl/DefaultOduCltPort.java
rename to apps/optical-model/src/main/java/org/onosproject/net/optical/impl/DefaultOduCltPort.java
diff --git a/core/api/src/main/java/org/onosproject/net/optical/impl/DefaultOmsPort.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/impl/DefaultOmsPort.java
similarity index 100%
rename from core/api/src/main/java/org/onosproject/net/optical/impl/DefaultOmsPort.java
rename to apps/optical-model/src/main/java/org/onosproject/net/optical/impl/DefaultOmsPort.java
diff --git a/core/api/src/main/java/org/onosproject/net/optical/impl/DefaultOtuPort.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/impl/DefaultOtuPort.java
similarity index 100%
rename from core/api/src/main/java/org/onosproject/net/optical/impl/DefaultOtuPort.java
rename to apps/optical-model/src/main/java/org/onosproject/net/optical/impl/DefaultOtuPort.java
diff --git a/core/api/src/main/java/org/onosproject/net/optical/impl/package-info.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/impl/package-info.java
similarity index 100%
rename from core/api/src/main/java/org/onosproject/net/optical/impl/package-info.java
rename to apps/optical-model/src/main/java/org/onosproject/net/optical/impl/package-info.java
diff --git a/core/api/src/main/java/org/onosproject/net/optical/json/OchSignalCodec.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/json/OchSignalCodec.java
similarity index 100%
rename from core/api/src/main/java/org/onosproject/net/optical/json/OchSignalCodec.java
rename to apps/optical-model/src/main/java/org/onosproject/net/optical/json/OchSignalCodec.java
diff --git a/core/api/src/main/java/org/onosproject/net/optical/json/package-info.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/json/package-info.java
similarity index 100%
rename from core/api/src/main/java/org/onosproject/net/optical/json/package-info.java
rename to apps/optical-model/src/main/java/org/onosproject/net/optical/json/package-info.java
diff --git a/core/api/src/main/java/org/onosproject/net/optical/package-info.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/package-info.java
similarity index 100%
rename from core/api/src/main/java/org/onosproject/net/optical/package-info.java
rename to apps/optical-model/src/main/java/org/onosproject/net/optical/package-info.java
diff --git a/core/api/src/test/java/org/onosproject/net/optical/device/OmsPortHelperTest.java b/apps/optical-model/src/test/java/org/onosproject/net/optical/device/OmsPortHelperTest.java
similarity index 100%
rename from core/api/src/test/java/org/onosproject/net/optical/device/OmsPortHelperTest.java
rename to apps/optical-model/src/test/java/org/onosproject/net/optical/device/OmsPortHelperTest.java
diff --git a/core/api/src/test/java/org/onosproject/net/optical/impl/DefaultOmsPortTest.java b/apps/optical-model/src/test/java/org/onosproject/net/optical/impl/DefaultOmsPortTest.java
similarity index 100%
rename from core/api/src/test/java/org/onosproject/net/optical/impl/DefaultOmsPortTest.java
rename to apps/optical-model/src/test/java/org/onosproject/net/optical/impl/DefaultOmsPortTest.java
diff --git a/apps/optical/BUCK b/apps/optical/BUCK
index 49a3743..10762bd 100644
--- a/apps/optical/BUCK
+++ b/apps/optical/BUCK
@@ -1,5 +1,6 @@
COMPILE_DEPS = [
'//lib:CORE_DEPS',
+ '//apps/optical-model:onos-apps-optical-model',
]
osgi_jar_with_tests (
diff --git a/apps/optical/pom.xml b/apps/optical/pom.xml
index 09067ee..0d23309 100644
--- a/apps/optical/pom.xml
+++ b/apps/optical/pom.xml
@@ -42,6 +42,11 @@
<dependencies>
<dependency>
<groupId>org.onosproject</groupId>
+ <artifactId>onos-optical-model</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.onosproject</groupId>
<artifactId>onos-cli</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/apps/pom.xml b/apps/pom.xml
index de4a191..f71bc64 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -35,6 +35,7 @@
<module>mobility</module>
<module>proxyarp</module>
<module>sdnip</module>
+ <module>optical-model</module>
<module>optical</module>
<module>newoptical</module>
<module>metrics</module>
diff --git a/cli/BUCK b/cli/BUCK
index d2333d0..dd67dc1 100644
--- a/cli/BUCK
+++ b/cli/BUCK
@@ -4,6 +4,8 @@
'//incubator/api:onos-incubator-api',
'//utils/rest:onlab-rest',
'//core/common:onos-core-common',
+ # TODO Remove after decoupling optical
+ '//apps/optical-model:onos-apps-optical-model',
]
osgi_jar (
diff --git a/cli/pom.xml b/cli/pom.xml
index d1be580..6d3fa1a 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -50,6 +50,13 @@
<artifactId>onos-core-common</artifactId>
</dependency>
+ <!-- TODO Remove after decoupling optical -->
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-optical-model</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
diff --git a/core/net/BUCK b/core/net/BUCK
index 7070fb7..6b40b20 100644
--- a/core/net/BUCK
+++ b/core/net/BUCK
@@ -1,6 +1,8 @@
COMPILE_DEPS = [
'//lib:CORE_DEPS',
'//incubator/api:onos-incubator-api',
+ # TODO Remove after decoupling optical
+ '//apps/optical-model:onos-apps-optical-model',
]
TEST_DEPS = [
@@ -15,4 +17,4 @@
deps = COMPILE_DEPS,
test_deps = TEST_DEPS,
visibility = ['PUBLIC'],
-)
\ No newline at end of file
+)
diff --git a/core/net/pom.xml b/core/net/pom.xml
index 14e2d96..facb704 100644
--- a/core/net/pom.xml
+++ b/core/net/pom.xml
@@ -97,6 +97,16 @@
<artifactId>onos-incubator-api</artifactId>
</dependency>
+ <!-- TODO Remove after decoupling optical -->
+ <!-- - DeviceManager.InternalDeviceProviderService#ensureGeneric -->
+ <!-- - OpticalCompilers x4 -->
+ <!-- - OpticalPortOperator -->
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-optical-model</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>org.apache.karaf.features.core</artifactId>
diff --git a/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java b/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
index 3c9b71d..85385c6 100644
--- a/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
+++ b/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
@@ -546,6 +546,7 @@
case VIRTUAL:
return desc;
default:
+ // TODO: add plugin mechanism in order to decouple this
OpticalPortConfig opc = networkConfigService.getConfig(
new ConnectPoint(did, desc.portNumber()), OpticalPortConfig.class);
return OpticalPortOperator.combine(opc, desc);
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>
diff --git a/features/features.xml b/features/features.xml
index 8f5445d..87691fc 100644
--- a/features/features.xml
+++ b/features/features.xml
@@ -142,6 +142,8 @@
description="ONOS admin command console components">
<feature>onos-api</feature>
<bundle>mvn:org.onosproject/onos-cli/@ONOS-VERSION</bundle>
+ <!-- TODO Remove after decoupling optical -->
+ <bundle>mvn:org.onosproject/onos-optical-model/@ONOS-VERSION</bundle>
</feature>
<feature name="onos-security" version="@FEATURE-VERSION"
diff --git a/providers/openflow/device/BUCK b/providers/openflow/device/BUCK
index b498b34..4d9269c 100644
--- a/providers/openflow/device/BUCK
+++ b/providers/openflow/device/BUCK
@@ -2,6 +2,7 @@
'//lib:CORE_DEPS',
'//lib:openflowj',
'//protocols/openflow/api:onos-protocols-openflow-api',
+ '//apps/optical-model:onos-apps-optical-model',
]
TEST_DEPS = [
diff --git a/providers/openflow/device/pom.xml b/providers/openflow/device/pom.xml
index 1851643..fce4396 100644
--- a/providers/openflow/device/pom.xml
+++ b/providers/openflow/device/pom.xml
@@ -32,6 +32,12 @@
<description>ONOS OpenFlow protocol device provider</description>
<dependencies>
<dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-optical-model</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
</dependency>
diff --git a/web/api/BUCK b/web/api/BUCK
index f74f488..f3de3a0 100644
--- a/web/api/BUCK
+++ b/web/api/BUCK
@@ -14,4 +14,4 @@
deps = COMPILE_DEPS,
test_deps = TEST_DEPS,
web_context = '/onos/v1',
-)
\ No newline at end of file
+)