mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2026-05-05 12:16:13 +02:00
Code Issues Projects Releases Wiki Activity

Move routing from incubator to a separate app

Browse Source 
Change-Id: I961d10af99c572b1f8d9b3d37c6f52dd04422007
This commit is contained in:
Ray Milkey 2017-08-08 13:00:43 -07:00
parent 4c30ea3979
commit 69ec87142c
87 changed files with 618 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/bgprouter/BUCK
View File

@ -20,5 +20,5 @@ onos_app (
url = 'http://onosproject.org',
description = 'BGP router application.',
included_bundles = BUNDLES,
required_apps = [ 'org.onosproject.fibinstaller' ],
required_apps = [ 'org.onosproject.fibinstaller', 'org.onosproject.route-service' ],
)

9
apps/dhcprelay/BUCK
View File

@ -2,14 +2,14 @@ COMPILE_DEPS = [
'//lib:CORE_DEPS',
'//lib:org.apache.karaf.shell.console',
'//cli:onos-cli',
'//incubator/api:onos-incubator-api',
'//core/store/serializers:onos-core-serializers'
'//core/store/serializers:onos-core-serializers',
'//apps/route-service/api:onos-apps-route-service-api',
]
TEST_DEPS = [
'//lib:TEST_ADAPTERS',
'//lib:TEST',
'//apps/route-service/api:onos-apps-route-service-api-tests',
'//core/api:onos-api-tests',
'//incubator/api:onos-incubator-api-tests',
]
osgi_jar_with_tests (
@ -23,4 +23,5 @@ onos_app (
category = 'Utility',
url = 'http://onosproject.org',
description = 'DHCP Relay Agent Application.',
required_apps = [ 'org.onosproject.route-service' ],
)

7
apps/dhcprelay/pom.xml
View File

@ -61,7 +61,7 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onlab-junit</artifactId>
@ -114,5 +114,10 @@
<artifactId>onos-cli</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-app-route-service-api</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>

4
apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java
View File

@ -40,8 +40,8 @@ import org.onosproject.dhcprelay.store.DhcpRecord;
import org.onosproject.dhcprelay.store.DhcpRelayStore;
import org.onosproject.net.intf.Interface;
import org.onosproject.net.intf.InterfaceService;
import org.onosproject.incubator.net.routing.Route;
import org.onosproject.incubator.net.routing.RouteStore;
import org.onosproject.routeservice.Route;
import org.onosproject.routeservice.RouteStore;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.Host;
import org.onosproject.net.HostId;

4
apps/dhcprelay/src/test/java/org/onosproject/dhcprelay/DhcpRelayManagerTest.java
View File

@ -45,8 +45,8 @@ import org.onosproject.dhcprelay.store.DhcpRelayStore;
import org.onosproject.dhcprelay.store.DhcpRelayStoreEvent;
import org.onosproject.net.intf.Interface;
import org.onosproject.net.intf.InterfaceServiceAdapter;
import org.onosproject.incubator.net.routing.Route;
import org.onosproject.incubator.net.routing.RouteStoreAdapter;
import org.onosproject.routeservice.Route;
import org.onosproject.routeservice.RouteStoreAdapter;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DefaultHost;
import org.onosproject.net.Host;

2
apps/evpnopenflow/BUCK
View File

@ -6,6 +6,7 @@ COMPILE_DEPS = [
'//core/store/serializers:onos-core-serializers',
'//apps/gluon:onos-apps-gluon',
'//apps/vtn/vtnrsc:onos-apps-vtn-vtnrsc',
'//apps/route-service/api:onos-apps-route-service-api',
]
TEST_DEPS = [
@ -24,4 +25,5 @@ onos_app(
url = 'http://onosproject.org',
description = 'Ethernet VPN (EVPN) introduces a new model for Ethernet services delivery.' +
'It enables integrated Layer 2 service over Ethernet with multihoming.',
required_apps = [ 'org.onosproject.route-service' ],
)

5
apps/evpnopenflow/pom.xml
View File

@ -105,5 +105,10 @@
<artifactId>onos-app-vtn-rsc</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-app-route-service-api</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>

4
apps/evpnopenflow/src/main/java/org/onosproject/evpnopenflow/rsc/vpninstance/impl/VpnInstanceManager.java
View File

@ -34,7 +34,7 @@ import org.onosproject.evpnopenflow.rsc.VpnInstanceId;
import org.onosproject.evpnopenflow.rsc.vpnafconfig.VpnAfConfigService;
import org.onosproject.evpnopenflow.rsc.vpninstance.VpnInstanceService;
import org.onosproject.incubator.net.routing.EvpnInstanceName;
import org.onosproject.incubator.net.routing.RouteAdminService;
import org.onosproject.routeservice.RouteAdminService;
import org.onosproject.incubator.net.routing.RouteDistinguisher;
import org.onosproject.incubator.net.routing.VpnRouteTarget;
import org.onosproject.store.serializers.KryoNamespaces;
@ -287,4 +287,4 @@ public class VpnInstanceManager implements VpnInstanceService {
vpnInstanceMap.put(id, vpnInstance);
return Collections.unmodifiableCollection(vpnInstanceMap.values());
}
}
}

2
apps/pim/BUCK
View File

