홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Priyanka B
Committed by Gerrit Code Review
259847d2 1 parent 9a624597

[ONOS-4171] Merge PCEP and BGP providers into common BGPCEP provider. 

Change-Id: I13c367313c372d4b3f76b942b6c147244bf683ce
Inline Side-by-side
Showing 10 changed files with 186 additions and 3 deletions
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.pcep.controller.impl; 16 +package org.onosproject.pcep.controller;
17 17
18 import org.onosproject.incubator.net.tunnel.Tunnel.State; 18 import org.onosproject.incubator.net.tunnel.Tunnel.State;
19 19
......
...@@ -45,6 +45,7 @@ import org.onosproject.pcep.controller.PcepClient; ...@@ -45,6 +45,7 @@ import org.onosproject.pcep.controller.PcepClient;
45 import org.onosproject.pcep.controller.PcepClientController; 45 import org.onosproject.pcep.controller.PcepClientController;
46 import org.onosproject.pcep.controller.PcepClientListener; 46 import org.onosproject.pcep.controller.PcepClientListener;
47 import org.onosproject.pcep.controller.PcepEventListener; 47 import org.onosproject.pcep.controller.PcepEventListener;
48 +import org.onosproject.pcep.controller.PcepLspStatus;
48 import org.onosproject.pcep.controller.PcepNodeListener; 49 import org.onosproject.pcep.controller.PcepNodeListener;
49 import org.onosproject.pcep.controller.PcepPacketListener; 50 import org.onosproject.pcep.controller.PcepPacketListener;
50 import org.onosproject.pcep.controller.PcepSyncStatus; 51 import org.onosproject.pcep.controller.PcepSyncStatus;
......
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 +<app name="org.onosproject.bgpcep" origin="ON.Lab" version="${project.version}"
18 + category="Provider" url="http://onosproject.org" title="BGP PCEP Provider"
19 + featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
20 + features="${project.artifactId}">
21 + <description>${project.description}</description>
22 + <artifact>mvn:${project.groupId}/onos-bgpio/${project.version}</artifact>
23 + <artifact>mvn:${project.groupId}/onos-bgp-api/${project.version}</artifact>
24 + <artifact>mvn:${project.groupId}/onos-bgp-ctl/${project.version}</artifact>
25 + <artifact>mvn:${project.groupId}/onos-pcepio/${project.version}</artifact>
26 + <artifact>mvn:${project.groupId}/onos-app-pcep-api/${project.version}</artifact>
27 + <artifact>mvn:${project.groupId}/onos-pcep-controller-api/${project.version}</artifact>
28 + <artifact>mvn:${project.groupId}/onos-bgp-provider-topology/${project.version}</artifact>
29 + <artifact>mvn:${project.groupId}/onos-bgp-provider-cfg/${project.version}</artifact>
30 + <artifact>mvn:${project.groupId}/onos-pcep-controller-impl/${project.version}</artifact>
31 + <artifact>mvn:${project.groupId}/onos-pcep-provider-topology/${project.version}</artifact>
32 + <artifact>mvn:${project.groupId}/onos-pcep-provider-tunnel/${project.version}</artifact>
33 + <artifact>mvn:${project.groupId}/onos-pcep-provider-packet/${project.version}</artifact>
34 + <artifact>mvn:${project.groupId}/onos-app-pce/${project.version}</artifact>b
35 + <artifact>mvn:${project.groupId}/onos-app-pceweb/${project.version}</artifact>
36 +</app>
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.0" 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}/onos-bgpio/${project.version}</bundle>
22 + <bundle>mvn:${project.groupId}/onos-bgp-api/${project.version}</bundle>
23 + <bundle>mvn:${project.groupId}/onos-bgp-ctl/${project.version}</bundle>
24 + <bundle>mvn:${project.groupId}/onos-pcep-controller-api/${project.version}</bundle>
25 + <bundle>mvn:${project.groupId}/onos-bgp-provider-topology/${project.version}</bundle>
26 + <bundle>mvn:${project.groupId}/onos-bgp-provider-cfg/${project.version}</bundle>
27 + <bundle>mvn:${project.groupId}/onos-pcepio/${project.version}</bundle>
28 + <bundle>mvn:${project.groupId}/onos-app-pcep-api/${project.version}</bundle>
29 + <bundle>mvn:${project.groupId}/onos-pcep-controller-impl/${project.version}</bundle>
30 + <bundle>mvn:${project.groupId}/onos-pcep-provider-topology/${project.version}</bundle>
31 + <bundle>mvn:${project.groupId}/onos-pcep-provider-tunnel/${project.version}</bundle>
32 + <bundle>mvn:${project.groupId}/onos-app-pce/${project.version}</bundle>
33 + <bundle>mvn:${project.groupId}/onos-app-pceweb/${project.version}</bundle>
34 + <bundle>mvn:${project.groupId}/onos-pcep-provider-packet/${project.version}</bundle>
35 + </feature>
36 +</features>
1 +<!--
2 + ~ Copyright 2016-present Open Networking Laboratory
3 + ~
4 + ~ Licensed under the Apache License, Version 2.0 (the "License");
5 + ~ you may not use this file except in compliance with the License.
6 + ~ You may obtain a copy of the License at
7 + ~
8 + ~ http://www.apache.org/licenses/LICENSE-2.0
9 + ~
10 + ~ Unless required by applicable law or agreed to in writing, software
11 + ~ distributed under the License is distributed on an "AS IS" BASIS,
12 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + ~ See the License for the specific language governing permissions and
14 + ~ limitations under the License.
15 + -->
16 +<project xmlns="http://maven.apache.org/POM/4.0.0"
17 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
18 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
19 + <modelVersion>4.0.0</modelVersion>
20 + <parent>
21 + <groupId>org.onosproject</groupId>
22 + <artifactId>onos-bgpcep-providers</artifactId>
23 + <version>1.7.0-SNAPSHOT</version>
24 + <relativePath>../pom.xml</relativePath>
25 + </parent>
26 +
27 + <artifactId>onos-bgpcep-app</artifactId>
28 + <packaging>pom</packaging>
29 + <description>BGP PCEP protocol southbound providers</description>
30 +
31 + <dependencies>
32 + <dependency>
33 + <groupId>org.onosproject</groupId>
34 + <artifactId>onos-bgpio</artifactId>
35 + <version>${project.version}</version>
36 + </dependency>
37 + <dependency>
38 + <groupId>org.onosproject</groupId>
39 + <artifactId>onos-bgp-api</artifactId>
40 + <version>${project.version}</version>
41 + </dependency>
42 + <dependency>
43 + <groupId>org.onosproject</groupId>
44 + <artifactId>onos-bgp-ctl</artifactId>
45 + <version>${project.version}</version>
46 + </dependency>
47 + <dependency>
48 + <groupId>org.onosproject</groupId>
49 + <artifactId>onos-pcep-controller-api</artifactId>
50 + <version>${project.version}</version>
51 + </dependency>
52 + <dependency>
53 + <groupId>org.onosproject</groupId>
54 + <artifactId>onos-bgp-provider-cfg</artifactId>
55 + <version>${project.version}</version>
56 + </dependency>
57 + <dependency>
58 + <groupId>org.onosproject</groupId>
59 + <artifactId>onos-pcepio</artifactId>
60 + <version>${project.version}</version>
61 + </dependency>
62 + <dependency>
63 + <groupId>org.onosproject</groupId>
64 + <artifactId>onos-app-pcep-api</artifactId>
65 + <version>${project.version}</version>
66 + </dependency>
67 + <dependency>
68 + <groupId>org.onosproject</groupId>
69 + <artifactId>onos-pcep-controller-impl</artifactId>
70 + <version>${project.version}</version>
71 + </dependency>
72 + <dependency>
73 + <groupId>org.onosproject</groupId>
74 + <artifactId>onos-pcep-provider-topology</artifactId>
75 + <version>${project.version}</version>
76 + </dependency>
77 + <dependency>
78 + <groupId>org.onosproject</groupId>
79 + <artifactId>onos-pcep-provider-tunnel</artifactId>
80 + <version>${project.version}</version>
81 + </dependency>
82 + <dependency>
83 + <groupId>org.onosproject</groupId>
84 + <artifactId>onos-app-pce</artifactId>
85 + <version>${project.version}</version>
86 + </dependency>
87 + <dependency>
88 + <groupId>org.onosproject</groupId>
89 + <artifactId>onos-app-pceweb</artifactId>
90 + <version>${project.version}</version>
91 + </dependency>
92 + <dependency>
93 + <groupId>org.onosproject</groupId>
94 + <artifactId>onos-bgp-provider-topology</artifactId>
95 + <version>${project.version}</version>
96 + </dependency>
97 + <dependency>
98 + <groupId>org.onosproject</groupId>
99 + <artifactId>onos-pcep-provider-packet</artifactId>
100 + <version>${project.version}</version>
101 + </dependency>
102 + </dependencies>
103 +</project>
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
29 29
30 <modules> 30 <modules>
31 <module>flow</module> 31 <module>flow</module>
32 + <module>app</module>
32 </modules> 33 </modules>
33 34
34 <dependencies> 35 <dependencies>
......
...@@ -25,4 +25,5 @@ ...@@ -25,4 +25,5 @@
25 <artifact>mvn:${project.groupId}/onos-pcep-controller-impl/${project.version}</artifact> 25 <artifact>mvn:${project.groupId}/onos-pcep-controller-impl/${project.version}</artifact>
26 <artifact>mvn:${project.groupId}/onos-pcep-provider-topology/${project.version}</artifact> 26 <artifact>mvn:${project.groupId}/onos-pcep-provider-topology/${project.version}</artifact>
27 <artifact>mvn:${project.groupId}/onos-pcep-provider-tunnel/${project.version}</artifact> 27 <artifact>mvn:${project.groupId}/onos-pcep-provider-tunnel/${project.version}</artifact>
28 + <artifact>mvn:${project.groupId}/onos-pcep-provider-packet/${project.version}</artifact>
28 </app> 29 </app>
......
...@@ -24,5 +24,6 @@ ...@@ -24,5 +24,6 @@
24 <bundle>mvn:${project.groupId}/onos-pcep-controller-impl/${project.version}</bundle> 24 <bundle>mvn:${project.groupId}/onos-pcep-controller-impl/${project.version}</bundle>
25 <bundle>mvn:${project.groupId}/onos-pcep-provider-topology/${project.version}</bundle> 25 <bundle>mvn:${project.groupId}/onos-pcep-provider-topology/${project.version}</bundle>
26 <bundle>mvn:${project.groupId}/onos-pcep-provider-tunnel/${project.version}</bundle> 26 <bundle>mvn:${project.groupId}/onos-pcep-provider-tunnel/${project.version}</bundle>
27 + <bundle>mvn:${project.groupId}/onos-pcep-provider-packet/${project.version}</bundle>
27 </feature> 28 </feature>
28 </features> 29 </features>
......
...@@ -59,6 +59,10 @@ ...@@ -59,6 +59,10 @@
59 <artifactId>onos-pcep-provider-tunnel</artifactId> 59 <artifactId>onos-pcep-provider-tunnel</artifactId>
60 <version>${project.version}</version> 60 <version>${project.version}</version>
61 </dependency> 61 </dependency>
62 - 62 + <dependency>
63 + <groupId>org.onosproject</groupId>
64 + <artifactId>onos-pcep-provider-packet</artifactId>
65 + <version>${project.version}</version>
66 + </dependency>
63 </dependencies> 67 </dependencies>
64 </project> 68 </project>
......
...@@ -79,8 +79,8 @@ import org.onosproject.pcep.controller.PcepClient; ...@@ -79,8 +79,8 @@ import org.onosproject.pcep.controller.PcepClient;
79 import org.onosproject.pcep.controller.PcepClientController; 79 import org.onosproject.pcep.controller.PcepClientController;
80 import org.onosproject.pcep.controller.PcepClientListener; 80 import org.onosproject.pcep.controller.PcepClientListener;
81 import org.onosproject.pcep.controller.PcepEventListener; 81 import org.onosproject.pcep.controller.PcepEventListener;
82 +import org.onosproject.pcep.controller.PcepLspStatus;
82 import org.onosproject.pcep.controller.PcepLspSyncAction; 83 import org.onosproject.pcep.controller.PcepLspSyncAction;
83 -import org.onosproject.pcep.controller.impl.PcepLspStatus;
84 import org.onosproject.pcepio.exceptions.PcepParseException; 84 import org.onosproject.pcepio.exceptions.PcepParseException;
85 import org.onosproject.pcepio.protocol.PcInitiatedLspRequest; 85 import org.onosproject.pcepio.protocol.PcInitiatedLspRequest;
86 import org.onosproject.pcepio.protocol.PcepAttribute; 86 import org.onosproject.pcepio.protocol.PcepAttribute;
......