[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/core/net/BUCK b/core/net/BUCK
index fa93865..25db0df 100644
--- a/core/net/BUCK
+++ b/core/net/BUCK
@@ -4,6 +4,8 @@
'//utils/rest:onlab-rest',
'//incubator/net:onos-incubator-net',
'//incubator/store:onos-incubator-store',
+ # TODO Remove after decoupling optical
+ '//apps/optical-model:onos-apps-optical-model',
]
TEST_DEPS = [
@@ -19,4 +21,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 1d3650b..428ec4d 100644
--- a/core/net/pom.xml
+++ b/core/net/pom.xml
@@ -104,6 +104,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 8e09e8e..23aba6a 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
@@ -569,6 +569,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);