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

ONOS-6903 Move EVPN from incubator to apps

Browse Source 
Change-Id: Id84c59e28f2591535b0726afbc1a2fa3caf07db5
This commit is contained in:
Ray Milkey 2017-08-10 15:35:36 -07:00
parent 54d8243e53
commit a95193c5fa
57 changed files with 373 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/dhcprelay/pom.xml
View File

@ -80,13 +80,6 @@
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-incubator-api</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>

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

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

13
apps/evpn-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/evpn-route-service/api/pom.xml Normal file
View File

@ -0,0 +1,61 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2017-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-evpn-route-service</artifactId>
<groupId>org.onosproject</groupId>
<version>1.11.0-SNAPSHOT</version>
</parent>
<artifactId>onos-app-evpn-route-service-api</artifactId>
<packaging>bundle</packaging>
<url>http://onosproject.org</url>
<description>EVPN Routing 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/EvpnInstance.java → apps/evpn-route-service/api/src/main/java/org/onosproject/evpnrouteservice/EvpnInstance.java
View File

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

2
incubator/api/src/main/java/org/onosproject/incubator/net/routing/EvpnInstanceName.java → apps/evpn-route-service/api/src/main/java/org/onosproject/evpnrouteservice/EvpnInstanceName.java
View File

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

6
incubator/api/src/main/java/org/onosproject/incubator/net/routing/EvpnInstanceNextHop.java → apps/evpn-route-service/api/src/main/java/org/onosproject/evpnrouteservice/EvpnInstanceNextHop.java
View File

@ -14,12 +14,12 @@
* limitations under the License.
*/
package org.onosproject.incubator.net.routing;
import org.onlab.packet.IpAddress;
package org.onosproject.evpnrouteservice;
import java.util.Objects;
import org.onlab.packet.IpAddress;
import static com.google.common.base.MoreObjects.toStringHelper;
/**

6
incubator/api/src/main/java/org/onosproject/incubator/net/routing/EvpnInstancePrefix.java → apps/evpn-route-service/api/src/main/java/org/onosproject/evpnrouteservice/EvpnInstancePrefix.java
View File

@ -14,13 +14,13 @@
* limitations under the License.
*/
package org.onosproject.incubator.net.routing;
package org.onosproject.evpnrouteservice;
import java.util.Objects;
import org.onlab.packet.IpPrefix;
import org.onlab.packet.MacAddress;
import java.util.Objects;
import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;

8
incubator/api/src/main/java/org/onosproject/incubator/net/routing/EvpnInstanceRoute.java → apps/evpn-route-service/api/src/main/java/org/onosproject/evpnrouteservice/EvpnInstanceRoute.java
View File

@ -14,14 +14,14 @@
* limitations under the License.
*/
package org.onosproject.incubator.net.routing;
import org.onlab.packet.IpAddress;
import org.onlab.packet.IpPrefix;
package org.onosproject.evpnrouteservice;
import java.util.List;
import java.util.Objects;
import org.onlab.packet.IpAddress;
import org.onlab.packet.IpPrefix;
import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;

2
incubator/api/src/main/java/org/onosproject/incubator/net/routing/EvpnInternalRouteEvent.java → apps/evpn-route-service/api/src/main/java/org/onosproject/evpnrouteservice/EvpnInternalRouteEvent.java
View File

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

6
incubator/api/src/main/java/org/onosproject/incubator/net/routing/EvpnNextHop.java → apps/evpn-route-service/api/src/main/java/org/onosproject/evpnrouteservice/EvpnNextHop.java
View File

@ -14,13 +14,13 @@
* limitations under the License.
*/
package org.onosproject.incubator.net.routing;
import org.onlab.packet.IpAddress;
package org.onosproject.evpnrouteservice;
import java.util.List;
import java.util.Objects;
import org.onlab.packet.IpAddress;
import static com.google.common.base.MoreObjects.toStringHelper;
/**

6
incubator/api/src/main/java/org/onosproject/incubator/net/routing/EvpnPrefix.java → apps/evpn-route-service/api/src/main/java/org/onosproject/evpnrouteservice/EvpnPrefix.java
View File

@ -14,13 +14,13 @@
* limitations under the License.
*/
package org.onosproject.incubator.net.routing;
package org.onosproject.evpnrouteservice;
import java.util.Objects;
import org.onlab.packet.IpPrefix;
import org.onlab.packet.MacAddress;
import java.util.Objects;
import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;

