commit e4d131090a6aad3f2af9f1a02f1b6d4ee22ae700
author Charles Chan <rascov@gmail.com> Tue Nov 08 15:38:44 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Wed Nov 09 18:51:06 2016 +0000
tree cdfb0ba6849b8a2a8b384707bf2a9ccfed89e8b3
parent bb7e57b43dd65db0c9c207b275cdd52859f01980

Carry previous next hop information in RouteEvent

Change-Id: Ib66a9191892c0e62b54fddcbfdc5645f305e9fcf

apps/routing/src/test/java/org/onosproject/routing/impl/SingleSwitchFibInstallerTest.java

diff --git a/apps/routing/src/test/java/org/onosproject/routing/impl/SingleSwitchFibInstallerTest.java b/apps/routing/src/test/java/org/onosproject/routing/impl/SingleSwitchFibInstallerTest.java
index 2b60f91..1e6efb5 100644
--- a/apps/routing/src/test/java/org/onosproject/routing/impl/SingleSwitchFibInstallerTest.java
+++ b/apps/routing/src/test/java/org/onosproject/routing/impl/SingleSwitchFibInstallerTest.java
@@ -335,6 +335,7 @@
         testRouteAdd();
         reset(flowObjectiveService);
 
+        ResolvedRoute oldRoute = new ResolvedRoute(PREFIX1, NEXT_HOP1, MAC1, SW1_ETH1);
         ResolvedRoute route = new ResolvedRoute(PREFIX1, NEXT_HOP2, MAC2, SW1_ETH2);
 
         // Create the next objective
@@ -348,7 +349,7 @@
         setUpFlowObjectiveService();
 
         // Send in the update event
-        routeListener.event(new RouteEvent(RouteEvent.Type.ROUTE_UPDATED, route));
+        routeListener.event(new RouteEvent(RouteEvent.Type.ROUTE_UPDATED, route, oldRoute));
 
         verify(flowObjectiveService);
     }
@@ -365,7 +366,7 @@
         testRouteAdd();
 
         // Construct the existing route
-        ResolvedRoute route = new ResolvedRoute(PREFIX1, null, null, null);
+        ResolvedRoute route = new ResolvedRoute(PREFIX1, NEXT_HOP1, MAC1, SW1_ETH1);
 
         // Create the flow objective
         reset(flowObjectiveService);

apps/sdnip/src/test/java/org/onosproject/sdnip/SdnIpFibTest.java

diff --git a/apps/sdnip/src/test/java/org/onosproject/sdnip/SdnIpFibTest.java b/apps/sdnip/src/test/java/org/onosproject/sdnip/SdnIpFibTest.java
index a764c83..31e1cde 100644
--- a/apps/sdnip/src/test/java/org/onosproject/sdnip/SdnIpFibTest.java
+++ b/apps/sdnip/src/test/java/org/onosproject/sdnip/SdnIpFibTest.java
@@ -244,6 +244,7 @@
         testRouteAddToNoVlan();
 
         // Build the new route entries for prefix1 and prefix2
+        ResolvedRoute oldRoutePrefixOne = new ResolvedRoute(PREFIX1, IP3, MAC3, SW3_ETH1);
         ResolvedRoute routePrefixOne = new ResolvedRoute(PREFIX1, IP1, MAC1, SW1_ETH1);
 
         // Create the new expected intents
@@ -258,7 +259,7 @@
 
         // Send in the update events
         routeListener.event(new RouteEvent(RouteEvent.Type.ROUTE_UPDATED,
-                                           routePrefixOne));
+                                           routePrefixOne, oldRoutePrefixOne));
 
         verify(intentSynchronizer);
     }
@@ -278,6 +279,7 @@
         testRouteAddToVlan();
 
         // Build the new route entries for prefix1 and prefix2
+        ResolvedRoute oldRoutePrefix = new ResolvedRoute(PREFIX2, IP1, MAC1, SW1_ETH1);
         ResolvedRoute routePrefix = new ResolvedRoute(PREFIX2, IP3, MAC3, SW3_ETH1);
 
         // Create the new expected intents
@@ -293,7 +295,7 @@
 
         // Send in the update events
         routeListener.event(new RouteEvent(RouteEvent.Type.ROUTE_UPDATED,
-                                           routePrefix));
+                                           routePrefix, oldRoutePrefix));
 
         verify(intentSynchronizer);
     }
@@ -310,7 +312,7 @@
         testRouteAddToNoVlan();
 
         // Construct the existing route entry
-        ResolvedRoute route = new ResolvedRoute(PREFIX1, null, null, null);
+        ResolvedRoute route = new ResolvedRoute(PREFIX1, IP3, MAC3, SW3_ETH1);
 
         // Create existing intent
         MultiPointToSinglePointIntent removedIntent =