mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-17 18:32:28 +02:00
Code Issues Projects Releases Wiki Activity

Hooking ospf into the overall build.

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

Change-Id: I6367178a5dff56f13e4c67c4503bc59b7deb45cb
This commit is contained in:
Thomas Vachuska 2016-03-02 01:07:43 -08:00
parent 06cf658408
commit a907612b15
7 changed files with 137 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
apps/events/pom.xml
View File

@ -17,6 +17,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<artifactId>onos-apps</artifactId> <artifactId>onos-apps</artifactId>
<groupId>org.onosproject</groupId> <groupId>org.onosproject</groupId>
@ -24,28 +25,19 @@
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-events</artifactId> <artifactId>onos-events</artifactId>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<description>App to display ONOS event history</description> <description>App to display ONOS event history</description>
<url>http://onosproject.org</url>
<properties> <properties>
<onos.version>1.5.0-SNAPSHOT</onos.version>
<onos.app.name>org.onosproject.events</onos.app.name> <onos.app.name>org.onosproject.events</onos.app.name>
<onos.app.category>default</onos.app.category> <onos.app.category>default</onos.app.category>
<onos.app.url>http://onosproject.org</onos.app.url> <onos.app.url>http://onosproject.org</onos.app.url>
<onos.app.readme>ONOS event history display application. <onos.app.readme>ONOS event history display application.</onos.app.readme>
</onos.app.readme>
</properties> </properties>
<dependencies> <dependencies>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-api</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.onosproject</groupId> <groupId>org.onosproject</groupId>
<artifactId>onlab-osgi</artifactId> <artifactId>onlab-osgi</artifactId>
@ -98,63 +90,4 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
<executions>
<execution>
<id>generate-scr-srcdescriptor</id>
<goals>
<goal>scr</goal>
</goals>
</execution>
</executions>
<configuration>
<supportedProjectTypes>
<supportedProjectType>bundle</supportedProjectType>
<supportedProjectType>war</supportedProjectType>
</supportedProjectTypes>
</configuration>
</plugin>
<plugin>
<groupId>org.onosproject</groupId>
<artifactId>onos-maven-plugin</artifactId>
<executions>
<execution>
<id>cfg</id>
<phase>generate-resources</phase>
<goals>
<goal>cfg</goal>
</goals>
</execution>
<execution>
<id>swagger</id>
<phase>generate-sources</phase>
<goals>
<goal>swagger</goal>
</goals>
</execution>
<execution>
<id>app</id>
<phase>package</phase>
<goals>
<goal>app</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project> </project>

18
protocols/ospf/api/pom.xml
View File

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.onosproject</groupId> <groupId>org.onosproject</groupId>
<artifactId>onos-ospf</artifactId> <artifactId>onos-ospf</artifactId>
<version>1.4.0-SNAPSHOT</version> <version>1.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
@ -40,22 +40,6 @@
<groupId>org.onosproject</groupId> <groupId>org.onosproject</groupId>
<artifactId>onos-api</artifactId> <artifactId>onos-api</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<Export-Package>
org.onosproject.ospf.*
</Export-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>

178
protocols/ospf/api/src/main/java/org/onosproject/ospf/controller/OspfController.java
View File

