홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
a907612b 1 parent 06cf6584

Hooking ospf into the overall build. 

More fixes are required to allow ospf/protocol and ospf/ctl to build.

Change-Id: I6367178a5dff56f13e4c67c4503bc59b7deb45cb
Inline Side-by-side
Showing 7 changed files with 137 additions and 184 deletions
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
17 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 17 <project xmlns="http://maven.apache.org/POM/4.0.0" 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"> 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> 19 <modelVersion>4.0.0</modelVersion>
20 +
20 <parent> 21 <parent>
21 <artifactId>onos-apps</artifactId> 22 <artifactId>onos-apps</artifactId>
22 <groupId>org.onosproject</groupId> 23 <groupId>org.onosproject</groupId>
...@@ -24,30 +25,21 @@ ...@@ -24,30 +25,21 @@
24 <relativePath>../pom.xml</relativePath> 25 <relativePath>../pom.xml</relativePath>
25 </parent> 26 </parent>
26 27
27 - <groupId>org.onosproject</groupId>
28 <artifactId>onos-events</artifactId> 28 <artifactId>onos-events</artifactId>
29 <packaging>bundle</packaging> 29 <packaging>bundle</packaging>
30 30
31 <description>App to display ONOS event history</description> 31 <description>App to display ONOS event history</description>
32 - <url>http://onosproject.org</url>
33 32
34 <properties> 33 <properties>
35 - <onos.version>1.5.0-SNAPSHOT</onos.version>
36 <onos.app.name>org.onosproject.events</onos.app.name> 34 <onos.app.name>org.onosproject.events</onos.app.name>
37 <onos.app.category>default</onos.app.category> 35 <onos.app.category>default</onos.app.category>
38 <onos.app.url>http://onosproject.org</onos.app.url> 36 <onos.app.url>http://onosproject.org</onos.app.url>
39 - <onos.app.readme>ONOS event history display application. 37 + <onos.app.readme>ONOS event history display application.</onos.app.readme>
40 - </onos.app.readme>
41 </properties> 38 </properties>
42 39
43 <dependencies> 40 <dependencies>
44 <dependency> 41 <dependency>
45 <groupId>org.onosproject</groupId> 42 <groupId>org.onosproject</groupId>
46 - <artifactId>onos-api</artifactId>
47 - </dependency>
48 -
49 - <dependency>
50 - <groupId>org.onosproject</groupId>
51 <artifactId>onlab-osgi</artifactId> 43 <artifactId>onlab-osgi</artifactId>
52 </dependency> 44 </dependency>
53 45
...@@ -98,63 +90,4 @@ ...@@ -98,63 +90,4 @@
98 </dependency> 90 </dependency>
99 </dependencies> 91 </dependencies>
100 92
101 - <build>
102 - <plugins>
103 - <plugin>
104 - <groupId>org.apache.felix</groupId>
105 - <artifactId>maven-bundle-plugin</artifactId>
106 - <extensions>true</extensions>
107 - </plugin>
108 - <plugin>
109 - <groupId>org.apache.maven.plugins</groupId>
110 - <artifactId>maven-compiler-plugin</artifactId>
111 - </plugin>
112 - <plugin>
113 - <groupId>org.apache.felix</groupId>
114 - <artifactId>maven-scr-plugin</artifactId>
115 - <executions>
116 - <execution>
117 - <id>generate-scr-srcdescriptor</id>
118 - <goals>
119 - <goal>scr</goal>
120 - </goals>
121 - </execution>
122 - </executions>
123 - <configuration>
124 - <supportedProjectTypes>
125 - <supportedProjectType>bundle</supportedProjectType>
126 - <supportedProjectType>war</supportedProjectType>
127 - </supportedProjectTypes>
128 - </configuration>
129 - </plugin>
130 - <plugin>
131 - <groupId>org.onosproject</groupId>
132 - <artifactId>onos-maven-plugin</artifactId>
133 - <executions>
134 - <execution>
135 - <id>cfg</id>
136 - <phase>generate-resources</phase>
137 - <goals>
138 - <goal>cfg</goal>
139 - </goals>
140 - </execution>
141 - <execution>
142 - <id>swagger</id>
143 - <phase>generate-sources</phase>
144 - <goals>
145 - <goal>swagger</goal>
146 - </goals>
147 - </execution>
148 - <execution>
149 - <id>app</id>
150 - <phase>package</phase>
151 - <goals>
152 - <goal>app</goal>
153 - </goals>
154 - </execution>
155 - </executions>
156 - </plugin>
157 - </plugins>
158 - </build>
159 -
160 </project> 93 </project>
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
22 <parent> 22 <parent>
23 <groupId>org.onosproject</groupId> 23 <groupId>org.onosproject</groupId>
24 <artifactId>onos-ospf</artifactId> 24 <artifactId>onos-ospf</artifactId>
25 - <version>1.4.0-SNAPSHOT</version> 25 + <version>1.5.0-SNAPSHOT</version>
26 <relativePath>../pom.xml</relativePath> 26 <relativePath>../pom.xml</relativePath>
27 </parent> 27 </parent>
28 28
...@@ -40,22 +40,6 @@ ...@@ -40,22 +40,6 @@
40 <groupId>org.onosproject</groupId> 40 <groupId>org.onosproject</groupId>
41 <artifactId>onos-api</artifactId> 41 <artifactId>onos-api</artifactId>
42 </dependency> 42 </dependency>
43 -
44 </dependencies> 43 </dependencies>
45 - <build>
46 - <plugins>
47 - <plugin>
48 - <groupId>org.apache.felix</groupId>
49 - <artifactId>maven-bundle-plugin</artifactId>
50 - <configuration>
51 - <instructions>
52 - <Export-Package>
53 - org.onosproject.ospf.*
54 - </Export-Package>
55 - </instructions>
56 - </configuration>
57 - </plugin>
58 - </plugins>
59 - </build>
60 44
61 </project> 45 </project>
......
1 -/* 1 +/*
2 - * Copyright 2016 Open Networking Laboratory 2 + * Copyright 2016 Open Networking Laboratory
3 - * 3 + *
4 - * Licensed under the Apache License, Version 2.0 (the "License"); 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 - * you may not use this file except in compliance with 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 6 + * You may obtain a copy of the License at
7 - * 7 + *
8 - * http://www.apache.org/licenses/LICENSE-2.0 8 + * http://www.apache.org/licenses/LICENSE-2.0
9 - * 9 + *
10 - * Unless required by applicable law or agreed to in writing, software 10 + * Unless required by applicable law or agreed to in writing, software
11 - * distributed under the License is distributed on an "AS IS" BASIS, 11 + * distributed under the License is distributed on an "AS IS" BASIS,
12 - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
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.ospf.controller; 16 +package org.onosproject.ospf.controller;
17 - 17 +
18 -import java.util.List; 18 +import java.util.List;
19 -import java.util.Set; 19 +import java.util.Set;
20 - 20 +
21 -/** 21 +/**
22 - * Abstraction of an OSPF controller. 22 + * Abstraction of an OSPF controller.
23 - * Serves as a one stop shop for obtaining OSPF devices and (un)register listeners on OSPF events. 23 + * Serves as a one stop shop for obtaining OSPF devices and (un)register listeners on OSPF events.
24 - */ 24 + */
25 -public interface OspfController { 25 +public interface OspfController {
26 - 26 +
27 - /** 27 + /**
28 - * Registers a listener for router meta events. 28 + * Registers a listener for router meta events.
29 - * 29 + *
30 - * @param listener the listener to notify 30 + * @param listener the listener to notify
31 - */ 31 + */
32 - void addRouterListener(OspfRouterListener listener); 32 + void addRouterListener(OspfRouterListener listener);
33 - 33 +
34 - /** 34 + /**
35 - * Unregisters a router listener. 35 + * Unregisters a router listener.
36 - * 36 + *
37 - * @param listener the listener to unregister 37 + * @param listener the listener to unregister
38 - */ 38 + */
39 - void removeRouterListener(OspfRouterListener listener); 39 + void removeRouterListener(OspfRouterListener listener);
40 - 40 +
41 - /** 41 + /**
42 - * Registers a listener for OSPF message events. 42 + * Registers a listener for OSPF message events.
43 - * 43 + *
44 - * @param listener the listener to notify 44 + * @param listener the listener to notify
45 - */ 45 + */
46 - void addLinkListener(OspfLinkListener listener); 46 + void addLinkListener(OspfLinkListener listener);
47 - 47 +
48 - /** 48 + /**
49 - * Unregisters a link listener. 49 + * Unregisters a link listener.
50 - * 50 + *
51 - * @param listener the listener to unregister 51 + * @param listener the listener to unregister
52 - */ 52 + */
53 - void removeLinkListener(OspfLinkListener listener); 53 + void removeLinkListener(OspfLinkListener listener);
54 - 54 +
55 - /** 55 + /**
56 - * Updates configuration of processes. 56 + * Updates configuration of processes.
57 - * 57 + *
58 - * @param processes process info to update 58 + * @param processes process info to update
59 - */ 59 + */
60 - public void updateConfig(List<OspfProcess> processes); 60 + public void updateConfig(List<OspfProcess> processes);
61 - 61 +
62 - /** 62 + /**
63 - * Deletes configuration parameters. 63 + * Deletes configuration parameters.
64 - * 64 + *
65 - * @param processes list of process instance 65 + * @param processes list of process instance
66 - * @param attribute attribute to delete 66 + * @param attribute attribute to delete
67 - */ 67 + */
68 - public void deleteConfig(List<OspfProcess> processes, String attribute); 68 + public void deleteConfig(List<OspfProcess> processes, String attribute);
69 - 69 +
70 - /** 70 + /**
71 - * Gets the list of listeners registered for router events. 71 + * Gets the list of listeners registered for router events.
72 - * 72 + *
73 - * @return list of listeners 73 + * @return list of listeners
74 - */ 74 + */
75 - Set<OspfRouterListener> listener(); 75 + Set<OspfRouterListener> listener();
76 - 76 +
77 - /** 77 + /**
78 - * Gets the list of listeners registered for link events. 78 + * Gets the list of listeners registered for link events.
79 - * 79 + *
80 - * @return list of listeners 80 + * @return list of listeners
81 - */ 81 + */
82 - public Set<OspfLinkListener> linkListener(); 82 + public Set<OspfLinkListener> linkListener();
83 - 83 +
84 - /** 84 + /**
85 - * Gets the configured process. 85 + * Gets the configured process.
86 - * 86 + *
87 - * @return list of process instances 87 + * @return list of process instances
88 - */ 88 + */
89 - public List<OspfProcess> getAllConfiguredProcesses(); 89 + public List<OspfProcess> getAllConfiguredProcesses();
90 } 90 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -21,14 +21,14 @@ ...@@ -21,14 +21,14 @@
21 <parent> 21 <parent>
22 <groupId>org.onosproject</groupId> 22 <groupId>org.onosproject</groupId>
23 <artifactId>onos-ospf</artifactId> 23 <artifactId>onos-ospf</artifactId>
24 - <version>1.4.0-SNAPSHOT</version> 24 + <version>1.5.0-SNAPSHOT</version>
25 <relativePath>../pom.xml</relativePath> 25 <relativePath>../pom.xml</relativePath>
26 </parent> 26 </parent>
27 27
28 <artifactId>onos-ospf-ctl</artifactId> 28 <artifactId>onos-ospf-ctl</artifactId>
29 <packaging>bundle</packaging> 29 <packaging>bundle</packaging>
30 30
31 - <description>ONOS Ospf controller subsystem API</description> 31 + <description>ONOS OSPF controller subsystem API</description>
32 32
33 <dependencies> 33 <dependencies>
34 <dependency> 34 <dependency>
......
1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<!--
3 + ~ Copyright 2016 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/maven-v4_0_0.xsd">
20 + <modelVersion>4.0.0</modelVersion>
21 +
22 + <parent>
23 + <groupId>org.onosproject</groupId>
24 + <artifactId>onos-protocols</artifactId>
25 + <version>1.5.0-SNAPSHOT</version>
26 + <relativePath>../pom.xml</relativePath>
27 + </parent>
28 +
29 + <artifactId>onos-ospf</artifactId>
30 + <packaging>pom</packaging>
31 +
32 + <description>ONOS OSPF Protocol subsystem</description>
33 +
34 + <modules>
35 + <module>api</module>
36 + <!--module>ctl</module-->
37 + <!--module>protocol</module-->
38 + </modules>
39 +
40 +</project>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
21 <parent> 21 <parent>
22 <groupId>org.onosproject</groupId> 22 <groupId>org.onosproject</groupId>
23 <artifactId>onos-ospf</artifactId> 23 <artifactId>onos-ospf</artifactId>
24 - <version>1.4.0-SNAPSHOT</version> 24 + <version>1.5.0-SNAPSHOT</version>
25 <relativePath>../pom.xml</relativePath> 25 <relativePath>../pom.xml</relativePath>
26 </parent> 26 </parent>
27 27
...@@ -30,15 +30,10 @@ ...@@ -30,15 +30,10 @@
30 30
31 <description>ONOS Ospf controller protocol</description> 31 <description>ONOS Ospf controller protocol</description>
32 <dependencies> 32 <dependencies>
33 - <dependency>
34 - <groupId>org.onosproject</groupId>
35 - <artifactId>onos-ospf-api</artifactId>
36 - <version>${project.version}</version>
37 - </dependency>
38 <dependency> 33 <dependency>
39 <groupId>org.onosproject</groupId> 34 <groupId>org.onosproject</groupId>
40 <artifactId>onos-ospf-api</artifactId> 35 <artifactId>onos-ospf-api</artifactId>
41 - <version>1.4.0-SNAPSHOT</version> 36 + <version>${project.version}</version>
42 </dependency> 37 </dependency>
43 </dependencies> 38 </dependencies>
44 39
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
38 <module>ovsdb</module> 38 <module>ovsdb</module>
39 <module>bgp</module> 39 <module>bgp</module>
40 <module>rest</module> 40 <module>rest</module>
41 + <module>ospf</module>
41 </modules> 42 </modules>
42 43
43 <dependencies> 44 <dependencies>
......