@ -4,6 +4,7 @@ COMPILE_DEPS = [
'//cli:onos-cli',
'//incubator/api:onos-incubator-api',
'//apps/routing-api:onos-apps-routing-api',
'//apps/route-service/api:onos-apps-route-service-api',
]
BUNDLES = [
@ -23,4 +24,5 @@ onos_app (
url = 'http://onosproject.org',
description = 'Protocol independent multicast emulation.',
included_bundles = BUNDLES,
required_apps = [ 'org.onosproject.route-service' ],
)

5
apps/pim/pom.xml
View File

@ -85,6 +85,11 @@
<artifactId>org.apache.felix.scr.annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-app-route-service-api</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>

4
apps/pim/src/main/java/org/onosproject/pim/impl/PimInterfaceManager.java
View File

@ -28,8 +28,8 @@ import org.onosproject.net.intf.Interface;
import org.onosproject.net.intf.InterfaceEvent;
import org.onosproject.net.intf.InterfaceListener;
import org.onosproject.net.intf.InterfaceService;
import org.onosproject.incubator.net.routing.Route;
import org.onosproject.incubator.net.routing.RouteService;
import org.onosproject.routeservice.Route;
import org.onosproject.routeservice.RouteService;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.Host;
import org.onosproject.net.config.ConfigFactory;

3
apps/pom.xml
View File

@ -89,8 +89,9 @@
<module>yang</module>
<module>openroadm</module>
<module>netconf/client</module>
<module>gluon</module>
<module>gluon</module>
<module>evpnopenflow</module>
<module>route-service</module>
</modules>
<properties>

3
apps/reactive-routing/BUCK
View File

@ -4,6 +4,7 @@ COMPILE_DEPS = [
'//incubator/api:onos-incubator-api',
'//apps/routing-api:onos-apps-routing-api',
'//apps/intentsync:onos-apps-intentsync',
'//apps/route-service/api:onos-apps-route-service-api',
]
osgi_jar (
@ -15,5 +16,5 @@ onos_app (
category = 'Traffic Steering',
url = 'http://onosproject.org',
description = 'SDN-IP reactive routing application.',
required_apps = [ 'org.onosproject.intentsynchronizer', 'org.onosproject.sdnip' ],
required_apps = [ 'org.onosproject.intentsynchronizer', 'org.onosproject.sdnip', 'org.onosproject.route-service'],
)

2
apps/reactive-routing/src/main/java/org/onosproject/reactive/routing/ReactiveRoutingConfiguration.java
View File

@ -51,7 +51,7 @@ import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
import static org.onosproject.incubator.net.routing.RouteTools.createBinaryString;
import static org.onosproject.routeservice.RouteTools.createBinaryString;
/**
* Reactive routing configuration manager.

4
apps/reactive-routing/src/main/java/org/onosproject/reactive/routing/SdnIpReactiveRouting.java
View File

@ -33,8 +33,8 @@ import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService;
import org.onosproject.net.intf.Interface;
import org.onosproject.net.intf.InterfaceService;
import org.onosproject.incubator.net.routing.Route;
import org.onosproject.incubator.net.routing.RouteService;
import org.onosproject.routeservice.Route;
import org.onosproject.routeservice.RouteService;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.Host;
import org.onosproject.net.flow.DefaultTrafficSelector;

11
apps/route-service/BUCK Normal file
View File

@ -0,0 +1,11 @@
BUNDLES = [
'//apps/route-service/api:onos-apps-route-service-api',
'//apps/route-service/app:onos-apps-route-service-app',
]
onos_app (
title = 'Route Service Server App',
category = 'Utility',
url = 'http://onosproject.org',
included_bundles = BUNDLES,
)

13
apps/route-service/api/BUCK Normal file
View File

@ -0,0 +1,13 @@
COMPILE_DEPS = [
'//lib:CORE_DEPS',
]
TEST_DEPS = [
'//lib:TEST',
'//core/api:onos-api-tests',
]
osgi_jar_with_tests (
deps = COMPILE_DEPS,
test_deps = TEST_DEPS,
)

61
apps/route-service/api/pom.xml Normal file
View File

@ -0,0 +1,61 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2015-present Open Networking Foundation
~
~ 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">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>onos-app-route-service</artifactId>
<groupId>org.onosproject</groupId>
<version>1.11.0-SNAPSHOT</version>
</parent>
<artifactId>onos-app-route-service-api</artifactId>
<packaging>bundle</packaging>
<url>http://onosproject.org</url>
<description>Route Service Application API</description>
<dependencies>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onlab-junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-core-serializers</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-incubator-api</artifactId>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-api</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
</dependencies>
</project>

2
incubator/api/src/main/java/org/onosproject/incubator/net/routing/InternalRouteEvent.java → apps/route-service/api/src/main/java/org/onosproject/routeservice/InternalRouteEvent.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.onosproject.incubator.net.routing;
package org.onosproject.routeservice;
import org.onosproject.event.AbstractEvent;

2
incubator/api/src/main/java/org/onosproject/incubator/net/routing/NextHopData.java → apps/route-service/api/src/main/java/org/onosproject/routeservice/NextHopData.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.onosproject.incubator.net.routing;
package org.onosproject.routeservice;
import org.onlab.packet.MacAddress;
import org.onosproject.net.ConnectPoint;

2
incubator/api/src/main/java/org/onosproject/incubator/net/routing/ResolvedRoute.java → apps/route-service/api/src/main/java/org/onosproject/routeservice/ResolvedRoute.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.onosproject.incubator.net.routing;
package org.onosproject.routeservice;
import org.onlab.packet.IpAddress;
import org.onlab.packet.IpPrefix;

2
incubator/api/src/main/java/org/onosproject/incubator/net/routing/Route.java → apps/route-service/api/src/main/java/org/onosproject/routeservice/Route.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.onosproject.incubator.net.routing;
package org.onosproject.routeservice;
import org.onlab.packet.IpAddress;
import org.onlab.packet.IpPrefix;

2
incubator/api/src/main/java/org/onosproject/incubator/net/routing/RouteAdminService.java → apps/route-service/api/src/main/java/org/onosproject/routeservice/RouteAdminService.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.onosproject.incubator.net.routing;
package org.onosproject.routeservice;
import java.util.Collection;

2
incubator/api/src/main/java/org/onosproject/incubator/net/routing/RouteConfig.java → apps/route-service/api/src/main/java/org/onosproject/routeservice/RouteConfig.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.onosproject.incubator.net.routing;
package org.onosproject.routeservice;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.collect.ImmutableSet;

2
incubator/api/src/main/java/org/onosproject/incubator/net/routing/RouteEvent.java → apps/route-service/api/src/main/java/org/onosproject/routeservice/RouteEvent.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.onosproject.incubator.net.routing;
package org.onosproject.routeservice;
import org.joda.time.LocalDateTime;
import org.onosproject.event.AbstractEvent;

2
incubator/api/src/main/java/org/onosproject/incubator/net/routing/RouteInfo.java → apps/route-service/api/src/main/java/org/onosproject/routeservice/RouteInfo.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.onosproject.incubator.net.routing;
package org.onosproject.routeservice;
import com.google.common.annotations.Beta;
import org.onlab.packet.IpPrefix;

2
incubator/api/src/main/java/org/onosproject/incubator/net/routing/RouteListener.java → apps/route-service/api/src/main/java/org/onosproject/routeservice/RouteListener.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.onosproject.incubator.net.routing;
package org.onosproject.routeservice;
import org.onosproject.event.EventListener;

2
incubator/api/src/main/java/org/onosproject/incubator/net/routing/RouteService.java → apps/route-service/api/src/main/java/org/onosproject/routeservice/RouteService.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.onosproject.incubator.net.routing;
package org.onosproject.routeservice;
import org.onlab.packet.IpAddress;
import org.onosproject.event.ListenerService;

2
incubator/api/src/main/java/org/onosproject/incubator/net/routing/RouteSet.java → apps/route-service/api/src/main/java/org/onosproject/routeservice/RouteSet.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.onosproject.incubator.net.routing;
package org.onosproject.routeservice;
import com.google.common.collect.ImmutableSet;
import org.onlab.packet.IpPrefix;

2
incubator/api/src/main/java/org/onosproject/incubator/net/routing/RouteStore.java → apps/route-service/api/src/main/java/org/onosproject/routeservice/RouteStore.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.onosproject.incubator.net.routing;
package org.onosproject.routeservice;
import com.google.common.annotations.Beta;
import org.onlab.packet.IpAddress;

2
incubator/api/src/main/java/org/onosproject/incubator/net/routing/RouteStoreDelegate.java → apps/route-service/api/src/main/java/org/onosproject/routeservice/RouteStoreDelegate.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.onosproject.incubator.net.routing;
package org.onosproject.routeservice;
import org.onosproject.store.StoreDelegate;

2
incubator/api/src/main/java/org/onosproject/incubator/net/routing/RouteTableId.java → apps/route-service/api/src/main/java/org/onosproject/routeservice/RouteTableId.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.onosproject.incubator.net.routing;
package org.onosproject.routeservice;
import java.util.Objects;

2
incubator/api/src/main/java/org/onosproject/incubator/net/routing/RouteTools.java → apps/route-service/api/src/main/java/org/onosproject/routeservice/RouteTools.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.onosproject.incubator.net.routing;
package org.onosproject.routeservice;
import org.onlab.packet.IpPrefix;

20
apps/route-service/api/src/main/java/org/onosproject/routeservice/package-info.java Normal file
View File

@ -0,0 +1,20 @@
/*
* Copyright 2016-present Open Networking Foundation
*
* 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.
*/
/**
* Unicast routing service.
*/
package org.onosproject.routeservice;

4
incubator/api/src/test/java/org/onosproject/incubator/net/routing/RouteConfigTest.java → apps/route-service/api/src/test/java/org/onosproject/routeservice/RouteConfigTest.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.onosproject.incubator.net.routing;
package org.onosproject.routeservice;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
@ -78,4 +78,4 @@ public class RouteConfigTest {
public void onApply(Config config) {
}
}
}
}