8
incubator/api/src/main/java/org/onosproject/incubator/net/routing/EvpnRoute.java → apps/evpn-route-service/api/src/main/java/org/onosproject/evpnrouteservice/EvpnRoute.java
View File

@ -14,15 +14,15 @@
* limitations under the License.
*/
package org.onosproject.incubator.net.routing;
package org.onosproject.evpnrouteservice;
import java.util.List;
import java.util.Objects;
import org.onlab.packet.IpAddress;
import org.onlab.packet.IpPrefix;
import org.onlab.packet.MacAddress;
import java.util.List;
import java.util.Objects;
import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;

2
incubator/api/src/main/java/org/onosproject/incubator/net/routing/EvpnRouteAdminService.java → apps/evpn-route-service/api/src/main/java/org/onosproject/evpnrouteservice/EvpnRouteAdminService.java
View File

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

8
incubator/api/src/main/java/org/onosproject/incubator/net/routing/EvpnRouteEvent.java → apps/evpn-route-service/api/src/main/java/org/onosproject/evpnrouteservice/EvpnRouteEvent.java
View File

@ -14,15 +14,15 @@
* limitations under the License.
*/
package org.onosproject.incubator.net.routing;
import org.joda.time.LocalDateTime;
import org.onosproject.event.AbstractEvent;
package org.onosproject.evpnrouteservice;
import java.util.Collection;
import java.util.Collections;
import java.util.Objects;
import org.joda.time.LocalDateTime;
import org.onosproject.event.AbstractEvent;
import static com.google.common.base.MoreObjects.toStringHelper;
/**

2
incubator/api/src/main/java/org/onosproject/incubator/net/routing/EvpnRouteListener.java → apps/evpn-route-service/api/src/main/java/org/onosproject/evpnrouteservice/EvpnRouteListener.java
View File

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

6
incubator/api/src/main/java/org/onosproject/incubator/net/routing/EvpnRouteService.java → apps/evpn-route-service/api/src/main/java/org/onosproject/evpnrouteservice/EvpnRouteService.java
View File

@ -14,12 +14,12 @@
* limitations under the License.
*/
package org.onosproject.incubator.net.routing;
import org.onosproject.event.ListenerService;
package org.onosproject.evpnrouteservice;
import java.util.Collection;
import org.onosproject.event.ListenerService;
/**
* EVPN route service.
*/

6
incubator/api/src/main/java/org/onosproject/incubator/net/routing/EvpnRouteSet.java → apps/evpn-route-service/api/src/main/java/org/onosproject/evpnrouteservice/EvpnRouteSet.java
View File

@ -14,13 +14,13 @@
* limitations under the License.
*/
package org.onosproject.incubator.net.routing;
import com.google.common.collect.ImmutableSet;
package org.onosproject.evpnrouteservice;
import java.util.Objects;
import java.util.Set;
import com.google.common.collect.ImmutableSet;
import static com.google.common.base.Preconditions.checkNotNull;
/**

8
incubator/api/src/main/java/org/onosproject/incubator/net/routing/EvpnRouteStore.java → apps/evpn-route-service/api/src/main/java/org/onosproject/evpnrouteservice/EvpnRouteStore.java
View File

@ -14,14 +14,14 @@
* limitations under the License.
*/
package org.onosproject.incubator.net.routing;
import org.onlab.packet.IpAddress;
import org.onosproject.store.Store;
package org.onosproject.evpnrouteservice;
import java.util.Collection;
import java.util.Set;
import org.onlab.packet.IpAddress;
import org.onosproject.store.Store;
/**
* EVPN route store.
*/

2
incubator/api/src/main/java/org/onosproject/incubator/net/routing/EvpnRouteStoreDelegate.java → apps/evpn-route-service/api/src/main/java/org/onosproject/evpnrouteservice/EvpnRouteStoreDelegate.java
View File

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

