commit f2e7a34ae826f30f5f8fe5b2bd7925186c6fd662
author Jonathan Hart <jono@onlab.us> Mon Mar 20 15:43:21 2017 -0700
committer Jonathan Hart <jono@onlab.us> Wed Mar 22 20:23:45 2017 +0000
tree 908cd72af823d2f8c9d927c099bc93a2a919dd2a
parent 92ca94dab0935b48d1a6e9cc5f1d900796823f84

Carry original route in ResolvedRoute object.

The original route may have information of interest to consumers, such
as the route source or VRF information.

Change-Id: I32df752c92e235423694b13d4ff239a38bae5a50

apps/routing/fibinstaller/src/main/java/org/onosproject/routing/fibinstaller/FibInstaller.java

diff --git a/apps/routing/fibinstaller/src/main/java/org/onosproject/routing/fibinstaller/FibInstaller.java b/apps/routing/fibinstaller/src/main/java/org/onosproject/routing/fibinstaller/FibInstaller.java
index d279ffc..bbf2c36 100644
--- a/apps/routing/fibinstaller/src/main/java/org/onosproject/routing/fibinstaller/FibInstaller.java
+++ b/apps/routing/fibinstaller/src/main/java/org/onosproject/routing/fibinstaller/FibInstaller.java
@@ -40,6 +40,7 @@
 import org.onosproject.incubator.net.intf.Interface;
 import org.onosproject.incubator.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;
@@ -65,11 +66,11 @@
 import org.onosproject.net.flowobjective.ForwardingObjective;
 import org.onosproject.net.flowobjective.NextObjective;
 import org.onosproject.net.flowobjective.ObjectiveContext;
+import org.onosproject.routing.InterfaceProvisionRequest;
 import org.onosproject.routing.NextHop;
 import org.onosproject.routing.NextHopGroupKey;
-import org.onosproject.routing.RouterInfo;
-import org.onosproject.routing.InterfaceProvisionRequest;
 import org.onosproject.routing.Router;
+import org.onosproject.routing.RouterInfo;
 import org.onosproject.routing.RoutingService;
 import org.onosproject.routing.config.RouterConfigHelper;
 import org.onosproject.routing.config.RoutersConfig;
@@ -233,9 +234,9 @@
         routeService.removeListener(routeListener);
 
         //clean up the routes.
-        for (Map.Entry<IpPrefix, IpAddress> routes: prefixToNextHop.entrySet()) {
-            deleteRoute(new ResolvedRoute(routes.getKey(), null, null, null));
-        }
+        prefixToNextHop.entrySet().stream()
+                .map(e -> new Route(Route.Source.UNDEFINED, e.getKey(), e.getValue()))
+                .forEach(this::deleteRoute);
 
         if (interfaceManager != null) {
             interfaceManager.cleanup();
@@ -266,6 +267,10 @@
     }
 
     private synchronized void deleteRoute(ResolvedRoute route) {
+        deleteRoute(new Route(Route.Source.UNDEFINED, route.prefix(), route.nextHop()));
+    }
+
+    private void deleteRoute(Route route) {
         //Integer nextId = nextHops.get(route.nextHop());
 
         /* Group group = deleteNextHop(route.prefix());