2
incubator/api/src/test/java/org/onosproject/incubator/net/routing/RouteServiceAdapter.java → apps/route-service/api/src/test/java/org/onosproject/routeservice/RouteServiceAdapter.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.onosproject.incubator.net.routing;
package org.onosproject.routeservice;
import org.onlab.packet.IpAddress;

2
incubator/api/src/test/java/org/onosproject/incubator/net/routing/RouteStoreAdapter.java → apps/route-service/api/src/test/java/org/onosproject/routeservice/RouteStoreAdapter.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.incubator.net.routing;
package org.onosproject.routeservice;
import org.onlab.packet.IpAddress;
import org.onlab.packet.IpPrefix;

0
incubator/api/src/test/resources/route-config.json → apps/route-service/api/src/test/resources/route-config.json
View File

19
apps/route-service/app/BUCK Normal file
View File

@ -0,0 +1,19 @@
COMPILE_DEPS = [
'//lib:CORE_DEPS',
'//lib:concurrent-trees',
'//core/store/serializers:onos-core-serializers',
'//apps/route-service/api:onos-apps-route-service-api',
'//cli:onos-cli',
'//lib:org.apache.karaf.shell.console',
]
TEST_DEPS = [
'//lib:TEST',
'//apps/route-service/api:onos-apps-route-service-api-tests',
'//core/api:onos-api-tests',
]
osgi_jar_with_tests (
deps = COMPILE_DEPS,
test_deps = TEST_DEPS,
)

24
apps/route-service/app/app.xml Normal file
View File

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2015-present Open Networking Foundation
~
~ 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.
-->
<app name="org.onosproject.routeservice" origin="ON.Lab" version="${project.version}"
category="Utility" url="http://onosproject.org" title="Route Service App"
featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
features="${project.artifactId}">
<description>${project.description}</description>
<artifact>mvn:${project.groupId}/${project.artifactId}/${project.version}</artifact>
<artifact>mvn:${project.groupId}/onos-app-route-service-api/${project.version}</artifact>
</app>

24
apps/route-service/app/features.xml Normal file
View File

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
~ Copyright 2015-present Open Networking Foundation
~
~ 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.
-->
<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
<feature name="${project.artifactId}" version="${project.version}"
description="${project.description}">
<feature>onos-api</feature>
<bundle>mvn:${project.groupId}/onos-app-route-service-api/${project.version}</bundle>
<bundle>mvn:${project.groupId}/onos-app-route-service/${project.version}</bundle>
</feature>
</features>

92
apps/route-service/app/pom.xml Normal file
View File

@ -0,0 +1,92 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2015-present Open Networking Foundation
~
~ 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">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>onos-app-route-service</artifactId>
<groupId>org.onosproject</groupId>
<version>1.11.0-SNAPSHOT</version>
</parent>
<artifactId>onos-app-route-service-app</artifactId>
<packaging>bundle</packaging>
<url>http://onosproject.org</url>
<description>Route Service Application</description>
<dependencies>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onlab-junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-core-serializers</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-incubator-api</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>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-api</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-app-route-service-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.googlecode.concurrent-trees</groupId>
<artifactId>concurrent-trees</artifactId>
<version>2.6.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<version>5.0.0</version>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>

6
cli/src/main/java/org/onosproject/cli/net/RouteAddCommand.java → apps/route-service/app/src/main/java/org/onosproject/routeservice/cli/RouteAddCommand.java
View File

@ -14,15 +14,15 @@
* limitations under the License.
*/
package org.onosproject.cli.net;
package org.onosproject.routeservice.cli;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.onlab.packet.IpAddress;
import org.onlab.packet.IpPrefix;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.incubator.net.routing.Route;
import org.onosproject.incubator.net.routing.RouteAdminService;
import org.onosproject.routeservice.Route;
import org.onosproject.routeservice.RouteAdminService;
import java.util.Collections;

6
cli/src/main/java/org/onosproject/cli/net/RouteRemoveCommand.java → apps/route-service/app/src/main/java/org/onosproject/routeservice/cli/RouteRemoveCommand.java
View File

@ -14,15 +14,15 @@
* limitations under the License.
*/
package org.onosproject.cli.net;
package org.onosproject.routeservice.cli;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.onlab.packet.IpAddress;
import org.onlab.packet.IpPrefix;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.incubator.net.routing.Route;
import org.onosproject.incubator.net.routing.RouteAdminService;
import org.onosproject.routeservice.Route;
import org.onosproject.routeservice.RouteAdminService;
import java.util.Collections;

6
cli/src/main/java/org/onosproject/cli/net/RouteStoreCommand.java → apps/route-service/app/src/main/java/org/onosproject/routeservice/cli/RouteStoreCommand.java
View File

