mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-15 09:21:06 +02:00
Code Issues Projects Releases Wiki Activity

Make vRouter components into separate apps.

Browse Source 
This allows us to leverage the ONOS app subsystem for selecting which
components to load.

CORD-710

Change-Id: Ibd7c4c1afd2caa137b44c085e7b6b5b4a1082521
This commit is contained in:
Jonathan Hart 2017-01-27 15:11:18 -08:00 committed by Ray Milkey
parent a4ef01d075
commit f4bd048b05
86 changed files with 521 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/bgprouter/BUCK
View File

@ -6,7 +6,7 @@ COMPILE_DEPS = [
BUNDLES = [
'//apps/routing-api:onos-apps-routing-api',
'//apps/routing:onos-apps-routing',
'//apps/routing/common:onos-apps-routing-common',
'//apps/bgprouter:onos-apps-bgprouter',
]
@ -20,4 +20,5 @@ onos_app (
url = 'http://onosproject.org',
description = 'BGP router application.',
included_bundles = BUNDLES,
required_apps = [ 'org.onosproject.fibinstaller' ],
)

2
apps/bgprouter/app.xml
View File

@ -17,7 +17,7 @@
<app name="org.onosproject.bgprouter" origin="ON.Lab" version="${project.version}"
category="Traffic Steering" url="http://onosproject.org" title="BGP Router App"
featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
features="${project.artifactId}">
features="${project.artifactId}" apps="fibinstaller">
<description>${project.description}</description>
<artifact>mvn:${project.groupId}/${project.artifactId}/${project.version}</artifact>
<artifact>mvn:${project.groupId}/onos-app-routing-api/${project.version}</artifact>

2
apps/bgprouter/src/main/java/org/onosproject/bgprouter/BgpRouter.java
View File

@ -94,9 +94,7 @@ public class BgpRouter {
private static List<String> components = new ArrayList<>();
static {
components.add("org.onosproject.routing.bgp.BgpSessionManager");
components.add("org.onosproject.routing.impl.Router");
components.add("org.onosproject.routing.impl.BgpSpeakerNeighbourHandler");
components.add("org.onosproject.routing.impl.SingleSwitchFibInstaller");
}
@Activate

2
apps/castor/BUCK
View File

@ -13,7 +13,7 @@ COMPILE_DEPS = [
BUNDLES = [
'//apps/castor:onos-apps-castor',
'//apps/routing-api:onos-apps-routing-api',
'//apps/routing:onos-apps-routing',
'//apps/routing/common:onos-apps-routing-common',
]
TEST_DEPS = [

1
apps/routing-api/BUCK
View File

@ -1,5 +1,6 @@
COMPILE_DEPS = [
'//lib:CORE_DEPS',
'//incubator/api:onos-incubator-api',
]
TEST_DEPS = [

2
apps/routing/src/main/java/org/onosproject/routing/impl/AsyncDeviceFetcher.java → apps/routing-api/src/main/java/org/onosproject/routing/AsyncDeviceFetcher.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.onosproject.routing.impl;
package org.onosproject.routing;
import org.onosproject.net.DeviceId;
import org.onosproject.net.device.DeviceEvent;

4
apps/routing/src/main/java/org/onosproject/routing/impl/NextHop.java → apps/routing-api/src/main/java/org/onosproject/routing/NextHop.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.
@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.onosproject.routing.impl;
package org.onosproject.routing;
import java.util.Objects;

4
apps/routing/src/main/java/org/onosproject/routing/impl/NextHopGroupKey.java → apps/routing-api/src/main/java/org/onosproject/routing/NextHopGroupKey.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.
@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.onosproject.routing.impl;
package org.onosproject.routing;
import com.google.common.base.MoreObjects;
import org.onlab.packet.IpAddress;

2
apps/routing/src/main/java/org/onosproject/routing/impl/RouterInterfaceManager.java → apps/routing-api/src/main/java/org/onosproject/routing/RouterInterfaceManager.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.onosproject.routing.impl;
package org.onosproject.routing;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;

20
apps/routing/common/BUCK Normal file
View File

@ -0,0 +1,20 @@
COMPILE_DEPS = [
'//lib:CORE_DEPS',
'//lib:org.apache.karaf.shell.console',
'//lib:concurrent-trees',
'//cli:onos-cli',
'//incubator/api:onos-incubator-api',
'//apps/routing-api:onos-apps-routing-api',
'//core/common:onos-core-common',
]
TEST_DEPS = [
'//lib:TEST_ADAPTERS',
'//incubator/api:onos-incubator-api-tests',
'//apps/routing-api:onos-apps-routing-api-tests',
]
osgi_jar_with_tests (
deps = COMPILE_DEPS,
test_deps = TEST_DEPS,
)

91
apps/routing/common/pom.xml Normal file
View File

@ -0,0 +1,91 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2017-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-app-routing-parent</artifactId>
<groupId>org.onosproject</groupId>
<version>1.9.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>onos-app-routing</artifactId>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-app-routing-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-app-routing-api</artifactId>
<scope>test</scope>
<classifier>tests</classifier>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-incubator-api</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-cli</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onlab-misc</artifactId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
<groupId>com.googlecode.concurrent-trees</groupId>
<artifactId>concurrent-trees</artifactId>
<scope>compile</scope>
</dependency>
</dependencies>
</project>

3
apps/routing/src/main/java/org/onosproject/routing/bgp/BgpConstants.java → apps/routing/common/src/main/java/org/onosproject/routing/bgp/BgpConstants.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.
@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.routing.bgp;
/**

3
apps/routing/src/main/java/org/onosproject/routing/bgp/BgpFrameDecoder.java → apps/routing/common/src/main/java/org/onosproject/routing/bgp/BgpFrameDecoder.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.
@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.routing.bgp;
import org.jboss.netty.buffer.ChannelBuffer;

3
apps/routing/src/main/java/org/onosproject/routing/bgp/BgpInfoService.java → apps/routing/common/src/main/java/org/onosproject/routing/bgp/BgpInfoService.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.
@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.routing.bgp;
import java.util.Collection;

3
apps/routing/src/main/java/org/onosproject/routing/bgp/BgpKeepalive.java → apps/routing/common/src/main/java/org/onosproject/routing/bgp/BgpKeepalive.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.
@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.routing.bgp;
import org.jboss.netty.buffer.ChannelBuffer;

3
apps/routing/src/main/java/org/onosproject/routing/bgp/BgpMessage.java → apps/routing/common/src/main/java/org/onosproject/routing/bgp/BgpMessage.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.
@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.routing.bgp;
import org.jboss.netty.buffer.ChannelBuffer;

3
apps/routing/src/main/java/org/onosproject/routing/bgp/BgpNotification.java → apps/routing/common/src/main/java/org/onosproject/routing/bgp/BgpNotification.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.
@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.routing.bgp;
import org.jboss.netty.buffer.ChannelBuffer;

3
apps/routing/src/main/java/org/onosproject/routing/bgp/BgpOpen.java → apps/routing/common/src/main/java/org/onosproject/routing/bgp/BgpOpen.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.
@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.routing.bgp;
import org.jboss.netty.buffer.ChannelBuffer;

3
apps/routing/src/main/java/org/onosproject/routing/bgp/BgpRouteEntry.java → apps/routing/common/src/main/java/org/onosproject/routing/bgp/BgpRouteEntry.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.
@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.routing.bgp;
import com.google.common.base.MoreObjects;

3
apps/routing/src/main/java/org/onosproject/routing/bgp/BgpRouteSelector.java → apps/routing/common/src/main/java/org/onosproject/routing/bgp/BgpRouteSelector.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.
@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.routing.bgp;
import org.onlab.packet.IpPrefix;

3
apps/routing/src/main/java/org/onosproject/routing/bgp/BgpSession.java → apps/routing/common/src/main/java/org/onosproject/routing/bgp/BgpSession.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.
@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.routing.bgp;
import org.jboss.netty.buffer.ChannelBuffer;

3
apps/routing/src/main/java/org/onosproject/routing/bgp/BgpSessionInfo.java → apps/routing/common/src/main/java/org/onosproject/routing/bgp/BgpSessionInfo.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.
@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.routing.bgp;
import org.onlab.packet.Ip4Address;

3
apps/routing/src/main/java/org/onosproject/routing/bgp/BgpSessionManager.java → apps/routing/common/src/main/java/org/onosproject/routing/bgp/BgpSessionManager.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.
@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.routing.bgp;
import org.apache.felix.scr.annotations.Activate;

3
apps/routing/src/main/java/org/onosproject/routing/bgp/BgpUpdate.java → apps/routing/common/src/main/java/org/onosproject/routing/bgp/BgpUpdate.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.
@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.routing.bgp;
import org.apache.commons.lang3.tuple.Pair;

1
apps/routing/src/main/java/org/onosproject/routing/bgp/RouteEntry.java → apps/routing/common/src/main/java/org/onosproject/routing/bgp/RouteEntry.java
View File

@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.routing.bgp;
import com.google.common.base.MoreObjects;

1
apps/routing/src/main/java/org/onosproject/routing/bgp/RouteUpdate.java → apps/routing/common/src/main/java/org/onosproject/routing/bgp/RouteUpdate.java
View File

@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.routing.bgp;
import com.google.common.base.MoreObjects;

2
apps/routing/src/main/java/org/onosproject/routing/bgp/package-info.java → apps/routing/common/src/main/java/org/onosproject/routing/bgp/package-info.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.

2
apps/routing/src/main/java/org/onosproject/routing/cli/AddPeerCommand.java → apps/routing/common/src/main/java/org/onosproject/routing/cli/AddPeerCommand.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016-present Open Networking Laboratory
* Copyright 2017-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.

2
apps/routing/src/main/java/org/onosproject/routing/cli/AddSpeakerCommand.java → apps/routing/common/src/main/java/org/onosproject/routing/cli/AddSpeakerCommand.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016-present Open Networking Laboratory
* Copyright 2017-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.

3
apps/routing/src/main/java/org/onosproject/routing/cli/BgpNeighborsListCommand.java → apps/routing/common/src/main/java/org/onosproject/routing/cli/BgpNeighborsListCommand.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.
@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.routing.cli;
import com.fasterxml.jackson.databind.JsonNode;

5
apps/routing/src/main/java/org/onosproject/routing/cli/BgpRoutesListCommand.java → apps/routing/common/src/main/java/org/onosproject/routing/cli/BgpRoutesListCommand.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.
@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.routing.cli;
import com.fasterxml.jackson.databind.JsonNode;
@ -22,10 +23,10 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.Option;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.routing.bgp.BgpConstants;
import org.onosproject.routing.bgp.BgpInfoService;
import org.onosproject.routing.bgp.BgpRouteEntry;
import org.onosproject.routing.bgp.BgpSession;
import org.onosproject.routing.bgp.BgpConstants;
import java.util.ArrayList;
import java.util.Collection;

2
apps/routing/src/main/java/org/onosproject/routing/cli/BgpSpeakersListCommand.java → apps/routing/common/src/main/java/org/onosproject/routing/cli/BgpSpeakersListCommand.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.

2
apps/routing/src/main/java/org/onosproject/routing/cli/RemovePeerCommand.java → apps/routing/common/src/main/java/org/onosproject/routing/cli/RemovePeerCommand.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016-present Open Networking Laboratory
* Copyright 2017-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.

2
apps/routing/src/main/java/org/onosproject/routing/cli/RemoveSpeakerCommand.java → apps/routing/common/src/main/java/org/onosproject/routing/cli/RemoveSpeakerCommand.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016-present Open Networking Laboratory
* Copyright 2017-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.

2
apps/routing/src/main/java/org/onosproject/routing/cli/package-info.java → apps/routing/common/src/main/java/org/onosproject/routing/cli/package-info.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.

3
apps/routing/src/main/java/org/onosproject/routing/config/impl/RoutingConfigurationImpl.java → apps/routing/common/src/main/java/org/onosproject/routing/config/impl/RoutingConfigurationImpl.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.
@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.routing.config.impl;
import com.google.common.collect.ImmutableSet;

2
apps/routing/src/main/java/org/onosproject/routing/config/impl/package-info.java → apps/routing/common/src/main/java/org/onosproject/routing/config/impl/package-info.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.

2
apps/routing/src/main/java/org/onosproject/routing/impl/BgpSpeakerNeighbourHandler.java → apps/routing/common/src/main/java/org/onosproject/routing/impl/BgpSpeakerNeighbourHandler.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016-present Open Networking Laboratory
* Copyright 2017-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.

2
apps/routing/src/main/java/org/onosproject/routing/impl/DirectHostManager.java → apps/routing/common/src/main/java/org/onosproject/routing/impl/DirectHostManager.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016-present Open Networking Laboratory
* Copyright 2017-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.

2
apps/routing/src/main/java/org/onosproject/routing/impl/package-info.java → apps/routing/common/src/main/java/org/onosproject/routing/impl/package-info.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.

3
apps/routing/src/main/resources/OSGI-INF/blueprint/shell-config.xml → apps/routing/common/src/main/resources/OSGI-INF/blueprint/shell-config.xml
View File

@ -37,8 +37,5 @@
<command>
<action class="org.onosproject.routing.cli.RemovePeerCommand"/>
</command>
<command>
<action class="org.onosproject.routing.fpm.cli.FpmConnectionsList"/>
</command>
</command-bundle>
</blueprint>

6
apps/routing/src/test/java/org/onosproject/routing/bgp/AsPathTest.java → apps/routing/common/src/test/java/org/onosproject/routing/bgp/AsPathTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.
@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.routing.bgp;
import org.hamcrest.Matchers;
@ -21,7 +22,6 @@ import org.junit.Test;
import java.util.ArrayList;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
import static org.junit.Assert.assertThat;
/**
@ -212,7 +212,7 @@ public class AsPathTest {
//
BgpRouteEntry.AsPath asPath2 = new BgpRouteEntry.AsPath(pathSegments);
assertThat(asPath1, Matchers.is(not(asPath2)));
assertThat(asPath1, Matchers.is(Matchers.not(asPath2)));
}
/**

6
apps/routing/src/test/java/org/onosproject/routing/bgp/BgpRouteEntryTest.java → apps/routing/common/src/test/java/org/onosproject/routing/bgp/BgpRouteEntryTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.
@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.routing.bgp;
import org.easymock.EasyMock;
@ -25,7 +26,6 @@ import org.onlab.packet.Ip4Prefix;
import java.util.ArrayList;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
import static org.junit.Assert.assertThat;
/**
@ -499,7 +499,7 @@ public class BgpRouteEntryTest {
localPref);
bgpRouteEntry2.setMultiExitDisc(multiExitDisc);
assertThat(bgpRouteEntry1, Matchers.is(not(bgpRouteEntry2)));
assertThat(bgpRouteEntry1, Matchers.is(Matchers.not(bgpRouteEntry2)));
}
/**

3
apps/routing/src/test/java/org/onosproject/routing/bgp/BgpSessionManagerTest.java → apps/routing/common/src/test/java/org/onosproject/routing/bgp/BgpSessionManagerTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.
@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.routing.bgp;
import com.google.common.net.InetAddresses;

6
apps/routing/src/test/java/org/onosproject/routing/bgp/PathSegmentTest.java → apps/routing/common/src/test/java/org/onosproject/routing/bgp/PathSegmentTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.
@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.routing.bgp;
import org.hamcrest.Matchers;
@ -21,7 +22,6 @@ import org.junit.Test;
import java.util.ArrayList;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
import static org.junit.Assert.assertThat;
/**
@ -114,7 +114,7 @@ public class PathSegmentTest {
BgpRouteEntry.PathSegment pathSegment2 =
new BgpRouteEntry.PathSegment(pathSegmentType, segmentAsNumbers);
assertThat(pathSegment1, Matchers.is(not(pathSegment2)));
assertThat(pathSegment1, Matchers.is(Matchers.not(pathSegment2)));
}
/**

1
apps/routing/src/test/java/org/onosproject/routing/bgp/RouteEntryTest.java → apps/routing/common/src/test/java/org/onosproject/routing/bgp/RouteEntryTest.java
View File

@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.routing.bgp;
import org.hamcrest.Matchers;

3
apps/routing/src/test/java/org/onosproject/routing/bgp/TestBgpPeerChannelHandler.java → apps/routing/common/src/test/java/org/onosproject/routing/bgp/TestBgpPeerChannelHandler.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.
@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.routing.bgp;
import org.jboss.netty.buffer.ChannelBuffer;

3
apps/routing/src/test/java/org/onosproject/routing/bgp/TestBgpPeerFrameDecoder.java → apps/routing/common/src/test/java/org/onosproject/routing/bgp/TestBgpPeerFrameDecoder.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.
@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.routing.bgp;
import org.jboss.netty.buffer.ChannelBuffer;

30
apps/routing/cpr/BUCK Normal file
View File

@ -0,0 +1,30 @@
COMPILE_DEPS = [
'//lib:CORE_DEPS',
'//incubator/api:onos-incubator-api',
'//apps/routing-api:onos-apps-routing-api',
]
TEST_DEPS = [
'//lib:TEST_ADAPTERS',
'//incubator/api:onos-incubator-api-tests',
'//apps/routing-api:onos-apps-routing-api-tests',
]
osgi_jar_with_tests (
deps = COMPILE_DEPS,
test_deps = TEST_DEPS,
)
BUNDLES = [
'//apps/routing/cpr:onos-apps-routing-cpr',
'//apps/routing-api:onos-apps-routing-api',
]
onos_app (
app_name = 'org.onosproject.cpr',
title = 'Control plane redirect',
category = 'Traffic Steering',
url = 'http://onosproject.org',
description = 'Redirects routing control traffic to a control plane',
included_bundles = BUNDLES,
)

31
apps/routing/cpr/pom.xml Normal file
View File

@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2017-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-app-routing-parent</artifactId>
<groupId>org.onosproject</groupId>
<version>1.9.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>onos-apps-routing-cpr</artifactId>
<packaging>bundle</packaging>
</project>

19
apps/routing/src/main/java/org/onosproject/routing/impl/ControlPlaneRedirectManager.java → apps/routing/cpr/src/main/java/org/onosproject/routing/cpr/ControlPlaneRedirectManager.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.
@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.onosproject.routing.impl;
package org.onosproject.routing.cpr;
import com.google.common.collect.ImmutableSortedSet;
import com.google.common.collect.Lists;
@ -57,6 +57,8 @@ import org.onosproject.net.host.HostEvent;
import org.onosproject.net.host.HostListener;
import org.onosproject.net.host.HostService;
import org.onosproject.net.host.InterfaceIpAddress;
import org.onosproject.routing.AsyncDeviceFetcher;
import org.onosproject.routing.RouterInterfaceManager;
import org.onosproject.routing.RoutingService;
import org.onosproject.routing.config.RouterConfig;
import org.slf4j.Logger;
@ -80,11 +82,13 @@ import static org.slf4j.LoggerFactory.getLogger;
* Manages connectivity between peers redirecting control traffic to a routing
* control plane available on the dataplane.
*/
@Component(immediate = true, enabled = false)
@Component(immediate = true)
public class ControlPlaneRedirectManager {
private final Logger log = getLogger(getClass());
public static final short ASSIGNED_VLAN = 4094;
private static final int MIN_IP_PRIORITY = 10;
private static final int IPV4_PRIORITY = 2000;
private static final int IPV6_PRIORITY = 500;
@ -140,6 +144,7 @@ public class ControlPlaneRedirectManager {
processRouterConfig();
// FIXME There can be an issue when this component is deactivated before vRouter
applicationService.registerDeactivateHook(this.appId, () -> {
if (interfaceManager != null) {
@ -239,10 +244,10 @@ public class ControlPlaneRedirectManager {
int cpNextId, intfNextId;
if (intf.vlan() == VlanId.NONE) {
cpNextId = modifyNextObjective(deviceId, controlPlanePort,
VlanId.vlanId(SingleSwitchFibInstaller.ASSIGNED_VLAN),
VlanId.vlanId(ASSIGNED_VLAN),
true, install);
intfNextId = modifyNextObjective(deviceId, intf.connectPoint().port(),
VlanId.vlanId(SingleSwitchFibInstaller.ASSIGNED_VLAN),
VlanId.vlanId(ASSIGNED_VLAN),
true, install);
} else {
cpNextId = modifyNextObjective(deviceId, controlPlanePort,
@ -365,7 +370,7 @@ public class ControlPlaneRedirectManager {
int cpNextId;
if (intf.vlan() == VlanId.NONE) {
cpNextId = modifyNextObjective(deviceId, controlPlanePort,
VlanId.vlanId(SingleSwitchFibInstaller.ASSIGNED_VLAN),
VlanId.vlanId(ASSIGNED_VLAN),
true, install);
} else {
cpNextId = modifyNextObjective(deviceId, controlPlanePort,
@ -680,7 +685,7 @@ public class ControlPlaneRedirectManager {
TrafficSelector.Builder metabuilder = DefaultTrafficSelector.builder();
VlanId matchVlanId = (vlanId.equals(VlanId.NONE)) ?
VlanId.vlanId(SingleSwitchFibInstaller.ASSIGNED_VLAN) :
VlanId.vlanId(ASSIGNED_VLAN) :
vlanId;
metabuilder.matchVlanId(matchVlanId);
nextObjBuilder.withMeta(metabuilder.build());

20
apps/routing/cpr/src/main/java/org/onosproject/routing/cpr/package-info.java Normal file
View File

@ -0,0 +1,20 @@
/*
* Copyright 2017-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.
*/
/**
* Control plane redirect.
*/
package org.onosproject.routing.cpr;

19
apps/routing/src/test/java/org/onosproject/routing/impl/ControlPlaneRedirectManagerTest.java → apps/routing/cpr/src/test/java/org/onosproject/routing/cpr/ControlPlaneRedirectManagerTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016-present Open Networking Laboratory
* Copyright 2017-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.
@ -13,7 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.routing.impl;
package org.onosproject.routing.cpr;
import com.google.common.collect.Sets;
import org.easymock.EasyMock;
@ -79,11 +80,11 @@ import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify;
import static org.onlab.packet.ICMP6.NEIGHBOR_ADVERTISEMENT;
import static org.onlab.packet.ICMP6.NEIGHBOR_SOLICITATION;
import static org.onosproject.routing.impl.ControlPlaneRedirectManager.ACL_PRIORITY;
import static org.onosproject.routing.impl.ControlPlaneRedirectManager.buildArpSelector;
import static org.onosproject.routing.impl.ControlPlaneRedirectManager.buildIPDstSelector;
import static org.onosproject.routing.impl.ControlPlaneRedirectManager.buildIPSrcSelector;
import static org.onosproject.routing.impl.ControlPlaneRedirectManager.buildNdpSelector;
import static org.onosproject.routing.cpr.ControlPlaneRedirectManager.ACL_PRIORITY;
import static org.onosproject.routing.cpr.ControlPlaneRedirectManager.buildArpSelector;
import static org.onosproject.routing.cpr.ControlPlaneRedirectManager.buildIPDstSelector;
import static org.onosproject.routing.cpr.ControlPlaneRedirectManager.buildIPSrcSelector;
import static org.onosproject.routing.cpr.ControlPlaneRedirectManager.buildNdpSelector;
/**
* UnitTests for ControlPlaneRedirectManager.
@ -272,9 +273,9 @@ public class ControlPlaneRedirectManagerTest {
int cpNextId, intfNextId;
cpNextId = modifyNextObjective(deviceId, controlPlanePort,
VlanId.vlanId(SingleSwitchFibInstaller.ASSIGNED_VLAN), true, install);
VlanId.vlanId(ControlPlaneRedirectManager.ASSIGNED_VLAN), true, install);
intfNextId = modifyNextObjective(deviceId, intf.connectPoint().port(),
VlanId.vlanId(SingleSwitchFibInstaller.ASSIGNED_VLAN), true, install);
VlanId.vlanId(ControlPlaneRedirectManager.ASSIGNED_VLAN), true, install);
// IP to router
TrafficSelector toSelector = buildIPDstSelector(

30
apps/routing/fibinstaller/BUCK Normal file
View File

@ -0,0 +1,30 @@
COMPILE_DEPS = [
'//lib:CORE_DEPS',
'//incubator/api:onos-incubator-api',
'//apps/routing-api:onos-apps-routing-api',
]
TEST_DEPS = [
'//lib:TEST_ADAPTERS',
'//incubator/api:onos-incubator-api-tests',
'//apps/routing-api:onos-apps-routing-api-tests',
]
osgi_jar_with_tests (
deps = COMPILE_DEPS,
test_deps = TEST_DEPS,
)
BUNDLES = [
'//apps/routing/fibinstaller:onos-apps-routing-fibinstaller',
'//apps/routing-api:onos-apps-routing-api',
]
onos_app (
app_name = 'org.onosproject.fibinstaller',
title = 'FIB installer app',
category = 'Traffic Steering',
url = 'http://onosproject.org',
description = 'Installs routing rules into switches',
included_bundles = BUNDLES,
)

31
apps/routing/fibinstaller/pom.xml Normal file
View File

@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2017-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-app-routing-parent</artifactId>
<groupId>org.onosproject</groupId>
<version>1.9.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>onos-apps-routing-fibinstaller</artifactId>
<packaging>bundle</packaging>
</project>

10
apps/routing/src/main/java/org/onosproject/routing/impl/SingleSwitchFibInstaller.java → apps/routing/fibinstaller/src/main/java/org/onosproject/routing/fibinstaller/SingleSwitchFibInstaller.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.
@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.onosproject.routing.impl;
package org.onosproject.routing.fibinstaller;
import com.google.common.collect.ConcurrentHashMultiset;
import com.google.common.collect.Maps;
@ -67,6 +67,10 @@ import org.onosproject.net.flowobjective.FlowObjectiveService;
import org.onosproject.net.flowobjective.ForwardingObjective;
import org.onosproject.net.flowobjective.NextObjective;
import org.onosproject.net.flowobjective.ObjectiveContext;
import org.onosproject.routing.AsyncDeviceFetcher;
import org.onosproject.routing.NextHop;
import org.onosproject.routing.NextHopGroupKey;
import org.onosproject.routing.RouterInterfaceManager;
import org.onosproject.routing.RoutingService;
import org.onosproject.routing.config.RouterConfig;
import org.osgi.service.component.ComponentContext;
@ -80,7 +84,7 @@ import java.util.Set;
/**
* Programs routes to a single OpenFlow switch.
*/
@Component(immediate = true, enabled = false)
@Component(immediate = true)
public class SingleSwitchFibInstaller {
private final Logger log = LoggerFactory.getLogger(getClass());

20
apps/routing/fibinstaller/src/main/java/org/onosproject/routing/fibinstaller/package-info.java Normal file
View File

@ -0,0 +1,20 @@
/*
* Copyright 2017-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.
*/
/**
* Single switch FIB installer.
*/
package org.onosproject.routing.fibinstaller;

5
apps/routing/src/test/java/org/onosproject/routing/impl/SingleSwitchFibInstallerTest.java → apps/routing/fibinstaller/src/test/java/org/onosproject/routing/fibinstaller/SingleSwitchFibInstallerTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016-present Open Networking Laboratory
* Copyright 2017-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.
@ -13,7 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.routing.impl;
package org.onosproject.routing.fibinstaller;
import com.google.common.collect.Sets;
import org.easymock.EasyMock;

30
apps/routing/fpm/BUCK Normal file
View File

@ -0,0 +1,30 @@
COMPILE_DEPS = [
'//lib:CORE_DEPS',
'//lib:org.apache.karaf.shell.console',
'//cli:onos-cli',
'//incubator/api:onos-incubator-api',
'//apps/routing-api:onos-apps-routing-api',
]
TEST_DEPS = [
'//lib:TEST_ADAPTERS',
]
osgi_jar_with_tests (
deps = COMPILE_DEPS,
test_deps = TEST_DEPS,
)
BUNDLES = [
'//apps/routing/fpm:onos-apps-routing-fpm',
'//apps/routing-api:onos-apps-routing-api',
]
onos_app (
app_name = 'org.onosproject.fpm',
title = 'FIB Push Manager (FPM) route reciever',
category = 'Utility',
url = 'http://onosproject.org',
description = 'Receives routes from external routing daemon over FPM protocol',
included_bundles = BUNDLES,
)

48
apps/routing/fpm/pom.xml Normal file
View File

@ -0,0 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2017-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-app-routing-parent</artifactId>
<groupId>org.onosproject</groupId>
<version>1.9.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>onos-apps-fpm</artifactId>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-cli</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
</dependency>
</dependencies>
</project>

2
apps/routing/src/main/java/org/onosproject/routing/fpm/FpmFrameDecoder.java → apps/routing/fpm/src/main/java/org/onosproject/routing/fpm/FpmFrameDecoder.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.

2
apps/routing/src/main/java/org/onosproject/routing/fpm/FpmInfoService.java → apps/routing/fpm/src/main/java/org/onosproject/routing/fpm/FpmInfoService.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016-present Open Networking Laboratory
* Copyright 2017-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.

2
apps/routing/src/main/java/org/onosproject/routing/fpm/FpmListener.java → apps/routing/fpm/src/main/java/org/onosproject/routing/fpm/FpmListener.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016-present Open Networking Laboratory
* Copyright 2017-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.

5
apps/routing/src/main/java/org/onosproject/routing/fpm/FpmManager.java → apps/routing/fpm/src/main/java/org/onosproject/routing/fpm/FpmManager.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.
@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.routing.fpm;
import com.google.common.collect.ImmutableList;
@ -67,7 +68,7 @@ import static org.onlab.util.Tools.groupedThreads;
* Forwarding Plane Manager (FPM) route source.
*/
@Service
@Component(immediate = true, enabled = false)
@Component(immediate = true)
public class FpmManager implements FpmInfoService {
private final Logger log = LoggerFactory.getLogger(getClass());

2
apps/routing/src/main/java/org/onosproject/routing/fpm/FpmSessionHandler.java → apps/routing/fpm/src/main/java/org/onosproject/routing/fpm/FpmSessionHandler.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.

4
apps/routing/src/main/java/org/onosproject/routing/fpm/cli/FpmConnectionsList.java → apps/routing/fpm/src/main/java/org/onosproject/routing/fpm/cli/FpmConnectionsList.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016-present Open Networking Laboratory
* Copyright 2017-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.
@ -34,7 +34,7 @@ public class FpmConnectionsList extends AbstractShellCommand {
@Override
protected void execute() {
FpmInfoService fpmInfo = get(FpmInfoService.class);
FpmInfoService fpmInfo = AbstractShellCommand.get(FpmInfoService.class);
fpmInfo.peers().forEach((socketAddress, timestamp) -> {
if (socketAddress instanceof InetSocketAddress) {

2
apps/routing/src/main/java/org/onosproject/routing/fpm/cli/package-info.java → apps/routing/fpm/src/main/java/org/onosproject/routing/fpm/cli/package-info.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016-present Open Networking Laboratory
* Copyright 2017-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.

2
apps/routing/src/main/java/org/onosproject/routing/fpm/package-info.java → apps/routing/fpm/src/main/java/org/onosproject/routing/fpm/package-info.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.

2
apps/routing/src/main/java/org/onosproject/routing/fpm/protocol/FpmHeader.java → apps/routing/fpm/src/main/java/org/onosproject/routing/fpm/protocol/FpmHeader.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.

2
apps/routing/src/main/java/org/onosproject/routing/fpm/protocol/Netlink.java → apps/routing/fpm/src/main/java/org/onosproject/routing/fpm/protocol/Netlink.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.

2
apps/routing/src/main/java/org/onosproject/routing/fpm/protocol/NetlinkMessageType.java → apps/routing/fpm/src/main/java/org/onosproject/routing/fpm/protocol/NetlinkMessageType.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.

2
apps/routing/src/main/java/org/onosproject/routing/fpm/protocol/RouteAttribute.java → apps/routing/fpm/src/main/java/org/onosproject/routing/fpm/protocol/RouteAttribute.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.

2
apps/routing/src/main/java/org/onosproject/routing/fpm/protocol/RouteAttributeDecoder.java → apps/routing/fpm/src/main/java/org/onosproject/routing/fpm/protocol/RouteAttributeDecoder.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.

2
apps/routing/src/main/java/org/onosproject/routing/fpm/protocol/RouteAttributeDst.java → apps/routing/fpm/src/main/java/org/onosproject/routing/fpm/protocol/RouteAttributeDst.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.

2
apps/routing/src/main/java/org/onosproject/routing/fpm/protocol/RouteAttributeGateway.java → apps/routing/fpm/src/main/java/org/onosproject/routing/fpm/protocol/RouteAttributeGateway.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.

2
apps/routing/src/main/java/org/onosproject/routing/fpm/protocol/RouteAttributeOif.java → apps/routing/fpm/src/main/java/org/onosproject/routing/fpm/protocol/RouteAttributeOif.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.

2
apps/routing/src/main/java/org/onosproject/routing/fpm/protocol/RouteAttributePriority.java → apps/routing/fpm/src/main/java/org/onosproject/routing/fpm/protocol/RouteAttributePriority.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.

2
apps/routing/src/main/java/org/onosproject/routing/fpm/protocol/RtNetlink.java → apps/routing/fpm/src/main/java/org/onosproject/routing/fpm/protocol/RtNetlink.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.

2
apps/routing/src/main/java/org/onosproject/routing/fpm/protocol/RtProtocol.java → apps/routing/fpm/src/main/java/org/onosproject/routing/fpm/protocol/RtProtocol.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016-present Open Networking Laboratory
* Copyright 2017-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.

2
apps/routing/src/main/java/org/onosproject/routing/fpm/protocol/package-info.java → apps/routing/fpm/src/main/java/org/onosproject/routing/fpm/protocol/package-info.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2015-present Open Networking Laboratory
* Copyright 2017-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.

23
apps/routing/fpm/src/main/resources/OSGI-INF/blueprint/shell-config.xml Normal file
View File

@ -0,0 +1,23 @@
<!--
~ Copyright 2017-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.
-->
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
<command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
<command>
<action class="org.onosproject.routing.fpm.cli.FpmConnectionsList"/>
</command>
</command-bundle>
</blueprint>

62
apps/routing/pom.xml
View File

@ -24,10 +24,16 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>onos-app-routing</artifactId>
<artifactId>onos-app-routing-parent</artifactId>
<packaging>bundle</packaging>
<packaging>pom</packaging>
<description>Libraries for routing applications</description>
<modules>
<module>fibinstaller</module>
<module>common</module>
<module>cpr</module>
<module>fpm</module>
</modules>
<dependencies>
<dependency>
@ -53,46 +59,8 @@
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-cli</artifactId>
<version>${project.version}</version>
</dependency>
<!-- FIXME: not OSGi-ready -->
<dependency>
<groupId>com.googlecode.concurrent-trees</groupId>
<artifactId>concurrent-trees</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onlab-misc</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
@ -100,16 +68,6 @@
<artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onlab-junit</artifactId>

2
apps/sdnip/BUCK
View File

@ -10,7 +10,7 @@ COMPILE_DEPS = [
BUNDLES = [
'//apps/sdnip:onos-apps-sdnip',
'//apps/routing-api:onos-apps-routing-api',
'//apps/routing:onos-apps-routing',
'//apps/routing/common:onos-apps-routing-common',
]
TEST_DEPS = [

3
apps/vrouter/BUCK
View File

@ -5,7 +5,7 @@ COMPILE_DEPS = [
BUNDLES = [
'//apps/routing-api:onos-apps-routing-api',
'//apps/routing:onos-apps-routing',
'//apps/routing/common:onos-apps-routing-common',
'//apps/vrouter:onos-apps-vrouter',
]
@ -19,4 +19,5 @@ onos_app (
url = 'http://onosproject.org',
included_bundles = BUNDLES,
description = 'Virtual router (vRouter) application.',
required_apps = [ 'org.onosproject.fibinstaller', 'org.onosproject.cpr', 'org.onosproject.fpm' ],
)

49
apps/vrouter/src/main/java/org/onosproject/vrouter/Vrouter.java
View File

@ -19,20 +19,15 @@ import com.google.common.collect.Lists;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Modified;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.onlab.util.Tools;
import org.onosproject.cfg.ComponentConfigService;
import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService;
import org.onosproject.incubator.component.ComponentService;
import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Dictionary;
import java.util.List;
/**
@ -44,9 +39,6 @@ public class Vrouter {
private final Logger log = LoggerFactory.getLogger(getClass());
private static final String APP_NAME = "org.onosproject.vrouter";
private static final String FPM_MANAGER = "org.onosproject.routing.fpm.FpmManager";
private static final String FIB_INSTALLER = "org.onosproject.routing.impl.SingleSwitchFibInstaller";
private static final String CP_REDIRECT = "org.onosproject.routing.impl.ControlPlaneRedirectManager";
private static final String DIRECT_HOST_MGR = "org.onosproject.routing.impl.DirectHostManager";
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
@ -58,32 +50,19 @@ public class Vrouter {
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
private ComponentConfigService componentConfigService;
/**
* vRouter will push flows to the switches when receiving routes by enabling
* FIB installer.
* <p>
* It should be turned off when vRouter is deployed in a scenario where
* other components that pushes the routes.
*/
@Property(name = "fibInstallerEnabled", boolValue = true,
label = "Enable single switch fib installer; default is true")
private boolean fibInstallerEnabled = true;
private ApplicationId appId;
private List<String> baseComponents = Lists.newArrayList(FPM_MANAGER, CP_REDIRECT, DIRECT_HOST_MGR);
private List<String> baseComponents = Lists.newArrayList(DIRECT_HOST_MGR);
@Activate
protected void activate(ComponentContext context) {
protected void activate() {
appId = coreService.registerApplication(APP_NAME);
componentConfigService.registerProperties(getClass());
componentConfigService.preSetProperty(
"org.onosproject.incubator.store.routing.impl.RouteStoreImpl",
"distributed", "true");
baseComponents.forEach(name -> componentService.activate(appId, name));
modified(context);
log.info("Started");
}
@ -96,28 +75,4 @@ public class Vrouter {
log.info("Stopped");
}
@Modified
private void modified(ComponentContext context) {
Dictionary<?, ?> properties = context.getProperties();
if (properties == null) {
return;
}
Boolean newFibInstallerEnabled = Tools.isPropertyEnabled(properties, "fibInstallerEnabled");
if (newFibInstallerEnabled == null) {
log.info("fibInstallerEnabled is not configured, " +
"using current value of {}", fibInstallerEnabled);
} else {
fibInstallerEnabled = newFibInstallerEnabled;
log.info("Configured. fibInstallerEnabled set to {}, ",
fibInstallerEnabled ? "enabled" : "disabled");
}
if (fibInstallerEnabled) {
componentService.activate(appId, FIB_INSTALLER);
} else {
componentService.deactivate(appId, FIB_INSTALLER);
}
}
}

5
modules.defs
View File

@ -163,6 +163,9 @@ ONOS_APPS = [
'//apps/virtualbng:onos-apps-virtualbng-oar',
'//apps/vpls:onos-apps-vpls-oar',
'//apps/vrouter:onos-apps-vrouter-oar',
'//apps/routing/fibinstaller:onos-apps-routing-fibinstaller-oar',
'//apps/routing/cpr:onos-apps-routing-cpr-oar',
'//apps/routing/fpm:onos-apps-routing-fpm-oar',
'//apps/vtn:onos-apps-vtn-oar',
'//apps/faultmanagement:onos-apps-faultmanagement-oar',
'//apps/openstacknode:onos-apps-openstacknode-oar',
@ -184,7 +187,7 @@ APP_JARS = [
'//apps/fwd:onos-apps-fwd',
'//apps/iptopology-api:onos-apps-iptopology-api',
'//apps/openstacknode:onos-apps-openstacknode',
'//apps/routing:onos-apps-routing',
'//apps/routing/common:onos-apps-routing-common',
'//apps/vtn/vtnrsc:onos-apps-vtn-vtnrsc',
'//apps/vtn/sfcmgr:onos-apps-vtn-sfcmgr',
'//apps/vtn/vtnmgr:onos-apps-vtn-vtnmgr',