2
incubator/api/src/main/java/org/onosproject/incubator/net/routing/EvpnRouteTableId.java → apps/evpn-route-service/api/src/main/java/org/onosproject/evpnrouteservice/EvpnRouteTableId.java
View File

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

6
incubator/api/src/main/java/org/onosproject/incubator/net/routing/EvpnTable.java → apps/evpn-route-service/api/src/main/java/org/onosproject/evpnrouteservice/EvpnTable.java Normal file → Executable file
View File

@ -14,12 +14,12 @@
* limitations under the License.
*/
package org.onosproject.incubator.net.routing;
import org.onlab.packet.IpAddress;
package org.onosproject.evpnrouteservice;
import java.util.Collection;
import org.onlab.packet.IpAddress;
/**
* Represents a route table that stores routes.
*/

2
incubator/api/src/main/java/org/onosproject/incubator/net/routing/Label.java → apps/evpn-route-service/api/src/main/java/org/onosproject/evpnrouteservice/Label.java
View File

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

2
incubator/api/src/main/java/org/onosproject/incubator/net/routing/RouteDistinguisher.java → apps/evpn-route-service/api/src/main/java/org/onosproject/evpnrouteservice/RouteDistinguisher.java
View File

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

2
incubator/api/src/main/java/org/onosproject/incubator/net/routing/VpnRouteTarget.java → apps/evpn-route-service/api/src/main/java/org/onosproject/evpnrouteservice/VpnRouteTarget.java
View File

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

2
incubator/api/src/main/java/org/onosproject/incubator/net/routing/package-info.java → apps/evpn-route-service/api/src/main/java/org/onosproject/evpnrouteservice/package-info.java
View File

@ -17,4 +17,4 @@
/**
* Unicast routing service.
*/
package org.onosproject.incubator.net.routing;
package org.onosproject.evpnrouteservice;

16
apps/evpn-route-service/app/BUCK Normal file
View File

@ -0,0 +1,16 @@
COMPILE_DEPS = [
'//lib:CORE_DEPS',
'//utils/misc:onlab-misc',
'//core/store/serializers:onos-core-serializers',
'//apps/evpn-route-service/api:onos-apps-evpn-route-service-api',
]
TEST_DEPS = [
'//lib:TEST',
'//core/api:onos-api-tests',
]
osgi_jar_with_tests (
deps = COMPILE_DEPS,
test_deps = TEST_DEPS,
)

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

@ -0,0 +1,66 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2017-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-evpn-route-service</artifactId>
<groupId>org.onosproject</groupId>
<version>1.11.0-SNAPSHOT</version>
</parent>
<artifactId>onos-app-evpn-route-service-app</artifactId>
<packaging>bundle</packaging>
<url>http://onosproject.org</url>
<description>EVPN Routing Application Implementation</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>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-app-evpn-route-service-api</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>

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

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

44
incubator/net/src/main/java/org/onosproject/incubator/net/routing/impl/EvpnRouteManager.java → apps/evpn-route-service/app/src/main/java/org/onosproject/evpnrouteservice/impl/EvpnRouteManager.java
View File

@ -14,28 +14,8 @@
* limitations under the License.
*/
package org.onosproject.incubator.net.routing.impl;
package org.onosproject.evpnrouteservice.impl;
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.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onosproject.incubator.net.routing.EvpnInternalRouteEvent;
import org.onosproject.incubator.net.routing.EvpnRoute;
import org.onosproject.incubator.net.routing.EvpnRouteAdminService;
import org.onosproject.incubator.net.routing.EvpnRouteEvent;
import org.onosproject.incubator.net.routing.EvpnRouteListener;
import org.onosproject.incubator.net.routing.EvpnRouteService;
import org.onosproject.incubator.net.routing.EvpnRouteSet;
import org.onosproject.incubator.net.routing.EvpnRouteStore;
import org.onosproject.incubator.net.routing.EvpnRouteStoreDelegate;
import org.onosproject.incubator.net.routing.EvpnRouteTableId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.annotation.concurrent.GuardedBy;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
@ -44,6 +24,28 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadFactory;
import javax.annotation.concurrent.GuardedBy;
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.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onosproject.evpnrouteservice.EvpnInternalRouteEvent;
import org.onosproject.evpnrouteservice.EvpnRoute;
import org.onosproject.evpnrouteservice.EvpnRouteAdminService;
import org.onosproject.evpnrouteservice.EvpnRouteEvent;
import org.onosproject.evpnrouteservice.EvpnRouteListener;
import org.onosproject.evpnrouteservice.EvpnRouteService;
import org.onosproject.evpnrouteservice.EvpnRouteSet;
import org.onosproject.evpnrouteservice.EvpnRouteStore;
import org.onosproject.evpnrouteservice.EvpnRouteStoreDelegate;
import org.onosproject.evpnrouteservice.EvpnRouteTableId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static java.util.concurrent.Executors.newSingleThreadExecutor;
import static org.onlab.util.Tools.groupedThreads;

