Move routing from incubator to a separate app
Change-Id: I961d10af99c572b1f8d9b3d37c6f52dd04422007
diff --git a/apps/pim/BUCK b/apps/pim/BUCK
index 1126966..607978e 100644
--- a/apps/pim/BUCK
+++ b/apps/pim/BUCK
@@ -4,6 +4,7 @@
'//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 @@
url = 'http://onosproject.org',
description = 'Protocol independent multicast emulation.',
included_bundles = BUNDLES,
+ required_apps = [ 'org.onosproject.route-service' ],
)
diff --git a/apps/pim/pom.xml b/apps/pim/pom.xml
index b62dc0b..4ceef0e 100644
--- a/apps/pim/pom.xml
+++ b/apps/pim/pom.xml
@@ -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>
diff --git a/apps/pim/src/main/java/org/onosproject/pim/impl/PimInterfaceManager.java b/apps/pim/src/main/java/org/onosproject/pim/impl/PimInterfaceManager.java
index 13d6da3..3c75c93 100644
--- a/apps/pim/src/main/java/org/onosproject/pim/impl/PimInterfaceManager.java
+++ b/apps/pim/src/main/java/org/onosproject/pim/impl/PimInterfaceManager.java
@@ -28,8 +28,8 @@
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;