홍길동 / 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 = [ ...@@ -120,7 +120,6 @@ APPS = [
120 '//apps/mobility:onos-apps-mobility-oar', 120 '//apps/mobility:onos-apps-mobility-oar',
121 '//apps/optical:onos-apps-optical-oar', 121 '//apps/optical:onos-apps-optical-oar',
122 '//apps/newoptical:onos-apps-newoptical-oar', 122 '//apps/newoptical:onos-apps-newoptical-oar',
123 - '//apps/optical-model:onos-apps-optical-model-oar',
124 '//apps/pathpainter:onos-apps-pathpainter-oar', 123 '//apps/pathpainter:onos-apps-pathpainter-oar',
125 '//apps/pcep-api:onos-apps-pcep-api-oar', 124 '//apps/pcep-api:onos-apps-pcep-api-oar',
126 '//apps/pim:onos-apps-pim-oar', 125 '//apps/pim:onos-apps-pim-oar',
......
...@@ -2,7 +2,6 @@ COMPILE_DEPS = [ ...@@ -2,7 +2,6 @@ COMPILE_DEPS = [
2 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
3 '//lib:org.apache.karaf.shell.console', 3 '//lib:org.apache.karaf.shell.console',
4 '//cli:onos-cli', 4 '//cli:onos-cli',
5 - '//apps/optical-model:onos-apps-optical-model',
6 ] 5 ]
7 6
8 osgi_jar_with_tests ( 7 osgi_jar_with_tests (
......
...@@ -47,12 +47,6 @@ ...@@ -47,12 +47,6 @@
47 47
48 <dependency> 48 <dependency>
49 <groupId>org.onosproject</groupId> 49 <groupId>org.onosproject</groupId>
50 - <artifactId>onos-optical-model</artifactId>
51 - <version>${project.version}</version>
52 - </dependency>
53 -
54 - <dependency>
55 - <groupId>org.onosproject</groupId>
56 <artifactId>onos-core-dist</artifactId> 50 <artifactId>onos-core-dist</artifactId>
57 <version>${project.version}</version> 51 <version>${project.version}</version>
58 </dependency> 52 </dependency>
......
1 -COMPILE_DEPS = [
2 - '//lib:CORE_DEPS',
3 - '//incubator/api:onos-incubator-api',
4 -]
5 -
6 -TEST_DEPS = [
7 - '//lib:TEST',
8 -]
9 -
10 -
11 -osgi_jar_with_tests (
12 - deps = COMPILE_DEPS,
13 - test_deps = TEST_DEPS,
14 -)
15 -
16 -onos_app (
17 - title = 'Optical infromation model',
18 - category = 'Optical',
19 - url = 'http://onosproject.org',
20 - description = 'ONOS optical infromation model.',
21 - required_apps = [ ],
22 -)
1 -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2 -<!--
3 - ~ Copyright 2016-present Open Networking Laboratory
4 - ~
5 - ~ Licensed under the Apache License, Version 2.0 (the "License");
6 - ~ you may not use this file except in compliance with the License.
7 - ~ You may obtain a copy of the License at
8 - ~
9 - ~ http://www.apache.org/licenses/LICENSE-2.0
10 - ~
11 - ~ Unless required by applicable law or agreed to in writing, software
12 - ~ distributed under the License is distributed on an "AS IS" BASIS,
13 - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14 - ~ See the License for the specific language governing permissions and
15 - ~ limitations under the License.
16 - -->
17 -<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.1" name="${project.artifactId}-${project.version}">
18 - <feature name="${project.artifactId}" version="${project.version}"
19 - description="${project.description}">
20 - <feature>onos-api</feature>
21 - <bundle>mvn:${project.groupId}/${project.artifactId}/${project.version}</bundle>
22 - </feature>
23 -</features>
1 -<?xml version="1.0" encoding="UTF-8"?>
2 -<!--
3 - ~ Copyright 2016-present Open Networking Laboratory
4 - ~
5 - ~ Licensed under the Apache License, Version 2.0 (the "License");
6 - ~ you may not use this file except in compliance with the License.
7 - ~ You may obtain a copy of the License at
8 - ~
9 - ~ http://www.apache.org/licenses/LICENSE-2.0
10 - ~
11 - ~ Unless required by applicable law or agreed to in writing, software
12 - ~ distributed under the License is distributed on an "AS IS" BASIS,
13 - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14 - ~ See the License for the specific language governing permissions and
15 - ~ limitations under the License.
16 - -->
17 -<project xmlns="http://maven.apache.org/POM/4.0.0"
18 - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19 - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
20 - <parent>
21 - <artifactId>onos-apps</artifactId>
22 - <groupId>org.onosproject</groupId>
23 - <version>1.6.0-SNAPSHOT</version>
24 - </parent>
25 - <modelVersion>4.0.0</modelVersion>
26 -
27 - <artifactId>onos-optical-model</artifactId>
28 - <packaging>bundle</packaging>
29 -
30 - <description>ONOS Optical Model extensions</description>
31 -
32 - <properties>
33 - <onos.app.name>org.onosproject.apps.optical-model</onos.app.name>
34 - <onos.app.origin>ON.Lab</onos.app.origin>
35 - <onos.app.category>Optical</onos.app.category>
36 - <onos.app.title>Optical information model</onos.app.title>
37 - <onos.app.url>http://onosproject.org</onos.app.url>
38 - <onos.app.requires>
39 - </onos.app.requires>
40 - </properties>
41 -
42 - <dependencies>
43 - <dependency>
44 - <groupId>org.onosproject</groupId>
45 - <artifactId>onos-api</artifactId>
46 - </dependency>
47 -
48 - <dependency>
49 - <groupId>org.onosproject</groupId>
50 - <artifactId>onlab-junit</artifactId>
51 - <scope>test</scope>
52 - </dependency>
53 -
54 - <dependency>
55 - <groupId>com.google.guava</groupId>
56 - <artifactId>guava-testlib</artifactId>
57 - <scope>test</scope>
58 - </dependency>
59 -
60 - </dependencies>
61 -</project>
1 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
2 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
3 - '//apps/optical-model:onos-apps-optical-model',
4 ] 3 ]
5 4
6 osgi_jar_with_tests ( 5 osgi_jar_with_tests (
......
...@@ -42,11 +42,6 @@ ...@@ -42,11 +42,6 @@
42 <dependencies> 42 <dependencies>
43 <dependency> 43 <dependency>
44 <groupId>org.onosproject</groupId> 44 <groupId>org.onosproject</groupId>
45 - <artifactId>onos-optical-model</artifactId>
46 - <version>${project.version}</version>
47 - </dependency>
48 - <dependency>
49 - <groupId>org.onosproject</groupId>
50 <artifactId>onos-cli</artifactId> 45 <artifactId>onos-cli</artifactId>
51 <version>${project.version}</version> 46 <version>${project.version}</version>
52 </dependency> 47 </dependency>
......
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
35 <module>mobility</module> 35 <module>mobility</module>
36 <module>proxyarp</module> 36 <module>proxyarp</module>
37 <module>sdnip</module> 37 <module>sdnip</module>
38 - <module>optical-model</module>
39 <module>optical</module> 38 <module>optical</module>
40 <module>newoptical</module> 39 <module>newoptical</module>
41 <module>metrics</module> 40 <module>metrics</module>
......
...@@ -4,8 +4,6 @@ COMPILE_DEPS = [ ...@@ -4,8 +4,6 @@ COMPILE_DEPS = [
4 '//incubator/api:onos-incubator-api', 4 '//incubator/api:onos-incubator-api',
5 '//utils/rest:onlab-rest', 5 '//utils/rest:onlab-rest',
6 '//core/common:onos-core-common', 6 '//core/common:onos-core-common',
7 - # TODO Remove after decoupling optical
8 - '//apps/optical-model:onos-apps-optical-model',
9 ] 7 ]
10 8
11 osgi_jar ( 9 osgi_jar (
......
...@@ -50,13 +50,6 @@ ...@@ -50,13 +50,6 @@
50 <artifactId>onos-core-common</artifactId> 50 <artifactId>onos-core-common</artifactId>
51 </dependency> 51 </dependency>
52 52
53 - <!-- TODO Remove after decoupling optical -->
54 - <dependency>
55 - <groupId>org.onosproject</groupId>
56 - <artifactId>onos-optical-model</artifactId>
57 - <version>${project.version}</version>
58 - </dependency>
59 -
60 <dependency> 53 <dependency>
61 <groupId>com.fasterxml.jackson.core</groupId> 54 <groupId>com.fasterxml.jackson.core</groupId>
62 <artifactId>jackson-databind</artifactId> 55 <artifactId>jackson-databind</artifactId>
......
1 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
2 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
3 '//incubator/api:onos-incubator-api', 3 '//incubator/api:onos-incubator-api',
4 - # TODO Remove after decoupling optical
5 - '//apps/optical-model:onos-apps-optical-model',
6 ] 4 ]
7 5
8 TEST_DEPS = [ 6 TEST_DEPS = [
...@@ -17,4 +15,4 @@ osgi_jar_with_tests ( ...@@ -17,4 +15,4 @@ osgi_jar_with_tests (
17 deps = COMPILE_DEPS, 15 deps = COMPILE_DEPS,
18 test_deps = TEST_DEPS, 16 test_deps = TEST_DEPS,
19 visibility = ['PUBLIC'], 17 visibility = ['PUBLIC'],
20 -) 18 +)
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -97,16 +97,6 @@ ...@@ -97,16 +97,6 @@
97 <artifactId>onos-incubator-api</artifactId> 97 <artifactId>onos-incubator-api</artifactId>
98 </dependency> 98 </dependency>
99 99
100 - <!-- TODO Remove after decoupling optical -->
101 - <!-- - DeviceManager.InternalDeviceProviderService#ensureGeneric -->
102 - <!-- - OpticalCompilers x4 -->
103 - <!-- - OpticalPortOperator -->
104 - <dependency>
105 - <groupId>org.onosproject</groupId>
106 - <artifactId>onos-optical-model</artifactId>
107 - <version>${project.version}</version>
108 - </dependency>
109 -
110 <dependency> 100 <dependency>
111 <groupId>org.apache.karaf.features</groupId> 101 <groupId>org.apache.karaf.features</groupId>
112 <artifactId>org.apache.karaf.features.core</artifactId> 102 <artifactId>org.apache.karaf.features.core</artifactId>
......
...@@ -546,7 +546,6 @@ public class DeviceManager ...@@ -546,7 +546,6 @@ public class DeviceManager
546 case VIRTUAL: 546 case VIRTUAL:
547 return desc; 547 return desc;
548 default: 548 default:
549 - // TODO: add plugin mechanism in order to decouple this
550 OpticalPortConfig opc = networkConfigService.getConfig( 549 OpticalPortConfig opc = networkConfigService.getConfig(
551 new ConnectPoint(did, desc.portNumber()), OpticalPortConfig.class); 550 new ConnectPoint(did, desc.portNumber()), OpticalPortConfig.class);
552 return OpticalPortOperator.combine(opc, desc); 551 return OpticalPortOperator.combine(opc, desc);
......
...@@ -4,7 +4,6 @@ COMPILE_DEPS = [ ...@@ -4,7 +4,6 @@ COMPILE_DEPS = [
4 '//utils/rest:onlab-rest', 4 '//utils/rest:onlab-rest',
5 '//drivers/utilities:onos-drivers-utilities', 5 '//drivers/utilities:onos-drivers-utilities',
6 '//protocols/rest/api:onos-protocols-rest-api', 6 '//protocols/rest/api:onos-protocols-rest-api',
7 - '//apps/optical-model:onos-apps-optical-model',
8 ] 7 ]
9 8
10 osgi_jar_with_tests ( 9 osgi_jar_with_tests (
......
...@@ -44,12 +44,6 @@ ...@@ -44,12 +44,6 @@
44 <dependencies> 44 <dependencies>
45 <dependency> 45 <dependency>
46 <groupId>org.onosproject</groupId> 46 <groupId>org.onosproject</groupId>
47 - <artifactId>onos-optical-model</artifactId>
48 - <version>${project.version}</version>
49 - </dependency>
50 -
51 - <dependency>
52 - <groupId>org.onosproject</groupId>
53 <artifactId>onos-drivers-utilities</artifactId> 47 <artifactId>onos-drivers-utilities</artifactId>
54 <version>${project.version}</version> 48 <version>${project.version}</version>
55 </dependency> 49 </dependency>
......
...@@ -2,7 +2,6 @@ COMPILE_DEPS = [ ...@@ -2,7 +2,6 @@ COMPILE_DEPS = [
2 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
3 '//drivers/utilities:onos-drivers-utilities', 3 '//drivers/utilities:onos-drivers-utilities',
4 '//protocols/netconf/api:onos-protocols-netconf-api', 4 '//protocols/netconf/api:onos-protocols-netconf-api',
5 - '//apps/optical-model:onos-apps-optical-model',
6 ] 5 ]
7 6
8 osgi_jar_with_tests ( 7 osgi_jar_with_tests (
......
...@@ -44,12 +44,6 @@ ...@@ -44,12 +44,6 @@
44 <dependencies> 44 <dependencies>
45 <dependency> 45 <dependency>
46 <groupId>org.onosproject</groupId> 46 <groupId>org.onosproject</groupId>
47 - <artifactId>onos-optical-model</artifactId>
48 - <version>${project.version}</version>
49 - </dependency>
50 -
51 - <dependency>
52 - <groupId>org.onosproject</groupId>
53 <artifactId>onos-netconf-api</artifactId> 47 <artifactId>onos-netconf-api</artifactId>
54 <version>${project.version}</version> 48 <version>${project.version}</version>
55 </dependency> 49 </dependency>
......
...@@ -4,7 +4,6 @@ COMPILE_DEPS = [ ...@@ -4,7 +4,6 @@ COMPILE_DEPS = [
4 '//drivers/utilities:onos-drivers-utilities', 4 '//drivers/utilities:onos-drivers-utilities',
5 '//protocols/snmp/api:onos-protocols-snmp-api', 5 '//protocols/snmp/api:onos-protocols-snmp-api',
6 '//incubator/api:onos-incubator-api', 6 '//incubator/api:onos-incubator-api',
7 - '//apps/optical-model:onos-apps-optical-model',
8 ] 7 ]
9 8
10 osgi_jar_with_tests ( 9 osgi_jar_with_tests (
......
...@@ -43,12 +43,6 @@ ...@@ -43,12 +43,6 @@
43 43
44 <dependencies> 44 <dependencies>
45 <dependency> 45 <dependency>
46 - <groupId>org.onosproject</groupId>
47 - <artifactId>onos-optical-model</artifactId>
48 - <version>${project.version}</version>
49 - </dependency>
50 -
51 - <dependency>
52 <groupId>org.apache.servicemix.bundles</groupId> 46 <groupId>org.apache.servicemix.bundles</groupId>
53 <artifactId>org.apache.servicemix.bundles.snmp4j</artifactId> 47 <artifactId>org.apache.servicemix.bundles.snmp4j</artifactId>
54 <version>2.3.4_1</version> 48 <version>2.3.4_1</version>
......
...@@ -3,7 +3,6 @@ COMPILE_DEPS = [ ...@@ -3,7 +3,6 @@ COMPILE_DEPS = [
3 '//lib:openflowj', 3 '//lib:openflowj',
4 '//protocols/openflow/api:onos-protocols-openflow-api', 4 '//protocols/openflow/api:onos-protocols-openflow-api',
5 '//drivers/default:onos-drivers-default', 5 '//drivers/default:onos-drivers-default',
6 - '//apps/optical-model:onos-apps-optical-model',
7 ] 6 ]
8 7
9 osgi_jar_with_tests ( 8 osgi_jar_with_tests (
......
...@@ -42,11 +42,6 @@ ...@@ -42,11 +42,6 @@
42 </properties> 42 </properties>
43 43
44 <dependencies> 44 <dependencies>
45 - <dependency>
46 - <groupId>org.onosproject</groupId>
47 - <artifactId>onos-optical-model</artifactId>
48 - <version>${project.version}</version>
49 - </dependency>
50 45
51 <dependency> 46 <dependency>
52 <groupId>org.onosproject</groupId> 47 <groupId>org.onosproject</groupId>
......
...@@ -30,4 +30,4 @@ ...@@ -30,4 +30,4 @@
30 <artifactId>onos-drivers-utilities</artifactId> 30 <artifactId>onos-drivers-utilities</artifactId>
31 <packaging>bundle</packaging> 31 <packaging>bundle</packaging>
32 32
33 -</project> 33 +</project>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -142,8 +142,6 @@ ...@@ -142,8 +142,6 @@
142 description="ONOS admin command console components"> 142 description="ONOS admin command console components">
143 <feature>onos-api</feature> 143 <feature>onos-api</feature>
144 <bundle>mvn:org.onosproject/onos-cli/@ONOS-VERSION</bundle> 144 <bundle>mvn:org.onosproject/onos-cli/@ONOS-VERSION</bundle>
145 - <!-- TODO Remove after decoupling optical -->
146 - <bundle>mvn:org.onosproject/onos-optical-model/@ONOS-VERSION</bundle>
147 </feature> 145 </feature>
148 146
149 <feature name="onos-security" version="@FEATURE-VERSION" 147 <feature name="onos-security" version="@FEATURE-VERSION"
......
...@@ -2,7 +2,6 @@ COMPILE_DEPS = [ ...@@ -2,7 +2,6 @@ COMPILE_DEPS = [
2 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
3 '//lib:openflowj', 3 '//lib:openflowj',
4 '//protocols/openflow/api:onos-protocols-openflow-api', 4 '//protocols/openflow/api:onos-protocols-openflow-api',
5 - '//apps/optical-model:onos-apps-optical-model',
6 ] 5 ]
7 6
8 TEST_DEPS = [ 7 TEST_DEPS = [
......
...@@ -32,12 +32,6 @@ ...@@ -32,12 +32,6 @@
32 <description>ONOS OpenFlow protocol device provider</description> 32 <description>ONOS OpenFlow protocol device provider</description>
33 <dependencies> 33 <dependencies>
34 <dependency> 34 <dependency>
35 - <groupId>org.onosproject</groupId>
36 - <artifactId>onos-optical-model</artifactId>
37 - <version>${project.version}</version>
38 - </dependency>
39 -
40 - <dependency>
41 <groupId>org.osgi</groupId> 35 <groupId>org.osgi</groupId>
42 <artifactId>org.osgi.compendium</artifactId> 36 <artifactId>org.osgi.compendium</artifactId>
43 </dependency> 37 </dependency>
......
...@@ -14,4 +14,4 @@ osgi_jar_with_tests ( ...@@ -14,4 +14,4 @@ osgi_jar_with_tests (
14 deps = COMPILE_DEPS, 14 deps = COMPILE_DEPS,
15 test_deps = TEST_DEPS, 15 test_deps = TEST_DEPS,
16 web_context = '/onos/v1', 16 web_context = '/onos/v1',
17 -) 17 +)
...\ No newline at end of file ...\ No newline at end of file
......