2
incubator/net/src/main/java/org/onosproject/incubator/net/routing/impl/package-info.java → apps/evpn-route-service/app/src/main/java/org/onosproject/evpnrouteservice/impl/package-info.java
View File

@ -17,4 +17,4 @@
/**
* Implementation of route service.
*/
package org.onosproject.incubator.net.routing.impl;
package org.onosproject.evpnrouteservice.impl;

16
incubator/store/src/main/java/org/onosproject/incubator/store/routing/impl/DistributedEvpnRouteStore.java → apps/evpn-route-service/app/src/main/java/org/onosproject/evpnrouteservice/store/DistributedEvpnRouteStore.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.onosproject.incubator.store.routing.impl;
package org.onosproject.evpnrouteservice.store;
import com.google.common.collect.ImmutableSet;
import org.apache.felix.scr.annotations.Activate;
@ -25,13 +25,13 @@ import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.packet.IpAddress;
import org.onlab.util.KryoNamespace;
import org.onosproject.incubator.net.routing.EvpnInternalRouteEvent;
import org.onosproject.incubator.net.routing.EvpnRoute;
import org.onosproject.incubator.net.routing.EvpnRouteSet;
import org.onosproject.incubator.net.routing.EvpnRouteStore;
import org.onosproject.incubator.net.routing.EvpnRouteStoreDelegate;
import org.onosproject.incubator.net.routing.EvpnRouteTableId;
import org.onosproject.incubator.net.routing.EvpnTable;
import org.onosproject.evpnrouteservice.EvpnInternalRouteEvent;
import org.onosproject.evpnrouteservice.EvpnRoute;
import org.onosproject.evpnrouteservice.EvpnRouteSet;
import org.onosproject.evpnrouteservice.EvpnRouteStore;
import org.onosproject.evpnrouteservice.EvpnRouteStoreDelegate;
import org.onosproject.evpnrouteservice.EvpnRouteTableId;
import org.onosproject.evpnrouteservice.EvpnTable;
import org.onosproject.store.AbstractStore;
import org.onosproject.store.service.DistributedSet;
import org.onosproject.store.service.Serializer;

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

@ -14,14 +14,14 @@
* limitations under the License.
*/
package org.onosproject.incubator.store.routing.impl;
package org.onosproject.evpnrouteservice.store;
import org.onlab.packet.IpAddress;
import org.onosproject.incubator.net.routing.EvpnPrefix;
import org.onosproject.incubator.net.routing.EvpnRoute;
import org.onosproject.incubator.net.routing.EvpnRouteSet;
import org.onosproject.incubator.net.routing.EvpnRouteTableId;
import org.onosproject.incubator.net.routing.EvpnTable;
import org.onosproject.evpnrouteservice.EvpnPrefix;
import org.onosproject.evpnrouteservice.EvpnRoute;
import org.onosproject.evpnrouteservice.EvpnRouteSet;
import org.onosproject.evpnrouteservice.EvpnRouteTableId;
import org.onosproject.evpnrouteservice.EvpnTable;
import java.util.Collection;
import java.util.Collections;

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

