commit a95193c5fade947c58c1efd239abec59d35e14ef
author Ray Milkey <ray@opennetworking.org> Thu Aug 10 15:35:36 2017 -0700
committer Ray Milkey <ray@opennetworking.org> Tue Aug 15 15:38:54 2017 +0000
tree a3fa020cfbcb54e007785a3f3740b62279f6fe61
parent 54d8243e53850adcbc340a4114a2efd19d0a998e

ONOS-6903 Move EVPN from incubator to apps

Change-Id: Id84c59e28f2591535b0726afbc1a2fa3caf07db5

providers/bgp/BUCK

diff --git a/providers/bgp/BUCK b/providers/bgp/BUCK
index c6560b9..93ab3f7 100644
--- a/providers/bgp/BUCK
+++ b/providers/bgp/BUCK
@@ -14,5 +14,6 @@
     url = 'http://onosproject.org',
     included_bundles = BUNDLES,
     description = 'BGP protocol southbound providers.',
+    required_apps = [ 'org.onosproject.evpnrouteservice' ],
 )
 

providers/bgp/route/BUCK

diff --git a/providers/bgp/route/BUCK b/providers/bgp/route/BUCK
index bf38465..5e94e85 100644
--- a/providers/bgp/route/BUCK
+++ b/providers/bgp/route/BUCK
@@ -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,
 )

providers/bgp/route/pom.xml

diff --git a/providers/bgp/route/pom.xml b/providers/bgp/route/pom.xml
index e3bffcd..e7c26a8 100644
--- a/providers/bgp/route/pom.xml
+++ b/providers/bgp/route/pom.xml
@@ -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>

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

diff --git a/providers/bgp/route/src/main/java/org/onosproject/provider/bgp/route/impl/BgpRouteProvider.java b/providers/bgp/route/src/main/java/org/onosproject/provider/bgp/route/impl/BgpRouteProvider.java
index 81bd1d5..c7a9b10 100644
--- a/providers/bgp/route/src/main/java/org/onosproject/provider/bgp/route/impl/BgpRouteProvider.java
+++ b/providers/bgp/route/src/main/java/org/onosproject/provider/bgp/route/impl/BgpRouteProvider.java
@@ -40,12 +40,12 @@
 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 @@
                               labelInt);
         }
     }
-}
\ No newline at end of file
+}