@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.cli.net;
package org.onosproject.routeservice.cli;
import org.apache.karaf.shell.commands.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.incubator.net.routing.RouteStore;
import org.onosproject.routeservice.RouteStore;
/**
* Command to show the current route store implementation.
@ -31,4 +31,4 @@ public class RouteStoreCommand extends AbstractShellCommand {
RouteStore routeStore = AbstractShellCommand.get(RouteStore.class);
print(routeStore.name());
}
}
}

10
cli/src/main/java/org/onosproject/cli/net/RoutesListCommand.java → apps/route-service/app/src/main/java/org/onosproject/routeservice/cli/RoutesListCommand.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.cli.net;
package org.onosproject.routeservice.cli;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
@ -21,10 +21,10 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.karaf.shell.commands.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.incubator.net.routing.ResolvedRoute;
import org.onosproject.incubator.net.routing.RouteInfo;
import org.onosproject.incubator.net.routing.RouteService;
import org.onosproject.incubator.net.routing.RouteTableId;
import org.onosproject.routeservice.ResolvedRoute;
import org.onosproject.routeservice.RouteInfo;
import org.onosproject.routeservice.RouteService;
import org.onosproject.routeservice.RouteTableId;
import java.util.Collection;
import java.util.Comparator;

20
apps/route-service/app/src/main/java/org/onosproject/routeservice/cli/package-info.java Normal file
View File

@ -0,0 +1,20 @@
/*
* Copyright 2016-present Open Networking Foundation
*
* 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.
*/
/**
* Implementation of route service.
*/
package org.onosproject.routeservice.cli;

8
incubator/net/src/main/java/org/onosproject/incubator/net/routing/impl/ConfigurationRouteSource.java → apps/route-service/app/src/main/java/org/onosproject/routeservice/impl/ConfigurationRouteSource.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.onosproject.incubator.net.routing.impl;
package org.onosproject.routeservice.impl;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
@ -22,9 +22,9 @@ import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.onosproject.core.ApplicationId;
import org.onosproject.incubator.net.routing.Route;
import org.onosproject.incubator.net.routing.RouteAdminService;
import org.onosproject.incubator.net.routing.RouteConfig;
import org.onosproject.routeservice.Route;
import org.onosproject.routeservice.RouteAdminService;
import org.onosproject.routeservice.RouteConfig;
import org.onosproject.net.config.ConfigFactory;
import org.onosproject.net.config.NetworkConfigEvent;
import org.onosproject.net.config.NetworkConfigListener;

10
incubator/net/src/main/java/org/onosproject/incubator/net/routing/impl/DefaultResolvedRouteStore.java → apps/route-service/app/src/main/java/org/onosproject/routeservice/impl/DefaultResolvedRouteStore.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.onosproject.incubator.net.routing.impl;
package org.onosproject.routeservice.impl;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
@ -26,9 +26,9 @@ import org.onlab.packet.IpAddress;
import org.onlab.packet.IpPrefix;
import org.onlab.util.GuavaCollectors;
import org.onlab.util.Tools;
import org.onosproject.incubator.net.routing.ResolvedRoute;
import org.onosproject.incubator.net.routing.RouteEvent;
import org.onosproject.incubator.net.routing.RouteTableId;
import org.onosproject.routeservice.ResolvedRoute;
import org.onosproject.routeservice.RouteEvent;
import org.onosproject.routeservice.RouteTableId;
import java.util.Collection;
import java.util.Collections;
@ -37,7 +37,7 @@ import java.util.Optional;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import static org.onosproject.incubator.net.routing.RouteTools.createBinaryString;
import static org.onosproject.routeservice.RouteTools.createBinaryString;
/**
* Stores routes that have been resolved.

4
incubator/net/src/main/java/org/onosproject/incubator/net/routing/impl/ListenerQueue.java → apps/route-service/app/src/main/java/org/onosproject/routeservice/impl/ListenerQueue.java
View File

@ -14,9 +14,9 @@
* limitations under the License.
*/
package org.onosproject.incubator.net.routing.impl;
package org.onosproject.routeservice.impl;
import org.onosproject.incubator.net.routing.RouteEvent;
import org.onosproject.routeservice.RouteEvent;
/**
* Queues updates for a route listener to ensure they are received in the

8
incubator/net/src/main/java/org/onosproject/incubator/net/routing/impl/ResolvedRouteStore.java → apps/route-service/app/src/main/java/org/onosproject/routeservice/impl/ResolvedRouteStore.java
View File

@ -14,13 +14,13 @@
* limitations under the License.
*/
package org.onosproject.incubator.net.routing.impl;
package org.onosproject.routeservice.impl;
import org.onlab.packet.IpAddress;
import org.onlab.packet.IpPrefix;
import org.onosproject.incubator.net.routing.ResolvedRoute;
import org.onosproject.incubator.net.routing.RouteEvent;
import org.onosproject.incubator.net.routing.RouteTableId;
import org.onosproject.routeservice.ResolvedRoute;
import org.onosproject.routeservice.RouteEvent;
import org.onosproject.routeservice.RouteTableId;
import java.util.Collection;
import java.util.Optional;

28
incubator/net/src/main/java/org/onosproject/incubator/net/routing/impl/RouteManager.java → apps/route-service/app/src/main/java/org/onosproject/routeservice/impl/RouteManager.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.onosproject.incubator.net.routing.impl;
package org.onosproject.routeservice.impl;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
@ -25,18 +25,18 @@ import org.apache.felix.scr.annotations.Service;
import org.onlab.packet.IpAddress;
import org.onlab.packet.IpPrefix;
import org.onosproject.cluster.ClusterService;
import org.onosproject.incubator.net.routing.InternalRouteEvent;
import org.onosproject.incubator.net.routing.ResolvedRoute;
import org.onosproject.incubator.net.routing.Route;
import org.onosproject.incubator.net.routing.RouteAdminService;
import org.onosproject.incubator.net.routing.RouteEvent;
import org.onosproject.incubator.net.routing.RouteInfo;
import org.onosproject.incubator.net.routing.RouteListener;
import org.onosproject.incubator.net.routing.RouteService;
import org.onosproject.incubator.net.routing.RouteSet;
import org.onosproject.incubator.net.routing.RouteStore;
import org.onosproject.incubator.net.routing.RouteStoreDelegate;
import org.onosproject.incubator.net.routing.RouteTableId;
import org.onosproject.routeservice.InternalRouteEvent;
import org.onosproject.routeservice.ResolvedRoute;
import org.onosproject.routeservice.Route;
import org.onosproject.routeservice.RouteAdminService;
import org.onosproject.routeservice.RouteEvent;
import org.onosproject.routeservice.RouteInfo;
import org.onosproject.routeservice.RouteListener;
import org.onosproject.routeservice.RouteService;
import org.onosproject.routeservice.RouteSet;
import org.onosproject.routeservice.RouteStore;
import org.onosproject.routeservice.RouteStoreDelegate;
import org.onosproject.routeservice.RouteTableId;
import org.onosproject.net.Host;
import org.onosproject.net.host.HostEvent;
import org.onosproject.net.host.HostListener;
@ -138,7 +138,7 @@ public class RouteManager implements RouteService, RouteAdminService {
.map(resolvedRouteStore::getRoutes)
.flatMap(Collection::stream)
.map(route -> new RouteEvent(RouteEvent.Type.ROUTE_ADDED, route,
resolvedRouteStore.getAllRoutes(route.prefix())))
resolvedRouteStore.getAllRoutes(route.prefix())))
.forEach(l::post);
listeners.put(listener, l);

