CORD-1578 CORD-1708 Handle dual single homed router and single dual homed router
In addition
- Carry all alternatives in ROUTE_UPDATED and ROUTE_REMOVED event
- More unit tests
- More debug messages
- Fix routing table out-of-sync issue in MockRoutingService
- Fix populateRoute/revokeRoute mastership issue
Change-Id: I22d537625b570b09ecd4e22e6e14bb1ee27f8bcb
diff --git a/src/test/java/org/onosproject/segmentrouting/MockDefaultRoutingHandler.java b/src/test/java/org/onosproject/segmentrouting/MockDefaultRoutingHandler.java
index a69d5e7..ec07238 100644
--- a/src/test/java/org/onosproject/segmentrouting/MockDefaultRoutingHandler.java
+++ b/src/test/java/org/onosproject/segmentrouting/MockDefaultRoutingHandler.java
@@ -36,6 +36,15 @@
@Override
protected void populateSubnet(Set<ConnectPoint> cpts, Set<IpPrefix> subnets) {
+ subnetTable.forEach((k, v) -> {
+ if (!cpts.contains(k)) {
+ subnetTable.get(k).removeAll(subnets);
+ if (subnetTable.get(k).isEmpty()) {
+ subnetTable.remove(k);
+ }
+ }
+ });
+
cpts.forEach(cpt -> subnetTable.put(cpt, subnets));
}