@ -14,22 +14,22 @@
* limitations under the License.
*/
package org.onosproject.incubator.store.routing.impl;
package org.onosproject.evpnrouteservice.store;
import org.onlab.packet.IpAddress;
import org.onlab.packet.IpPrefix;
import org.onlab.packet.MacAddress;
import org.onlab.util.KryoNamespace;
import org.onosproject.incubator.net.routing.EvpnInternalRouteEvent;
import org.onosproject.incubator.net.routing.EvpnPrefix;
import org.onosproject.incubator.net.routing.EvpnRoute;
import org.onosproject.incubator.net.routing.EvpnRouteSet;
import org.onosproject.incubator.net.routing.EvpnRouteStoreDelegate;
import org.onosproject.incubator.net.routing.EvpnRouteTableId;
import org.onosproject.incubator.net.routing.EvpnTable;
import org.onosproject.incubator.net.routing.Label;
import org.onosproject.incubator.net.routing.RouteDistinguisher;
import org.onosproject.incubator.net.routing.VpnRouteTarget;
import org.onosproject.evpnrouteservice.EvpnInternalRouteEvent;
import org.onosproject.evpnrouteservice.EvpnPrefix;
import org.onosproject.evpnrouteservice.EvpnRoute;
import org.onosproject.evpnrouteservice.EvpnRouteSet;
import org.onosproject.evpnrouteservice.EvpnRouteStoreDelegate;
import org.onosproject.evpnrouteservice.EvpnRouteTableId;
import org.onosproject.evpnrouteservice.EvpnTable;
import org.onosproject.evpnrouteservice.Label;
import org.onosproject.evpnrouteservice.RouteDistinguisher;
import org.onosproject.evpnrouteservice.VpnRouteTarget;
import org.onosproject.store.serializers.KryoNamespaces;
import org.onosproject.store.service.ConsistentMap;
import org.onosproject.store.service.DistributedPrimitive;

2
incubator/store/src/main/java/org/onosproject/incubator/store/routing/impl/package-info.java → apps/evpn-route-service/app/src/main/java/org/onosproject/evpnrouteservice/store/package-info.java
View File

@ -17,4 +17,4 @@
/**
* Implementation of the unicast routing service.
*/
package org.onosproject.incubator.store.routing.impl;
package org.onosproject.evpnrouteservice.store;

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

@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2017-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-evpn-route-service</artifactId>
<packaging>pom</packaging>
<description>EVPN Routing Application</description>
<modules>
<module>api</module>
<module>app</module>
</modules>
</project>

4
apps/evpnopenflow/BUCK
View File

@ -7,6 +7,7 @@ COMPILE_DEPS = [
'//apps/gluon:onos-apps-gluon',
'//apps/vtn/vtnrsc:onos-apps-vtn-vtnrsc',
'//apps/route-service/api:onos-apps-route-service-api',
'//apps/evpn-route-service/api:onos-apps-evpn-route-service-api',
]
TEST_DEPS = [
@ -25,5 +26,6 @@ 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' ],
required_apps = [ 'org.onosproject.route-service', 'org.onosproject.evpnrouteservice',
'org.onosproject.gluon', 'org.onosproject.vtn' ],
)

5
apps/evpnopenflow/pom.xml
View File

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

2
apps/evpnopenflow/src/main/java/org/onosproject/evpnopenflow/manager/EvpnService.java
View File

