Moved the BGP Route Intent synchronization mechanism from the Router class
to the new class IntentSynchronizer.
Also, minor cleanup in some of the method names and access scope.
Change-Id: I38257cd1d9516ef3b3dd50f23c28015054c73d70
diff --git a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/RouterTest.java b/apps/sdnip/src/test/java/org/onlab/onos/sdnip/RouterTest.java
index b4b0551..b5beb4a 100644
--- a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/RouterTest.java
+++ b/apps/sdnip/src/test/java/org/onlab/onos/sdnip/RouterTest.java
@@ -102,6 +102,7 @@
}
};
+ private IntentSynchronizer intentSynchronizer;
private Router router;
@Before
@@ -113,7 +114,8 @@
intentService = createMock(IntentService.class);
- router = new Router(APPID, intentService,
+ intentSynchronizer = new IntentSynchronizer(APPID, intentService);
+ router = new Router(APPID, intentSynchronizer,
hostService, sdnIpConfigService, interfaceService);
}
@@ -258,15 +260,15 @@
replay(intentService);
// Call the processRouteAdd() method in Router class
- router.leaderChanged(true);
- TestUtils.setField(router, "isActivatedLeader", true);
+ intentSynchronizer.leaderChanged(true);
+ TestUtils.setField(intentSynchronizer, "isActivatedLeader", true);
router.processRouteAdd(routeEntry);
// Verify
assertEquals(router.getRoutes().size(), 1);
assertTrue(router.getRoutes().contains(routeEntry));
- assertEquals(router.getPushedRouteIntents().size(), 1);
- assertEquals(router.getPushedRouteIntents().iterator().next(),
+ assertEquals(intentSynchronizer.getPushedRouteIntents().size(), 1);
+ assertEquals(intentSynchronizer.getPushedRouteIntents().iterator().next(),
intent);
verify(intentService);
}
@@ -338,15 +340,15 @@
replay(intentService);
// Call the processRouteAdd() method in Router class
- router.leaderChanged(true);
- TestUtils.setField(router, "isActivatedLeader", true);
+ intentSynchronizer.leaderChanged(true);
+ TestUtils.setField(intentSynchronizer, "isActivatedLeader", true);
router.processRouteAdd(routeEntryUpdate);
// Verify
assertEquals(router.getRoutes().size(), 1);
assertTrue(router.getRoutes().contains(routeEntryUpdate));
- assertEquals(router.getPushedRouteIntents().size(), 1);
- assertEquals(router.getPushedRouteIntents().iterator().next(),
+ assertEquals(intentSynchronizer.getPushedRouteIntents().size(), 1);
+ assertEquals(intentSynchronizer.getPushedRouteIntents().iterator().next(),
intentNew);
verify(intentService);
}
@@ -389,13 +391,13 @@
replay(intentService);
// Call route deleting method in Router class
- router.leaderChanged(true);
- TestUtils.setField(router, "isActivatedLeader", true);
+ intentSynchronizer.leaderChanged(true);
+ TestUtils.setField(intentSynchronizer, "isActivatedLeader", true);
router.processRouteDelete(routeEntry);
// Verify
assertEquals(router.getRoutes().size(), 0);
- assertEquals(router.getPushedRouteIntents().size(), 0);
+ assertEquals(intentSynchronizer.getPushedRouteIntents().size(), 0);
verify(intentService);
}
@@ -416,14 +418,14 @@
replay(intentService);
// Call the processRouteAdd() method in Router class
- router.leaderChanged(true);
- TestUtils.setField(router, "isActivatedLeader", true);
+ intentSynchronizer.leaderChanged(true);
+ TestUtils.setField(intentSynchronizer, "isActivatedLeader", true);
router.processRouteAdd(routeEntry);
// Verify
assertEquals(router.getRoutes().size(), 1);
assertTrue(router.getRoutes().contains(routeEntry));
- assertEquals(router.getPushedRouteIntents().size(), 0);
+ assertEquals(intentSynchronizer.getPushedRouteIntents().size(), 0);
verify(intentService);
}
}