@ -1,90 +1,90 @@
/* /*
* Copyright 2016 Open Networking Laboratory * Copyright 2016 Open Networking Laboratory
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.onosproject.ospf.controller; package org.onosproject.ospf.controller;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
/** /**
* Abstraction of an OSPF controller. * Abstraction of an OSPF controller.
* Serves as a one stop shop for obtaining OSPF devices and (un)register listeners on OSPF events. * Serves as a one stop shop for obtaining OSPF devices and (un)register listeners on OSPF events.
*/ */
public interface OspfController { public interface OspfController {
/** /**
* Registers a listener for router meta events. * Registers a listener for router meta events.
* *
* @param listener the listener to notify * @param listener the listener to notify
*/ */
void addRouterListener(OspfRouterListener listener); void addRouterListener(OspfRouterListener listener);
/** /**
* Unregisters a router listener. * Unregisters a router listener.
* *
* @param listener the listener to unregister * @param listener the listener to unregister
*/ */
void removeRouterListener(OspfRouterListener listener); void removeRouterListener(OspfRouterListener listener);
/** /**
* Registers a listener for OSPF message events. * Registers a listener for OSPF message events.
* *
* @param listener the listener to notify * @param listener the listener to notify
*/ */
void addLinkListener(OspfLinkListener listener); void addLinkListener(OspfLinkListener listener);
/** /**
* Unregisters a link listener. * Unregisters a link listener.
* *
* @param listener the listener to unregister * @param listener the listener to unregister
*/ */
void removeLinkListener(OspfLinkListener listener); void removeLinkListener(OspfLinkListener listener);
/** /**
* Updates configuration of processes. * Updates configuration of processes.
* *
* @param processes process info to update * @param processes process info to update
*/ */
public void updateConfig(List<OspfProcess> processes); public void updateConfig(List<OspfProcess> processes);
/** /**
* Deletes configuration parameters. * Deletes configuration parameters.
* *
* @param processes list of process instance * @param processes list of process instance
* @param attribute attribute to delete * @param attribute attribute to delete
*/ */
public void deleteConfig(List<OspfProcess> processes, String attribute); public void deleteConfig(List<OspfProcess> processes, String attribute);
/** /**
* Gets the list of listeners registered for router events. * Gets the list of listeners registered for router events.
* *
* @return list of listeners * @return list of listeners
*/ */
Set<OspfRouterListener> listener(); Set<OspfRouterListener> listener();
/** /**
* Gets the list of listeners registered for link events. * Gets the list of listeners registered for link events.
* *
* @return list of listeners * @return list of listeners
*/ */
public Set<OspfLinkListener> linkListener(); public Set<OspfLinkListener> linkListener();
/** /**
* Gets the configured process. * Gets the configured process.
* *
* @return list of process instances * @return list of process instances
*/ */
public List<OspfProcess> getAllConfiguredProcesses(); public List<OspfProcess> getAllConfiguredProcesses();
} }

4
protocols/ospf/ctl/pom.xml
View File

@ -21,14 +21,14 @@
<parent> <parent>
<groupId>org.onosproject</groupId> <groupId>org.onosproject</groupId>
<artifactId>onos-ospf</artifactId> <artifactId>onos-ospf</artifactId>
<version>1.4.0-SNAPSHOT</version> <version>1.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>onos-ospf-ctl</artifactId> <artifactId>onos-ospf-ctl</artifactId>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<description>ONOS Ospf controller subsystem API</description> <description>ONOS OSPF controller subsystem API</description>
<dependencies> <dependencies>
<dependency> <dependency>

40
protocols/ospf/pom.xml Executable file
View File

@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2016 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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-protocols</artifactId>
<version>1.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>onos-ospf</artifactId>
<packaging>pom</packaging>
<description>ONOS OSPF Protocol subsystem</description>
<modules>
<module>api</module>
<!--module>ctl</module-->
<!--module>protocol</module-->
</modules>
</project>

9
protocols/ospf/protocol/pom.xml
View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.onosproject</groupId> <groupId>org.onosproject</groupId>
<artifactId>onos-ospf</artifactId> <artifactId>onos-ospf</artifactId>
<version>1.4.0-SNAPSHOT</version> <version>1.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
@ -30,15 +30,10 @@
<description>ONOS Ospf controller protocol</description> <description>ONOS Ospf controller protocol</description>
<dependencies> <dependencies>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-ospf-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.onosproject</groupId> <groupId>org.onosproject</groupId>
<artifactId>onos-ospf-api</artifactId> <artifactId>onos-ospf-api</artifactId>
<version>1.4.0-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

1
protocols/pom.xml
View File

@ -38,6 +38,7 @@
<module>ovsdb</module> <module>ovsdb</module>
<module>bgp</module> <module>bgp</module>
<module>rest</module> <module>rest</module>
<module>ospf</module>
</modules> </modules>
<dependencies> <dependencies>