@ -17,7 +17,7 @@
package org.onosproject.evpnopenflow.manager;
import org.onosproject.evpnopenflow.rsc.VpnPort;
import org.onosproject.incubator.net.routing.EvpnRoute;
import org.onosproject.evpnrouteservice.EvpnRoute;
import org.onosproject.net.Host;
/**

33
apps/evpnopenflow/src/main/java/org/onosproject/evpnopenflow/manager/impl/EvpnManager.java
View File

@ -50,22 +50,22 @@ import org.onosproject.incubator.net.resource.label.LabelResource;
import org.onosproject.incubator.net.resource.label.LabelResourceAdminService;
import org.onosproject.incubator.net.resource.label.LabelResourceId;
import org.onosproject.incubator.net.resource.label.LabelResourceService;
import org.onosproject.incubator.net.routing.EvpnInstanceName;
import org.onosproject.incubator.net.routing.EvpnInstanceNextHop;
import org.onosproject.incubator.net.routing.EvpnInstancePrefix;
import org.onosproject.incubator.net.routing.EvpnInstanceRoute;
import org.onosproject.incubator.net.routing.EvpnNextHop;
import org.onosproject.incubator.net.routing.EvpnRoute;
import org.onosproject.incubator.net.routing.EvpnRoute.Source;
import org.onosproject.incubator.net.routing.EvpnRouteAdminService;
import org.onosproject.incubator.net.routing.EvpnRouteEvent;
import org.onosproject.incubator.net.routing.EvpnRouteListener;
import org.onosproject.incubator.net.routing.EvpnRouteService;
import org.onosproject.incubator.net.routing.EvpnRouteSet;
import org.onosproject.incubator.net.routing.EvpnRouteStore;
import org.onosproject.incubator.net.routing.Label;
import org.onosproject.incubator.net.routing.RouteDistinguisher;
import org.onosproject.incubator.net.routing.VpnRouteTarget;
import org.onosproject.evpnrouteservice.EvpnInstanceName;
import org.onosproject.evpnrouteservice.EvpnInstanceNextHop;
import org.onosproject.evpnrouteservice.EvpnInstancePrefix;
import org.onosproject.evpnrouteservice.EvpnInstanceRoute;
import org.onosproject.evpnrouteservice.EvpnNextHop;
import org.onosproject.evpnrouteservice.EvpnRoute;
import org.onosproject.evpnrouteservice.EvpnRoute.Source;
import org.onosproject.evpnrouteservice.EvpnRouteAdminService;
import org.onosproject.evpnrouteservice.EvpnRouteEvent;
import org.onosproject.evpnrouteservice.EvpnRouteListener;
import org.onosproject.evpnrouteservice.EvpnRouteService;
import org.onosproject.evpnrouteservice.EvpnRouteSet;
import org.onosproject.evpnrouteservice.EvpnRouteStore;
import org.onosproject.evpnrouteservice.Label;
import org.onosproject.evpnrouteservice.RouteDistinguisher;
import org.onosproject.evpnrouteservice.VpnRouteTarget;
import org.onosproject.mastership.MastershipService;
import org.onosproject.net.AnnotationKeys;
import org.onosproject.net.Device;
@ -103,7 +103,6 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Set;
import static com.sun.org.apache.xalan.internal.xsltc.compiler.util.Type.Reference;
import static org.onosproject.evpnopenflow.rsc.EvpnConstants.APP_ID;
import static org.onosproject.evpnopenflow.rsc.EvpnConstants.ARP_PRIORITY;
import static org.onosproject.evpnopenflow.rsc.EvpnConstants.ARP_RESPONSE;

2
apps/evpnopenflow/src/main/java/org/onosproject/evpnopenflow/rsc/DefaultVpnAfConfig.java
View File

@ -16,7 +16,7 @@
package org.onosproject.evpnopenflow.rsc;
import org.onosproject.incubator.net.routing.VpnRouteTarget;
import org.onosproject.evpnrouteservice.VpnRouteTarget;
import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;

6
apps/evpnopenflow/src/main/java/org/onosproject/evpnopenflow/rsc/DefaultVpnInstance.java
View File

@ -16,9 +16,9 @@
package org.onosproject.evpnopenflow.rsc;
import org.onosproject.incubator.net.routing.EvpnInstanceName;
import org.onosproject.incubator.net.routing.RouteDistinguisher;
import org.onosproject.incubator.net.routing.VpnRouteTarget;
import org.onosproject.evpnrouteservice.EvpnInstanceName;
import org.onosproject.evpnrouteservice.RouteDistinguisher;
import org.onosproject.evpnrouteservice.VpnRouteTarget;
import java.util.Objects;
import java.util.Set;

2
apps/evpnopenflow/src/main/java/org/onosproject/evpnopenflow/rsc/VpnAfConfig.java
View File

@ -16,7 +16,7 @@
package org.onosproject.evpnopenflow.rsc;
import org.onosproject.incubator.net.routing.VpnRouteTarget;
import org.onosproject.evpnrouteservice.VpnRouteTarget;
/**
* Representation of a VPN af configuration.

6
apps/evpnopenflow/src/main/java/org/onosproject/evpnopenflow/rsc/VpnInstance.java
View File

@ -16,9 +16,9 @@
package org.onosproject.evpnopenflow.rsc;
import org.onosproject.incubator.net.routing.EvpnInstanceName;
import org.onosproject.incubator.net.routing.RouteDistinguisher;
import org.onosproject.incubator.net.routing.VpnRouteTarget;
import org.onosproject.evpnrouteservice.EvpnInstanceName;
import org.onosproject.evpnrouteservice.RouteDistinguisher;
import org.onosproject.evpnrouteservice.VpnRouteTarget;
import java.util.Set;

2
apps/evpnopenflow/src/main/java/org/onosproject/evpnopenflow/rsc/cli/EvpnPrivateRouteListCommand.java
View File

@ -20,7 +20,7 @@ import org.apache.karaf.shell.commands.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.evpnopenflow.manager.EvpnService;
import org.onosproject.evpnopenflow.manager.impl.EvpnManager;
import org.onosproject.incubator.net.routing.EvpnInstanceRoute;
import org.onosproject.evpnrouteservice.EvpnInstanceRoute;
import java.util.Collection;

8
apps/evpnopenflow/src/main/java/org/onosproject/evpnopenflow/rsc/cli/EvpnPublicRouteListCommand.java
View File

@ -18,9 +18,9 @@ package org.onosproject.evpnopenflow.rsc.cli;
import org.apache.karaf.shell.commands.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.incubator.net.routing.EvpnRoute;
import org.onosproject.incubator.net.routing.EvpnRouteSet;
import org.onosproject.incubator.net.routing.EvpnRouteStore;
import org.onosproject.evpnrouteservice.EvpnRoute;
import org.onosproject.evpnrouteservice.EvpnRouteSet;
import org.onosproject.evpnrouteservice.EvpnRouteStore;
import java.util.Collection;
@ -55,4 +55,4 @@ public class EvpnPublicRouteListCommand extends AbstractShellCommand {
}
});
}
}
}

2
apps/evpnopenflow/src/main/java/org/onosproject/evpnopenflow/rsc/vpnafconfig/VpnAfConfigService.java
View File

@ -18,7 +18,7 @@ package org.onosproject.evpnopenflow.rsc.vpnafconfig;
import com.fasterxml.jackson.databind.JsonNode;
import org.onosproject.evpnopenflow.rsc.VpnAfConfig;
import org.onosproject.incubator.net.routing.VpnRouteTarget;
import org.onosproject.evpnrouteservice.VpnRouteTarget;
import java.util.Collection;

2
apps/evpnopenflow/src/main/java/org/onosproject/evpnopenflow/rsc/vpnafconfig/impl/VpnAfConfigManager.java
View File

@ -31,7 +31,7 @@ import org.onosproject.evpnopenflow.rsc.VpnAfConfig;
import org.onosproject.evpnopenflow.rsc.vpnafconfig.VpnAfConfigEvent;
import org.onosproject.evpnopenflow.rsc.vpnafconfig.VpnAfConfigListener;
import org.onosproject.evpnopenflow.rsc.vpnafconfig.VpnAfConfigService;
import org.onosproject.incubator.net.routing.VpnRouteTarget;
import org.onosproject.evpnrouteservice.VpnRouteTarget;
import org.onosproject.store.serializers.KryoNamespaces;
import org.onosproject.store.service.EventuallyConsistentMap;
import org.onosproject.store.service.StorageService;

2
apps/evpnopenflow/src/main/java/org/onosproject/evpnopenflow/rsc/vpninstance/VpnInstanceService.java
View File

@ -19,7 +19,7 @@ package org.onosproject.evpnopenflow.rsc.vpninstance;
import com.fasterxml.jackson.databind.JsonNode;
import org.onosproject.evpnopenflow.rsc.VpnInstance;
import org.onosproject.evpnopenflow.rsc.VpnInstanceId;
import org.onosproject.incubator.net.routing.VpnRouteTarget;
import org.onosproject.evpnrouteservice.VpnRouteTarget;
import java.util.Collection;
import java.util.Set;

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

@ -33,10 +33,10 @@ import org.onosproject.evpnopenflow.rsc.VpnInstance;
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.evpnrouteservice.EvpnInstanceName;
import org.onosproject.routeservice.RouteAdminService;
import org.onosproject.incubator.net.routing.RouteDistinguisher;
import org.onosproject.incubator.net.routing.VpnRouteTarget;
import org.onosproject.evpnrouteservice.RouteDistinguisher;
import org.onosproject.evpnrouteservice.VpnRouteTarget;
import org.onosproject.store.serializers.KryoNamespaces;
import org.onosproject.store.service.EventuallyConsistentMap;
import org.onosproject.store.service.StorageService;

1
apps/pom.xml
View File

@ -92,6 +92,7 @@
<module>gluon</module>
<module>evpnopenflow</module>
<module>route-service</module>
<module>evpn-route-service</module>
</modules>
<properties>

20
incubator/store/src/main/java/org/onosproject/incubator/store/impl/package-info.java
View File

@ -1,20 +0,0 @@
/*
* 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.
*/
/**
* Incubating distributed store implementations.
*/
package org.onosproject.incubator.store.impl;

