Remove deprecated ConnectPoint location()
Change-Id: I473d8bf296fe2dc3ece2aa6645fe7e54bcbf926c
diff --git a/apps/route-service/app/src/main/java/org/onosproject/routeservice/impl/RouteManager.java b/apps/route-service/app/src/main/java/org/onosproject/routeservice/impl/RouteManager.java
index e3924a7..d45415b 100644
--- a/apps/route-service/app/src/main/java/org/onosproject/routeservice/impl/RouteManager.java
+++ b/apps/route-service/app/src/main/java/org/onosproject/routeservice/impl/RouteManager.java
@@ -205,7 +205,7 @@
private ResolvedRoute tryResolve(Route route) {
ResolvedRoute resolvedRoute = resolve(route);
if (resolvedRoute == null) {
- resolvedRoute = new ResolvedRoute(route, null, null, null);
+ resolvedRoute = new ResolvedRoute(route, null, null);
}
return resolvedRoute;
}
@@ -252,7 +252,7 @@
Set<Host> hosts = hostService.getHostsByIp(route.nextHop());
return hosts.stream().findFirst()
- .map(host -> new ResolvedRoute(route, host.mac(), host.vlan(), host.location()))
+ .map(host -> new ResolvedRoute(route, host.mac(), host.vlan()))
.orElse(null);
}
diff --git a/apps/route-service/app/src/test/java/org/onosproject/routeservice/impl/RouteManagerTest.java b/apps/route-service/app/src/test/java/org/onosproject/routeservice/impl/RouteManagerTest.java
index 8457ac4..3c02572 100644
--- a/apps/route-service/app/src/test/java/org/onosproject/routeservice/impl/RouteManagerTest.java
+++ b/apps/route-service/app/src/test/java/org/onosproject/routeservice/impl/RouteManagerTest.java
@@ -209,12 +209,12 @@
@Test
public void testRouteAdd() {
Route route = new Route(Route.Source.STATIC, V4_PREFIX1, V4_NEXT_HOP1);
- ResolvedRoute resolvedRoute = new ResolvedRoute(route, MAC1, CP1);
+ ResolvedRoute resolvedRoute = new ResolvedRoute(route, MAC1);
verifyRouteAdd(route, resolvedRoute);
route = new Route(Route.Source.STATIC, V6_PREFIX1, V6_NEXT_HOP1);
- resolvedRoute = new ResolvedRoute(route, MAC3, CP1);
+ resolvedRoute = new ResolvedRoute(route, MAC3);
verifyRouteAdd(route, resolvedRoute);
}
@@ -247,8 +247,8 @@
public void testRouteUpdate() {
Route route = new Route(Route.Source.STATIC, V4_PREFIX1, V4_NEXT_HOP1);
Route updatedRoute = new Route(Route.Source.STATIC, V4_PREFIX1, V4_NEXT_HOP2);
- ResolvedRoute resolvedRoute = new ResolvedRoute(route, MAC1, CP1);
- ResolvedRoute updatedResolvedRoute = new ResolvedRoute(updatedRoute, MAC2, CP1);
+ ResolvedRoute resolvedRoute = new ResolvedRoute(route, MAC1);
+ ResolvedRoute updatedResolvedRoute = new ResolvedRoute(updatedRoute, MAC2);
verifyRouteUpdated(route, updatedRoute, resolvedRoute, updatedResolvedRoute);
@@ -256,15 +256,15 @@
// In this case we expect to receive a ROUTE_UPDATED event.
route = new Route(Route.Source.STATIC, V4_PREFIX2, V4_NEXT_HOP1);
updatedRoute = new Route(Route.Source.STATIC, V4_PREFIX2, V4_NEXT_HOP2);
- resolvedRoute = new ResolvedRoute(route, MAC1, CP1);
- updatedResolvedRoute = new ResolvedRoute(updatedRoute, MAC2, CP1);
+ resolvedRoute = new ResolvedRoute(route, MAC1);
+ updatedResolvedRoute = new ResolvedRoute(updatedRoute, MAC2);
verifyRouteUpdated(route, updatedRoute, resolvedRoute, updatedResolvedRoute);
route = new Route(Route.Source.STATIC, V6_PREFIX1, V6_NEXT_HOP1);
updatedRoute = new Route(Route.Source.STATIC, V6_PREFIX1, V6_NEXT_HOP2);
- resolvedRoute = new ResolvedRoute(route, MAC3, CP1);
- updatedResolvedRoute = new ResolvedRoute(updatedRoute, MAC4, CP1);
+ resolvedRoute = new ResolvedRoute(route, MAC3);
+ updatedResolvedRoute = new ResolvedRoute(updatedRoute, MAC4);
verifyRouteUpdated(route, updatedRoute, resolvedRoute, updatedResolvedRoute);
}
@@ -303,12 +303,12 @@
@Test
public void testRouteDelete() {
Route route = new Route(Route.Source.STATIC, V4_PREFIX1, V4_NEXT_HOP1);
- ResolvedRoute removedResolvedRoute = new ResolvedRoute(route, MAC1, CP1);
+ ResolvedRoute removedResolvedRoute = new ResolvedRoute(route, MAC1);
verifyDelete(route, removedResolvedRoute);
route = new Route(Route.Source.STATIC, V6_PREFIX1, V6_NEXT_HOP1);
- removedResolvedRoute = new ResolvedRoute(route, MAC3, CP1);
+ removedResolvedRoute = new ResolvedRoute(route, MAC3);
verifyDelete(route, removedResolvedRoute);
}
@@ -362,7 +362,7 @@
// Now when we send the event, we expect the FIB update to be sent
reset(routeListener);
- ResolvedRoute resolvedRoute = new ResolvedRoute(route, MAC1, CP1);
+ ResolvedRoute resolvedRoute = new ResolvedRoute(route, MAC1);
routeListener.event(event(RouteEvent.Type.ROUTE_ADDED, resolvedRoute, null,
Sets.newHashSet(resolvedRoute), null));
replay(routeListener);