홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Yuta HIGUCHI
Committed by Gerrit Code Review
e076415b 1 parent 3e57b650

Revert "[ONOS-4513] Slice optical-model into separate bundle" 

Will revet this separation for 1.6 and work on it targeted for 1.7.

This reverts commit 652ec6b7.

Change-Id: Ica8899988a6fcc02ece138a7f0d940a7994c77e9
Inline Side-by-side
Showing 57 changed files with 3 additions and 182 deletions
......@@ -120,7 +120,6 @@ APPS = [
'//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',
......
......@@ -2,7 +2,6 @@ COMPILE_DEPS = [
'//lib:CORE_DEPS',
'//lib:org.apache.karaf.shell.console',
'//cli:onos-cli',
'//apps/optical-model:onos-apps-optical-model',
]
osgi_jar_with_tests (
......
......@@ -47,12 +47,6 @@
<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>
......
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 = [
'//lib:CORE_DEPS',
'//apps/optical-model:onos-apps-optical-model',
]
osgi_jar_with_tests (
......
......@@ -42,11 +42,6 @@
<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>
......
......@@ -35,7 +35,6 @@
<module>mobility</module>
<module>proxyarp</module>
<module>sdnip</module>
<module>optical-model</module>
<module>optical</module>
<module>newoptical</module>
<module>metrics</module>
......
......@@ -4,8 +4,6 @@ COMPILE_DEPS = [
'//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 (
......
......@@ -50,13 +50,6 @@
<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>
......
COMPILE_DEPS = [
'//lib:CORE_DEPS',
'//incubator/api:onos-incubator-api',
# TODO Remove after decoupling optical
'//apps/optical-model:onos-apps-optical-model',
]
TEST_DEPS = [
......@@ -17,4 +15,4 @@ osgi_jar_with_tests (
deps = COMPILE_DEPS,
test_deps = TEST_DEPS,
visibility = ['PUBLIC'],
)
)
\ No newline at end of file
......
......@@ -97,16 +97,6 @@
<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>
......
......@@ -546,7 +546,6 @@ public class DeviceManager
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);
......
......@@ -4,7 +4,6 @@ COMPILE_DEPS = [
'//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 (
......
......@@ -44,12 +44,6 @@
<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>
......
......@@ -2,7 +2,6 @@ COMPILE_DEPS = [
'//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 (
......
......@@ -44,12 +44,6 @@
<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>
......
......@@ -4,7 +4,6 @@ COMPILE_DEPS = [
'//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 (
......
......@@ -43,12 +43,6 @@
<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>
......
......@@ -3,7 +3,6 @@ COMPILE_DEPS = [
'//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 (
......
......@@ -42,11 +42,6 @@
</properties>
<dependencies>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-optical-model</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
......
......@@ -30,4 +30,4 @@
<artifactId>onos-drivers-utilities</artifactId>
<packaging>bundle</packaging>
</project>
</project>
\ No newline at end of file
......
......@@ -142,8 +142,6 @@
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"
......
......@@ -2,7 +2,6 @@ COMPILE_DEPS = [
'//lib:CORE_DEPS',
'//lib:openflowj',
'//protocols/openflow/api:onos-protocols-openflow-api',
'//apps/optical-model:onos-apps-optical-model',
]
TEST_DEPS = [
......
......@@ -32,12 +32,6 @@
<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>
......
......@@ -14,4 +14,4 @@ osgi_jar_with_tests (
deps = COMPILE_DEPS,
test_deps = TEST_DEPS,
web_context = '/onos/v1',
)
)
\ No newline at end of file
......