1
modules.defs
View File

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

1
providers/bgp/BUCK
View File

@ -14,5 +14,6 @@ onos_app (
url = 'http://onosproject.org',
included_bundles = BUNDLES,
description = 'BGP protocol southbound providers.',
required_apps = [ 'org.onosproject.evpnrouteservice' ],
)

17
providers/bgp/route/BUCK
View File

@ -1,16 +1,17 @@
COMPILE_DEPS = [
'//lib:CORE_DEPS',
'//protocols/bgp/api:onos-protocols-bgp-api',
'//protocols/bgp/bgpio:onos-protocols-bgp-bgpio',
'//incubator/store:onos-incubator-store',
'//incubator/api:onos-incubator-api',
'//lib:CORE_DEPS',
'//protocols/bgp/api:onos-protocols-bgp-api',
'//protocols/bgp/bgpio:onos-protocols-bgp-bgpio',
'//incubator/store:onos-incubator-store',
'//incubator/api:onos-incubator-api',
'//apps/evpn-route-service/api:onos-apps-evpn-route-service-api',
]
TEST_DEPS = [
'//lib:TEST_ADAPTERS',
'//lib:TEST_ADAPTERS',
]
osgi_jar_with_tests(
deps = COMPILE_DEPS,
test_deps = TEST_DEPS,
deps = COMPILE_DEPS,
test_deps = TEST_DEPS,
)