8
incubator/net/src/main/java/org/onosproject/incubator/net/routing/impl/RouteMonitor.java → apps/route-service/app/src/main/java/org/onosproject/routeservice/impl/RouteMonitor.java
View File

@ -14,15 +14,15 @@
* limitations under the License.
*/
package org.onosproject.incubator.net.routing.impl;
package org.onosproject.routeservice.impl;
import org.onosproject.cluster.ClusterEvent;
import org.onosproject.cluster.ClusterEventListener;
import org.onosproject.cluster.ClusterService;
import org.onosproject.cluster.NodeId;
import org.onosproject.incubator.net.routing.ResolvedRoute;
import org.onosproject.incubator.net.routing.Route;
import org.onosproject.incubator.net.routing.RouteAdminService;
import org.onosproject.routeservice.ResolvedRoute;
import org.onosproject.routeservice.Route;
import org.onosproject.routeservice.RouteAdminService;
import org.onosproject.store.serializers.KryoNamespaces;
import org.onosproject.store.service.DistributedPrimitive;
import org.onosproject.store.service.Serializer;

20
apps/route-service/app/src/main/java/org/onosproject/routeservice/impl/package-info.java Normal file
View File

@ -0,0 +1,20 @@
/*
* Copyright 2016-present Open Networking Foundation
*
* 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.
*/
/**
* Implementation of route service.
*/
package org.onosproject.routeservice.impl;

12
incubator/store/src/main/java/org/onosproject/incubator/store/routing/impl/DefaultRouteTable.java → apps/route-service/app/src/main/java/org/onosproject/routeservice/store/DefaultRouteTable.java
View File

@ -14,16 +14,16 @@
* limitations under the License.
*/
package org.onosproject.incubator.store.routing.impl;
package org.onosproject.routeservice.store;
import org.onlab.packet.IpAddress;
import org.onlab.packet.IpPrefix;
import org.onlab.util.KryoNamespace;
import org.onosproject.incubator.net.routing.InternalRouteEvent;
import org.onosproject.incubator.net.routing.Route;
import org.onosproject.incubator.net.routing.RouteSet;
import org.onosproject.incubator.net.routing.RouteStoreDelegate;
import org.onosproject.incubator.net.routing.RouteTableId;
import org.onosproject.routeservice.InternalRouteEvent;
import org.onosproject.routeservice.Route;
import org.onosproject.routeservice.RouteSet;
import org.onosproject.routeservice.RouteStoreDelegate;
import org.onosproject.routeservice.RouteTableId;
import org.onosproject.store.serializers.KryoNamespaces;
import org.onosproject.store.service.ConsistentMap;
import org.onosproject.store.service.DistributedPrimitive;

14
incubator/store/src/main/java/org/onosproject/incubator/store/routing/impl/DistributedRouteStore.java → apps/route-service/app/src/main/java/org/onosproject/routeservice/store/DistributedRouteStore.java
View File

@ -14,18 +14,18 @@
* limitations under the License.
*/
package org.onosproject.incubator.store.routing.impl;
package org.onosproject.routeservice.store;
import com.google.common.collect.ImmutableSet;
import org.onlab.packet.IpAddress;
import org.onlab.packet.IpPrefix;
import org.onlab.util.KryoNamespace;
import org.onosproject.incubator.net.routing.InternalRouteEvent;
import org.onosproject.incubator.net.routing.Route;
import org.onosproject.incubator.net.routing.RouteSet;
import org.onosproject.incubator.net.routing.RouteStore;
import org.onosproject.incubator.net.routing.RouteStoreDelegate;
import org.onosproject.incubator.net.routing.RouteTableId;
import org.onosproject.routeservice.InternalRouteEvent;
import org.onosproject.routeservice.Route;
import org.onosproject.routeservice.RouteSet;
import org.onosproject.routeservice.RouteStore;
import org.onosproject.routeservice.RouteStoreDelegate;
import org.onosproject.routeservice.RouteTableId;
import org.onosproject.store.AbstractStore;
import org.onosproject.store.service.DistributedSet;
import org.onosproject.store.service.Serializer;

8
incubator/store/src/main/java/org/onosproject/incubator/store/routing/impl/EmptyRouteTable.java → apps/route-service/app/src/main/java/org/onosproject/routeservice/store/EmptyRouteTable.java
View File

@ -14,13 +14,13 @@
* limitations under the License.
*/
package org.onosproject.incubator.store.routing.impl;
package org.onosproject.routeservice.store;
import org.onlab.packet.IpAddress;
import org.onlab.packet.IpPrefix;
import org.onosproject.incubator.net.routing.Route;
import org.onosproject.incubator.net.routing.RouteSet;
import org.onosproject.incubator.net.routing.RouteTableId;
import org.onosproject.routeservice.Route;
import org.onosproject.routeservice.RouteSet;
import org.onosproject.routeservice.RouteTableId;
import java.util.Collection;
import java.util.Collections;

