[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

@@ -120,6 +120,7 @@ APPS = [
     '//apps/mobility:onos-apps-mobility-oar',
     '//apps/mobility:onos-apps-mobility-oar',
     '//apps/optical:onos-apps-optical-oar',
     '//apps/optical:onos-apps-optical-oar',
     '//apps/newoptical:onos-apps-newoptical-oar',
     '//apps/newoptical:onos-apps-newoptical-oar',
+    '//apps/optical-model:onos-apps-optical-model-oar',
     '//apps/pathpainter:onos-apps-pathpainter-oar',
     '//apps/pathpainter:onos-apps-pathpainter-oar',
     '//apps/pcep-api:onos-apps-pcep-api-oar',
     '//apps/pcep-api:onos-apps-pcep-api-oar',
     '//apps/pim:onos-apps-pim-oar',
     '//apps/pim:onos-apps-pim-oar',

@@ -2,6 +2,7 @@ COMPILE_DEPS = [
   '//lib:CORE_DEPS',
   '//lib:CORE_DEPS',
   '//lib:org.apache.karaf.shell.console',
   '//lib:org.apache.karaf.shell.console',
   '//cli:onos-cli',
   '//cli:onos-cli',
+  '//apps/optical-model:onos-apps-optical-model',
 ]
 ]
 
 
 osgi_jar_with_tests (
 osgi_jar_with_tests (

@@ -47,6 +47,12 @@
 
 
         <dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
             <groupId>org.onosproject</groupId>
+            <artifactId>onos-optical-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onosproject</groupId>
             <artifactId>onos-core-dist</artifactId>
             <artifactId>onos-core-dist</artifactId>
             <version>${project.version}</version>
             <version>${project.version}</version>
         </dependency>
         </dependency>

+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 = [ ],
+)

+<?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>

+<?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>

 COMPILE_DEPS = [
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//lib:CORE_DEPS',
+    '//apps/optical-model:onos-apps-optical-model',
 ]
 ]
 
 
 osgi_jar_with_tests (
 osgi_jar_with_tests (

@@ -42,6 +42,11 @@
     <dependencies>
     <dependencies>
         <dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
             <groupId>org.onosproject</groupId>
+            <artifactId>onos-optical-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
             <artifactId>onos-cli</artifactId>
             <artifactId>onos-cli</artifactId>
             <version>${project.version}</version>
             <version>${project.version}</version>
         </dependency>
         </dependency>

@@ -35,6 +35,7 @@
         <module>mobility</module>
         <module>mobility</module>
         <module>proxyarp</module>
         <module>proxyarp</module>
         <module>sdnip</module>
         <module>sdnip</module>
+        <module>optical-model</module>
         <module>optical</module>
         <module>optical</module>
         <module>newoptical</module>
         <module>newoptical</module>
         <module>metrics</module>
         <module>metrics</module>

@@ -4,6 +4,8 @@ COMPILE_DEPS = [
     '//incubator/api:onos-incubator-api',
     '//incubator/api:onos-incubator-api',
     '//utils/rest:onlab-rest',
     '//utils/rest:onlab-rest',
     '//core/common:onos-core-common',
     '//core/common:onos-core-common',
+    # TODO Remove after decoupling optical
+    '//apps/optical-model:onos-apps-optical-model',
 ]
 ]
 
 
 osgi_jar (
 osgi_jar (

@@ -50,6 +50,13 @@
             <artifactId>onos-core-common</artifactId>
             <artifactId>onos-core-common</artifactId>
         </dependency>
         </dependency>
 
 
+        <!-- TODO Remove after decoupling optical -->
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-optical-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
             <artifactId>jackson-databind</artifactId>

 COMPILE_DEPS = [
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//lib:CORE_DEPS',
     '//incubator/api:onos-incubator-api',
     '//incubator/api:onos-incubator-api',
+    # TODO Remove after decoupling optical
+    '//apps/optical-model:onos-apps-optical-model',
 ]
 ]
 
 
 TEST_DEPS = [
 TEST_DEPS = [
@@ -15,4 +17,4 @@ osgi_jar_with_tests (
     deps = COMPILE_DEPS,
     deps = COMPILE_DEPS,
     test_deps = TEST_DEPS,
     test_deps = TEST_DEPS,
     visibility = ['PUBLIC'],
     visibility = ['PUBLIC'],
-)
\ No newline at end of file
+)

@@ -97,6 +97,16 @@
             <artifactId>onos-incubator-api</artifactId>
             <artifactId>onos-incubator-api</artifactId>
         </dependency>
         </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>
         <dependency>
             <groupId>org.apache.karaf.features</groupId>
             <groupId>org.apache.karaf.features</groupId>
             <artifactId>org.apache.karaf.features.core</artifactId>
             <artifactId>org.apache.karaf.features.core</artifactId>

@@ -546,6 +546,7 @@ public class DeviceManager
                 case VIRTUAL:
                 case VIRTUAL:
                     return desc;
                     return desc;
                 default:
                 default:
+                    // TODO: add plugin mechanism in order to decouple this
                     OpticalPortConfig opc = networkConfigService.getConfig(
                     OpticalPortConfig opc = networkConfigService.getConfig(
                             new ConnectPoint(did, desc.portNumber()), OpticalPortConfig.class);
                             new ConnectPoint(did, desc.portNumber()), OpticalPortConfig.class);
                     return OpticalPortOperator.combine(opc, desc);
                     return OpticalPortOperator.combine(opc, desc);

@@ -4,6 +4,7 @@ COMPILE_DEPS = [
     '//utils/rest:onlab-rest',
     '//utils/rest:onlab-rest',
     '//drivers/utilities:onos-drivers-utilities',
     '//drivers/utilities:onos-drivers-utilities',
     '//protocols/rest/api:onos-protocols-rest-api',
     '//protocols/rest/api:onos-protocols-rest-api',
+    '//apps/optical-model:onos-apps-optical-model',
 ]
 ]
 
 
 osgi_jar_with_tests (
 osgi_jar_with_tests (

@@ -44,6 +44,12 @@
     <dependencies>
     <dependencies>
         <dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
             <groupId>org.onosproject</groupId>
+            <artifactId>onos-optical-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onosproject</groupId>
             <artifactId>onos-drivers-utilities</artifactId>
             <artifactId>onos-drivers-utilities</artifactId>
             <version>${project.version}</version>
             <version>${project.version}</version>
         </dependency>
         </dependency>

@@ -2,6 +2,7 @@ COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//lib:CORE_DEPS',
     '//drivers/utilities:onos-drivers-utilities',
     '//drivers/utilities:onos-drivers-utilities',
     '//protocols/netconf/api:onos-protocols-netconf-api',
     '//protocols/netconf/api:onos-protocols-netconf-api',
+    '//apps/optical-model:onos-apps-optical-model',
 ]
 ]
 
 
 osgi_jar_with_tests (
 osgi_jar_with_tests (

@@ -44,6 +44,12 @@
     <dependencies>
     <dependencies>
         <dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
             <groupId>org.onosproject</groupId>
+            <artifactId>onos-optical-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onosproject</groupId>
             <artifactId>onos-netconf-api</artifactId>
             <artifactId>onos-netconf-api</artifactId>
             <version>${project.version}</version>
             <version>${project.version}</version>
         </dependency>
         </dependency>

@@ -4,6 +4,7 @@ COMPILE_DEPS = [
     '//drivers/utilities:onos-drivers-utilities',
     '//drivers/utilities:onos-drivers-utilities',
     '//protocols/snmp/api:onos-protocols-snmp-api',
     '//protocols/snmp/api:onos-protocols-snmp-api',
     '//incubator/api:onos-incubator-api',
     '//incubator/api:onos-incubator-api',
+    '//apps/optical-model:onos-apps-optical-model',
 ]
 ]
 
 
 osgi_jar_with_tests (
 osgi_jar_with_tests (

@@ -43,6 +43,12 @@
 
 
     <dependencies>
     <dependencies>
         <dependency>
         <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-optical-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.snmp4j</artifactId>
             <artifactId>org.apache.servicemix.bundles.snmp4j</artifactId>
             <version>2.3.4_1</version>
             <version>2.3.4_1</version>

@@ -3,6 +3,7 @@ COMPILE_DEPS = [
     '//lib:openflowj',
     '//lib:openflowj',
     '//protocols/openflow/api:onos-protocols-openflow-api',
     '//protocols/openflow/api:onos-protocols-openflow-api',
     '//drivers/default:onos-drivers-default',
     '//drivers/default:onos-drivers-default',
+    '//apps/optical-model:onos-apps-optical-model',
 ]
 ]
 
 
 osgi_jar_with_tests (
 osgi_jar_with_tests (

@@ -42,6 +42,11 @@
     </properties>
     </properties>
 
 
     <dependencies>
     <dependencies>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-optical-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
 
         <dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
             <groupId>org.onosproject</groupId>

@@ -30,4 +30,4 @@
     <artifactId>onos-drivers-utilities</artifactId>
     <artifactId>onos-drivers-utilities</artifactId>
     <packaging>bundle</packaging>
     <packaging>bundle</packaging>
 
 
-</project>
\ No newline at end of file
+</project>

@@ -142,6 +142,8 @@
              description="ONOS admin command console components">
              description="ONOS admin command console components">
         <feature>onos-api</feature>
         <feature>onos-api</feature>
         <bundle>mvn:org.onosproject/onos-cli/@ONOS-VERSION</bundle>
         <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>
 
 
     <feature name="onos-security" version="@FEATURE-VERSION"
     <feature name="onos-security" version="@FEATURE-VERSION"

@@ -2,6 +2,7 @@ COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//lib:CORE_DEPS',
     '//lib:openflowj',
     '//lib:openflowj',
     '//protocols/openflow/api:onos-protocols-openflow-api',
     '//protocols/openflow/api:onos-protocols-openflow-api',
+    '//apps/optical-model:onos-apps-optical-model',
 ]
 ]
 
 
 TEST_DEPS = [
 TEST_DEPS = [

@@ -32,6 +32,12 @@
     <description>ONOS OpenFlow protocol device provider</description>
     <description>ONOS OpenFlow protocol device provider</description>
     <dependencies>
     <dependencies>
         <dependency>
         <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-optical-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
             <groupId>org.osgi</groupId>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <artifactId>org.osgi.compendium</artifactId>
         </dependency>
         </dependency>

@@ -14,4 +14,4 @@ osgi_jar_with_tests (
     deps = COMPILE_DEPS,
     deps = COMPILE_DEPS,
     test_deps = TEST_DEPS,
     test_deps = TEST_DEPS,
     web_context = '/onos/v1',
     web_context = '/onos/v1',
-)
\ No newline at end of file
+)