5
providers/bgp/route/pom.xml
View File

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

14
providers/bgp/route/src/main/java/org/onosproject/provider/bgp/route/impl/BgpRouteProvider.java
View File

@ -40,12 +40,12 @@ import org.onosproject.bgpio.types.MpReachNlri;
import org.onosproject.bgpio.types.MpUnReachNlri;
import org.onosproject.bgpio.types.RouteDistinguisher;
import org.onosproject.bgpio.types.RouteTarget;
import org.onosproject.incubator.net.routing.EvpnRoute;
import org.onosproject.incubator.net.routing.EvpnRoute.Source;
import org.onosproject.incubator.net.routing.EvpnRouteAdminService;
import org.onosproject.incubator.net.routing.EvpnRouteEvent;
import org.onosproject.incubator.net.routing.EvpnRouteListener;
import org.onosproject.incubator.net.routing.VpnRouteTarget;
import org.onosproject.evpnrouteservice.EvpnRoute;
import org.onosproject.evpnrouteservice.EvpnRoute.Source;
import org.onosproject.evpnrouteservice.EvpnRouteAdminService;
import org.onosproject.evpnrouteservice.EvpnRouteEvent;
import org.onosproject.evpnrouteservice.EvpnRouteListener;
import org.onosproject.evpnrouteservice.VpnRouteTarget;
import org.onosproject.net.provider.AbstractProvider;
import org.onosproject.net.provider.ProviderId;
import org.slf4j.Logger;
@ -391,4 +391,4 @@ public class BgpRouteProvider extends AbstractProvider {
labelInt);
}
}
}
}