22
incubator/store/src/main/java/org/onosproject/incubator/store/routing/impl/LocalRouteStore.java → apps/route-service/app/src/main/java/org/onosproject/routeservice/store/LocalRouteStore.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.onosproject.incubator.store.routing.impl;
package org.onosproject.routeservice.store;
import com.googlecode.concurrenttrees.common.KeyValuePair;
import com.googlecode.concurrenttrees.radix.node.concrete.DefaultByteArrayNodeFactory;
@ -22,12 +22,13 @@ import com.googlecode.concurrenttrees.radixinverted.ConcurrentInvertedRadixTree;
import com.googlecode.concurrenttrees.radixinverted.InvertedRadixTree;
import org.onlab.packet.IpAddress;
import org.onlab.packet.IpPrefix;
import org.onosproject.incubator.net.routing.InternalRouteEvent;
import org.onosproject.incubator.net.routing.Route;
import org.onosproject.incubator.net.routing.RouteSet;
import org.onosproject.incubator.net.routing.RouteStore;
import org.onosproject.incubator.net.routing.RouteStoreDelegate;
import org.onosproject.incubator.net.routing.RouteTableId;
import org.onosproject.routeservice.InternalRouteEvent;
import org.onosproject.routeservice.Route;
import org.onosproject.routeservice.RouteSet;
import org.onosproject.routeservice.RouteStore;
import org.onosproject.routeservice.RouteStoreDelegate;
import org.onosproject.routeservice.RouteTableId;
import org.onosproject.routeservice.RouteTools;
import org.onosproject.store.AbstractStore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -43,7 +44,6 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.onosproject.incubator.net.routing.RouteTools.createBinaryString;
/**
* Route store based on in-memory storage.
@ -150,7 +150,7 @@ public class LocalRouteStore extends AbstractStore<InternalRouteEvent, RouteStor
return;
}
routeTable.put(createBinaryString(route.prefix()), route);
routeTable.put(RouteTools.createBinaryString(route.prefix()), route);
notifyDelegate(new InternalRouteEvent(
InternalRouteEvent.Type.ROUTE_ADDED, singletonRouteSet(route)));
@ -165,7 +165,7 @@ public class LocalRouteStore extends AbstractStore<InternalRouteEvent, RouteStor
public void remove(Route route) {
synchronized (this) {
Route removed = routes.remove(route.prefix());
routeTable.remove(createBinaryString(route.prefix()));
routeTable.remove(RouteTools.createBinaryString(route.prefix()));
if (removed != null) {
notifyDelegate(new InternalRouteEvent(
@ -228,7 +228,7 @@ public class LocalRouteStore extends AbstractStore<InternalRouteEvent, RouteStor
*/
public Route longestPrefixMatch(IpAddress ip) {
Iterable<Route> prefixes =
routeTable.getValuesForKeysPrefixing(createBinaryString(ip.toIpPrefix()));
routeTable.getValuesForKeysPrefixing(RouteTools.createBinaryString(ip.toIpPrefix()));
Iterator<Route> it = prefixes.iterator();

14
incubator/store/src/main/java/org/onosproject/incubator/store/routing/impl/RouteStoreImpl.java → apps/route-service/app/src/main/java/org/onosproject/routeservice/store/RouteStoreImpl.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.onosproject.incubator.store.routing.impl;
package org.onosproject.routeservice.store;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
@ -27,12 +27,12 @@ import org.onlab.packet.IpAddress;
import org.onlab.packet.IpPrefix;
import org.onlab.util.Tools;
import org.onosproject.cfg.ComponentConfigService;
import org.onosproject.incubator.net.routing.InternalRouteEvent;
import org.onosproject.incubator.net.routing.Route;
import org.onosproject.incubator.net.routing.RouteSet;
import org.onosproject.incubator.net.routing.RouteStore;
import org.onosproject.incubator.net.routing.RouteStoreDelegate;
import org.onosproject.incubator.net.routing.RouteTableId;
import org.onosproject.routeservice.InternalRouteEvent;
import org.onosproject.routeservice.Route;
import org.onosproject.routeservice.RouteSet;
import org.onosproject.routeservice.RouteStore;
import org.onosproject.routeservice.RouteStoreDelegate;
import org.onosproject.routeservice.RouteTableId;
import org.onosproject.store.AbstractStore;
import org.onosproject.store.service.StorageService;
import org.osgi.service.component.ComponentContext;

8
incubator/store/src/main/java/org/onosproject/incubator/store/routing/impl/RouteTable.java → apps/route-service/app/src/main/java/org/onosproject/routeservice/store/RouteTable.java
View File

@ -14,13 +14,13 @@
* limitations under the License.
*/
package org.onosproject.incubator.store.routing.impl;
package org.onosproject.routeservice.store;
import org.onlab.packet.IpAddress;
import org.onlab.packet.IpPrefix;
import org.onosproject.incubator.net.routing.Route;
import org.onosproject.incubator.net.routing.RouteSet;
import org.onosproject.incubator.net.routing.RouteTableId;
import org.onosproject.routeservice.Route;
import org.onosproject.routeservice.RouteSet;
import org.onosproject.routeservice.RouteTableId;
import java.util.Collection;

20
apps/route-service/app/src/main/java/org/onosproject/routeservice/store/package-info.java Normal file
View File

@ -0,0 +1,20 @@
/*
* Copyright 2016-present Open Networking Foundation
*
* 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.
*/
/**
* Implementation of the unicast routing service.
*/
package org.onosproject.routeservice.store;

35
apps/route-service/app/src/main/resources/OSGI-INF/blueprint/shell-config.xml Normal file
View File

@ -0,0 +1,35 @@
<!--
~ Copyright 2014-present Open Networking Foundation
~
~ 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.routeservice.cli.RoutesListCommand"/>
</command>
<command>
<action class="org.onosproject.routeservice.cli.RouteAddCommand"/>
</command>
<command>
<action class="org.onosproject.routeservice.cli.RouteRemoveCommand"/>
</command>
<command>
<action class="org.onosproject.routeservice.cli.RouteStoreCommand"/>
</command>
</command-bundle>
</blueprint>

17
incubator/net/src/test/java/org/onosproject/incubator/net/routing/impl/RouteManagerTest.java → apps/route-service/app/src/test/java/org/onosproject/routeservice/impl/RouteManagerTest.java
View File

@ -14,9 +14,10 @@
* limitations under the License.
*/
package org.onosproject.incubator.net.routing.impl;
package org.onosproject.routeservice.impl;
import java.util.Collections;
import com.google.common.collect.Sets;
import org.junit.Before;
import org.junit.Test;
import org.onlab.packet.Ip4Address;
@ -27,12 +28,12 @@ import org.onlab.packet.IpAddress;
import org.onlab.packet.IpPrefix;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
import org.onosproject.routeservice.ResolvedRoute;
import org.onosproject.routeservice.Route;
import org.onosproject.routeservice.RouteEvent;
import org.onosproject.routeservice.RouteListener;
import org.onosproject.routeservice.store.LocalRouteStore;
import org.onosproject.cluster.ClusterService;
import org.onosproject.incubator.net.routing.ResolvedRoute;
import org.onosproject.incubator.net.routing.Route;
import org.onosproject.incubator.net.routing.RouteEvent;
import org.onosproject.incubator.net.routing.RouteListener;
import org.onosproject.incubator.store.routing.impl.LocalRouteStore;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DefaultHost;
import org.onosproject.net.DeviceId;
@ -48,7 +49,7 @@ import org.onosproject.net.provider.ProviderId;
import org.onosproject.store.service.StorageService;
import org.onosproject.store.service.WorkQueue;
import java.util.Collections;
import com.google.common.collect.Sets;
import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.anyString;

38
apps/route-service/pom.xml Normal file
View File

@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2015-present Open Networking Foundation
~
~ 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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-apps</artifactId>
<version>1.11.0-SNAPSHOT</version>
</parent>
<artifactId>onos-app-route-service</artifactId>
<packaging>pom</packaging>
<description>Route Service Application</description>
<modules>
<module>api</module>
<module>app</module>
</modules>
</project>

1
apps/routing/common/BUCK
View File

@ -5,6 +5,7 @@ COMPILE_DEPS = [
'//cli:onos-cli',
'//incubator/api:onos-incubator-api',
'//apps/routing-api:onos-apps-routing-api',
'//apps/route-service/api:onos-apps-route-service-api',
'//core/common:onos-core-common',
]

5
apps/routing/common/pom.xml
View File

@ -86,6 +86,11 @@
<artifactId>concurrent-trees</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-app-route-service-api</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>

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

@ -18,7 +18,7 @@ package org.onosproject.routing.bgp;
import org.onlab.packet.IpPrefix;
import org.onosproject.cluster.ClusterService;
import org.onosproject.incubator.net.routing.Route;
import org.onosproject.routeservice.Route;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@ -38,8 +38,8 @@ import org.onlab.packet.Ip4Prefix;
import org.onlab.packet.Ip6Prefix;
import org.onlab.packet.IpPrefix;
import org.onosproject.cluster.ClusterService;
import org.onosproject.incubator.net.routing.Route;
import org.onosproject.incubator.net.routing.RouteAdminService;
import org.onosproject.routeservice.Route;
import org.onosproject.routeservice.RouteAdminService;
import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@ -38,7 +38,7 @@ import org.onlab.packet.IpAddress;
import org.onosproject.cluster.ClusterService;
import org.onosproject.cluster.DefaultControllerNode;
import org.onosproject.cluster.NodeId;
import org.onosproject.incubator.net.routing.RouteAdminService;
import org.onosproject.routeservice.RouteAdminService;
import org.osgi.service.component.ComponentContext;
import java.net.InetAddress;

3
apps/routing/fibinstaller/BUCK
View File

@ -2,12 +2,14 @@ COMPILE_DEPS = [
'//lib:CORE_DEPS',
'//incubator/api:onos-incubator-api',
'//apps/routing-api:onos-apps-routing-api',
'//apps/route-service/api:onos-apps-route-service-api',
]
TEST_DEPS = [
'//lib:TEST_ADAPTERS',
'//incubator/api:onos-incubator-api-tests',
'//apps/routing-api:onos-apps-routing-api-tests',
'//apps/route-service/api:onos-apps-route-service-api-tests',
]
osgi_jar_with_tests (
@ -27,4 +29,5 @@ onos_app (
url = 'http://onosproject.org',
description = 'Installs routing rules into switches',
included_bundles = BUNDLES,
required_apps = [ 'org.onosproject.route-service' ],
)

7
apps/routing/fibinstaller/pom.xml
View File

@ -26,6 +26,13 @@
<artifactId>onos-apps-routing-fibinstaller</artifactId>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-app-route-service-api</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>

10
apps/routing/fibinstaller/src/main/java/org/onosproject/routing/fibinstaller/FibInstaller.java
View File

@ -39,11 +39,11 @@ import org.onosproject.core.CoreService;
import org.onosproject.incubator.net.config.basics.McastConfig;
import org.onosproject.net.intf.Interface;
import org.onosproject.net.intf.InterfaceService;
import org.onosproject.incubator.net.routing.ResolvedRoute;
import org.onosproject.incubator.net.routing.Route;
import org.onosproject.incubator.net.routing.RouteEvent;
import org.onosproject.incubator.net.routing.RouteListener;
import org.onosproject.incubator.net.routing.RouteService;
import org.onosproject.routeservice.ResolvedRoute;
import org.onosproject.routeservice.Route;
import org.onosproject.routeservice.RouteEvent;
import org.onosproject.routeservice.RouteListener;
import org.onosproject.routeservice.RouteService;
import org.onosproject.net.DeviceId;
import org.onosproject.net.config.ConfigFactory;
import org.onosproject.net.config.NetworkConfigEvent;

10
apps/routing/fibinstaller/src/test/java/org/onosproject/routing/fibinstaller/FibInstallerTest.java
View File

@ -35,11 +35,11 @@ import org.onosproject.net.intf.Interface;
import org.onosproject.net.intf.InterfaceListener;
import org.onosproject.net.intf.InterfaceService;
import org.onosproject.net.intf.InterfaceServiceAdapter;
import org.onosproject.incubator.net.routing.ResolvedRoute;
import org.onosproject.incubator.net.routing.Route;
import org.onosproject.incubator.net.routing.RouteEvent;
import org.onosproject.incubator.net.routing.RouteListener;
import org.onosproject.incubator.net.routing.RouteServiceAdapter;
import org.onosproject.routeservice.ResolvedRoute;
import org.onosproject.routeservice.Route;
import org.onosproject.routeservice.RouteEvent;
import org.onosproject.routeservice.RouteListener;
import org.onosproject.routeservice.RouteServiceAdapter;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DeviceId;
import org.onosproject.net.PortNumber;

2
apps/routing/fpm/BUCK
View File

@ -4,6 +4,7 @@ COMPILE_DEPS = [
'//cli:onos-cli',
'//incubator/api:onos-incubator-api',
'//apps/routing-api:onos-apps-routing-api',
'//apps/route-service/api:onos-apps-route-service-api',
'//core/store/serializers:onos-core-serializers',
]
@ -29,4 +30,5 @@ onos_app (
url = 'http://onosproject.org',
description = 'Receives routes from external routing daemon over FPM protocol',
included_bundles = BUNDLES,
required_apps = [ 'org.onosproject.route-service' ],
)

5
apps/routing/fpm/pom.xml
View File

@ -49,6 +49,11 @@
<artifactId>onos-core-serializers</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-app-route-service-api</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>

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

@ -44,8 +44,8 @@ import org.onosproject.cfg.ComponentConfigService;
import org.onosproject.cluster.ClusterService;
import org.onosproject.cluster.NodeId;
import org.onosproject.core.CoreService;
import org.onosproject.incubator.net.routing.Route;
import org.onosproject.incubator.net.routing.RouteAdminService;
import org.onosproject.routeservice.Route;
import org.onosproject.routeservice.RouteAdminService;
import org.onosproject.routing.fpm.protocol.FpmHeader;
import org.onosproject.routing.fpm.protocol.Netlink;
import org.onosproject.routing.fpm.protocol.RouteAttribute;

5
apps/sdnip/BUCK
View File

@ -2,6 +2,7 @@ COMPILE_DEPS = [
'//lib:CORE_DEPS',
'//incubator/api:onos-incubator-api',
'//apps/routing-api:onos-apps-routing-api',
'//apps/route-service/api:onos-apps-route-service-api',
'//apps/intentsync:onos-apps-intentsync',
'//lib:org.apache.karaf.shell.console',
'//cli:onos-cli'
@ -15,8 +16,8 @@ BUNDLES = [
TEST_DEPS = [
'//lib:TEST_ADAPTERS',
'//incubator/api:onos-incubator-api-tests',
'//apps/routing-api:onos-apps-routing-api-tests',
'//apps/route-service/api:onos-apps-route-service-api-tests',
]
osgi_jar_with_tests (
@ -30,5 +31,5 @@ onos_app (
url = 'http://onosproject.org',
included_bundles = BUNDLES,
description = 'SDN-IP peering application',
required_apps = [ 'org.onosproject.intentsynchronizer' ],
required_apps = [ 'org.onosproject.intentsynchronizer', 'org.onosproject.route-service' ],
)

8
apps/sdnip/src/main/java/org/onosproject/sdnip/SdnIpFib.java
View File

@ -34,10 +34,10 @@ import org.onosproject.net.intf.Interface;
import org.onosproject.net.intf.InterfaceEvent;
import org.onosproject.net.intf.InterfaceListener;
import org.onosproject.net.intf.InterfaceService;
import org.onosproject.incubator.net.routing.ResolvedRoute;
import org.onosproject.incubator.net.routing.RouteEvent;
import org.onosproject.incubator.net.routing.RouteListener;
import org.onosproject.incubator.net.routing.RouteService;
import org.onosproject.routeservice.ResolvedRoute;
import org.onosproject.routeservice.RouteEvent;
import org.onosproject.routeservice.RouteListener;
import org.onosproject.routeservice.RouteService;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.EncapsulationType;
import org.onosproject.net.FilteredConnectPoint;

10
apps/sdnip/src/test/java/org/onosproject/sdnip/SdnIpFibTest.java
View File

@ -37,11 +37,11 @@ import org.onosproject.net.intf.InterfaceEvent;
import org.onosproject.net.intf.InterfaceListener;
import org.onosproject.net.intf.InterfaceService;
import org.onosproject.net.intf.InterfaceServiceAdapter;
import org.onosproject.incubator.net.routing.ResolvedRoute;
import org.onosproject.incubator.net.routing.Route;
import org.onosproject.incubator.net.routing.RouteEvent;
import org.onosproject.incubator.net.routing.RouteListener;
import org.onosproject.incubator.net.routing.RouteServiceAdapter;
import org.onosproject.routeservice.ResolvedRoute;
import org.onosproject.routeservice.Route;
import org.onosproject.routeservice.RouteEvent;
import org.onosproject.routeservice.RouteListener;
import org.onosproject.routeservice.RouteServiceAdapter;
import org.onosproject.intentsync.IntentSynchronizationService;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DeviceId;

2
apps/segmentrouting/BUCK
View File

@ -6,6 +6,7 @@ COMPILE_DEPS = [
'//core/store/serializers:onos-core-serializers',
'//incubator/api:onos-incubator-api',
'//utils/rest:onlab-rest',
'//apps/route-service/api:onos-apps-route-service-api',
]
BUNDLES = [
@ -29,4 +30,5 @@ onos_app (
url = 'http://onosproject.org',
included_bundles = BUNDLES,
description = 'Segment routing application.',
required_apps = [ 'org.onosproject.route-service' ],
)

5
apps/segmentrouting/pom.xml
View File

@ -107,6 +107,11 @@
<scope>test</scope>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-app-route-service-api</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<build>

2
apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/IcmpHandler.java
View File

@ -29,7 +29,7 @@ import org.onlab.packet.VlanId;
import org.onlab.packet.ndp.NeighborSolicitation;
import org.onosproject.net.neighbour.NeighbourMessageContext;
import org.onosproject.net.neighbour.NeighbourMessageType;
import org.onosproject.incubator.net.routing.ResolvedRoute;
import org.onosproject.routeservice.ResolvedRoute;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DeviceId;
import org.onosproject.net.flow.DefaultTrafficTreatment;

4
apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/RouteHandler.java
View File

@ -22,8 +22,8 @@ import com.google.common.collect.Sets;
import org.onlab.packet.IpPrefix;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
import org.onosproject.incubator.net.routing.ResolvedRoute;
import org.onosproject.incubator.net.routing.RouteEvent;
import org.onosproject.routeservice.ResolvedRoute;
import org.onosproject.routeservice.RouteEvent;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DeviceId;
import org.slf4j.Logger;

6
apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
View File

@ -40,9 +40,9 @@ import org.onosproject.incubator.net.config.basics.InterfaceConfig;
import org.onosproject.incubator.net.config.basics.McastConfig;
import org.onosproject.net.intf.Interface;
import org.onosproject.net.intf.InterfaceService;
import org.onosproject.incubator.net.routing.RouteEvent;
import org.onosproject.incubator.net.routing.RouteListener;
import org.onosproject.incubator.net.routing.RouteService;
import org.onosproject.routeservice.RouteEvent;
import org.onosproject.routeservice.RouteListener;
import org.onosproject.routeservice.RouteService;
import org.onosproject.net.neighbour.NeighbourResolutionService;
import org.onosproject.mastership.MastershipService;
import org.onosproject.net.ConnectPoint;

13
cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
View File

@ -564,19 +564,6 @@
<action class="org.onosproject.cli.net.WipeOutCommand"/>
</command>
<command>
<action class="org.onosproject.cli.net.RoutesListCommand"/>
</command>
<command>
<action class="org.onosproject.cli.net.RouteAddCommand"/>
</command>
<command>
<action class="org.onosproject.cli.net.RouteRemoveCommand"/>
</command>
<command>
<action class="org.onosproject.cli.net.RouteStoreCommand"/>
</command>
<command>
<action class="org.onosproject.cli.net.GlobalLabelCommand"/>
</command>

1
modules.defs
View File

@ -210,6 +210,7 @@ ONOS_APPS = [
'//apps/artemis:onos-apps-artemis-oar',
'//apps/gluon:onos-apps-gluon-oar',
'//apps/evpnopenflow:onos-apps-evpnopenflow-oar',
'//apps/route-service:onos-apps-route-service-oar',
]
PROTOCOL_APPS = [

1
tools/build/publish-target-list
View File

@ -3,6 +3,7 @@
//apps/optical-model:onos-apps-optical-model
//apps/restconf/api:onos-apps-restconf-api
//apps/routing-api:onos-apps-routing-api
//apps/route-service/api:onos-apps-route-service-api
//cli:onos-cli
//core/api:onos-api
//core/common:onos-core-common