commit | 23686835a242f9409cd05cda67a7aedb6670a968 | [log] [tgz] |
---|---|---|
author | Charles Chan <rascov@gmail.com> | Wed Aug 23 14:46:43 2017 -0700 |
committer | Charles Chan <rascov@gmail.com> | Sat Sep 09 14:42:30 2017 -0700 |
tree | 0f941559592cf2a77d353ce87efaca043ddadc10 | |
parent | aefbb00e0ce34732e42a88477855717fb9283ac2 [diff] [blame] |
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/apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/MockDefaultRoutingHandler.java b/apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/MockDefaultRoutingHandler.java index a69d5e7..ec07238 100644 --- a/apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/MockDefaultRoutingHandler.java +++ b/apps/segmentrouting/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)); }